Fix merge inconsistencies

Author: ewowi

src/MoonBase/Modules/ModuleIO.h

@@ -377,7 +377,7 @@ class ModuleIO : public Module {
       // pinAssigner.assignPin(17, pin_LED); // e.g. apa102...
 
       // pinAssigner.assignPin(??, pin_Button_LightsOn); // which pin ?
-      pinAssigner.assignPin(19, pin_Relay_LightsOn); // optional
+      pinAssigner.assignPin(19, pin_Relay_LightsOn);  // optional
 
       // e.g. for mic
       pinAssigner.assignPin(32, pin_I2S_SD);
@@ -399,7 +399,20 @@ class ModuleIO : public Module {
 
       pinAssigner.assignPin(17, pin_Button_LightsOn);
       pinAssigner.assignPin(19, pin_Relay_LightsOn);
-    } else if (boardID == board_MHCV43) {    // https://shop.myhome-control.de/ABC-WLED-Controller-Board-5-24V/HW10015
+      pinAssigner.assignPin(18, pin_Infrared);
+
+      // e.g. for mic
+      pinAssigner.assignPin(32, pin_I2S_SD);
+      pinAssigner.assignPin(15, pin_I2S_WS);
+      pinAssigner.assignPin(14, pin_I2S_SCK);
+      // pinAssigner.assignPin(36, nc/ao...);
+
+      // e.g. for 4 line display
+      pinAssigner.assignPin(21, pin_I2C_SDA);
+      pinAssigner.assignPin(22, pin_I2C_SCL);
+
+      // pinAssigner.assignPin(?, pin_Temperature); // todo: check temp pin
+   } else if (boardID == board_MHCV43) {    // https://shop.myhome-control.de/ABC-WLED-Controller-Board-5-24V/HW10015
       object["maxPower"] = 75;               // 15A Fuse @ 5V
       uint8_t ledPins[] = {12, 13, 16, 18};  // 4 LED_PINS
       for (int i = 0; i < sizeof(ledPins); i++) pinAssigner.assignPin(ledPins[i], pin_LED);
@@ -426,39 +439,6 @@ class ModuleIO : public Module {
       } else {                                                                           // off - default
         uint8_t ledPins[] = {21, 20, 25, 5, 7, 23, 8, 27, 3, 22, 24, 4, 46, 47, 2, 48};  // 16 LED_PINS in this order
         for (int i = 0; i < sizeof(ledPins); i++) pinAssigner.assignPin(ledPins[i], pin_LED);
-      pinAssigner.assignPin(18, pin_Infrared);
-
-      // e.g. for mic
-      pinAssigner.assignPin(32, pin_I2S_SD);
-      pinAssigner.assignPin(15, pin_I2S_WS);
-      pinAssigner.assignPin(14, pin_I2S_SCK);
-      // pinAssigner.assignPin(36, nc/ao...);
-
-      // e.g. for 4 line display
-      pinAssigner.assignPin(21, pin_I2C_SDA);
-      pinAssigner.assignPin(22, pin_I2C_SCL);
-
-      // pinAssigner.assignPin(?, pin_Temperature); // todo: check temp pin
-
-    } else if (boardID == board_MHCD0) {
-      pinAssigner.assignPin(3, pin_Voltage);
-    } else if (boardID == board_MHCP4Nano) {                // https://shop.myhome-control.de/ABC-WLED-ESP32-P4-Shield/HW10027
-      object["maxPower"] = 100;                             // Assuming decent LED power!!
-      if (_state.data["jumper1"]) {                         // on
-        uint8_t ledPins[] = {21, 20, 25, 5, 7, 23, 8, 27};  // 8 LED_PINS
-        for (int i = 0; i < std::size(ledPins); i++) pinAssigner.assignPin(ledPins[i], pin_LED);
-        // per default used as LED Pins
-        pinAssigner.assignPin(3, pin_RS485);
-        pinAssigner.assignPin(4, pin_RS485);
-        pinAssigner.assignPin(22, pin_RS485);
-        pinAssigner.assignPin(24, pin_RS485);
-        pinAssigner.assignPin(2, pin_Exposed);
-        pinAssigner.assignPin(46, pin_Exposed);
-        pinAssigner.assignPin(47, pin_Exposed);
-        pinAssigner.assignPin(48, pin_Exposed);
-      } else {                                                                           // off - default
-        uint8_t ledPins[] = {21, 20, 25, 5, 7, 23, 8, 27, 3, 22, 24, 4, 46, 47, 2, 48};  // 16 LED_PINS
-        for (int i = 0; i < std::size(ledPins); i++) pinAssigner.assignPin(ledPins[i], pin_LED);
       }
 
       if (_state.data["switch2"]) {
@@ -474,7 +454,6 @@ class ModuleIO : public Module {
         pinAssigner.assignPin(12, pin_I2S_SCK);
         pinAssigner.assignPin(13, pin_I2S_MCLK);
       }
-
     } else if (boardID == board_YvesV48) {
       pinAssigner.assignPin(3, pin_LED);
     } else if (boardID == board_TroyP4Nano) {