Double set pin (#287)

MobiFlight · Nov 30, 2023 · ff05429 · ff05429
1 parent 91c7e1e
commit ff05429
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/CustomDevices b/CustomDevices
diff --git a/src/MF_Output/MFOutput.cpp b/src/MF_Output/MFOutput.cpp
@@ -14,16 +14,23 @@ MFOutput::MFOutput()
 void MFOutput::attach(uint8_t pin)
 {
     _pin   = pin;
-#if !defined(ARDUINO_ARCH_RP2040)
+#if defined(ARDUINO_ARCH_RP2040)
+    pinMode(_pin, OUTPUT_12MA);
+#else
     pinMode(_pin, OUTPUT);
-    set(_value);
 #endif
+    set(LOW);
 }
 
 void MFOutput::set(uint8_t value)
 {
     _value = value;
-    analogWrite(_pin, _value);
+    if (_value == 0xFF)
+        digitalWrite(_pin, HIGH);
+    else if (_value == 0x00)
+        digitalWrite(_pin, LOW);
+    else
+        analogWrite(_pin, _value);
 }
 
 void MFOutput::powerSavingMode(bool state)

diff --git a/src/MF_Output/Output.cpp b/src/MF_Output/Output.cpp
@@ -29,10 +29,6 @@ namespace Output
             return;
         outputs[outputsRegistered] = MFOutput();
         outputs[outputsRegistered].attach(pin);
-#if defined(ARDUINO_ARCH_RP2040)
-        pinMode(pin, OUTPUT_12MA);
-        analogWrite(pin, false);
-#endif
         outputsRegistered++;
 #ifdef DEBUG2CMDMESSENGER
         cmdMessenger.sendCmd(kDebug, F("Added output"));
@@ -52,9 +48,14 @@ namespace Output
         // Read led state argument, interpret string as boolean
         int pin   = cmdMessenger.readInt16Arg();
         int state = cmdMessenger.readInt16Arg();
+
         // Set led
-        analogWrite(pin, state); // why does the UI sends the pin number and not the x.th output number like other devices?
-                                 //  output[pin].set(state);      // once this is changed uncomment this
+        if (state == 0xFF)
+            digitalWrite(pin, HIGH);
+        else if (state == 0x00)
+            digitalWrite(pin, LOW);
+        else
+            analogWrite(pin, state);
     }
 
     void PowerSave(bool state)