Add spidev: ch341 option in meshtasticd config.yaml

src/main.cpp

@@ -215,6 +215,9 @@ static OSThread *powerFSMthread;
 static OSThread *ambientLightingThread;
 
 RadioInterface *rIf = NULL;
+#ifdef ARCH_PORTDUINO
+RadioLibHal *RadioLibHAL = NULL;
+#endif
 
 /**
  * Some platforms (nrf52) might provide an alterate version that suppresses calling delay from sleep.
@@ -713,7 +716,9 @@ void setup()
     SPI.begin(false);
 #endif                     // HW_SPI1_DEVICE
 #elif !defined(ARCH_ESP32) // ARCH_RP2040
+    if (settingsStrings[spidev] != "ch341") {
         SPI.begin();
+    }
 #else
     // ESP32
     SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
@@ -817,10 +822,12 @@ void setup()
     if (settingsMap[use_sx1262]) {
         if (!rIf) {
             LOG_DEBUG("Activate sx1262 radio on SPI port %s", settingsStrings[spidev].c_str());
-            Ch341Hal *RadioLibHAL = new Ch341Hal(0);
+            if (settingsStrings[spidev] == "ch341") {
-/*            LockingArduinoHal *RadioLibHAL =
+                RadioLibHAL = new Ch341Hal(0);
+            } else {
+                RadioLibHAL =
                     new LockingArduinoHal(SPI, spiSettings, (settingsMap[ch341Quirk] ? settingsMap[busy] : RADIOLIB_NC));
-*/
+            }
             rIf = new SX1262Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                       settingsMap[busy]);
             if (!rIf->init()) {
@@ -834,8 +841,7 @@ void setup()
     } else if (settingsMap[use_rf95]) {
         if (!rIf) {
             LOG_DEBUG("Activate rf95 radio on SPI port %s", settingsStrings[spidev].c_str());
-            LockingArduinoHal *RadioLibHAL =
+            RadioLibHAL = new LockingArduinoHal(SPI, spiSettings, (settingsMap[ch341Quirk] ? settingsMap[busy] : RADIOLIB_NC));
-                new LockingArduinoHal(SPI, spiSettings, (settingsMap[ch341Quirk] ? settingsMap[busy] : RADIOLIB_NC));
             rIf = new RF95Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                     settingsMap[busy]);
             if (!rIf->init()) {
@@ -850,7 +856,7 @@ void setup()
     } else if (settingsMap[use_sx1280]) {
         if (!rIf) {
             LOG_DEBUG("Activate sx1280 radio on SPI port %s", settingsStrings[spidev].c_str());
-            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+            RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
             rIf = new SX1280Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                       settingsMap[busy]);
             if (!rIf->init()) {
@@ -865,7 +871,7 @@ void setup()
     } else if (settingsMap[use_sx1268]) {
         if (!rIf) {
             LOG_DEBUG("Activate sx1268 radio on SPI port %s", settingsStrings[spidev].c_str());
-            LockingArduinoHal *RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
+            RadioLibHAL = new LockingArduinoHal(SPI, spiSettings);
             rIf = new SX1268Interface((LockingArduinoHal *)RadioLibHAL, settingsMap[cs], settingsMap[irq], settingsMap[reset],
                                       settingsMap[busy]);
             if (!rIf->init()) {

src/mesh/SX126xInterface.cpp

@@ -57,8 +57,6 @@ template <typename T> bool SX126xInterface<T>::init()
         digitalWrite(settingsMap[sx126x_ant_sw], HIGH);
         pinMode(settingsMap[sx126x_ant_sw], OUTPUT);
     }
-    // lora.XTAL = true;
-    // lora.standbyXOSC = true;
 // FIXME: correct logic to default to not using TCXO if no voltage is specified for SX126X_DIO3_TCXO_VOLTAGE
 #elif !defined(SX126X_DIO3_TCXO_VOLTAGE)
     float tcxoVoltage =

src/platform/portduino/PortduinoGlue.cpp

@@ -152,7 +152,31 @@ void portduinoSetup()
     // Need to bind all the configured GPIO pins so they're not simulated
     // TODO: Can we do this in the for loop above?
     // TODO: If one of these fails, we should log and terminate
-    /*if (settingsMap.count(cs) > 0 && settingsMap[cs] != RADIOLIB_NC) {
+    if (settingsMap.count(user) > 0 && settingsMap[user] != RADIOLIB_NC) {
+        if (initGPIOPin(settingsMap[user], gpioChipName) != ERRNO_OK) {
+            settingsMap[user] = RADIOLIB_NC;
+        }
+    }
+    if (settingsMap[displayPanel] != no_screen) {
+        if (settingsMap[displayCS] > 0)
+            initGPIOPin(settingsMap[displayCS], gpioChipName);
+        if (settingsMap[displayDC] > 0)
+            initGPIOPin(settingsMap[displayDC], gpioChipName);
+        if (settingsMap[displayBacklight] > 0)
+            initGPIOPin(settingsMap[displayBacklight], gpioChipName);
+        if (settingsMap[displayReset] > 0)
+            initGPIOPin(settingsMap[displayReset], gpioChipName);
+    }
+    if (settingsMap[touchscreenModule] != no_touchscreen) {
+        if (settingsMap[touchscreenCS] > 0)
+            initGPIOPin(settingsMap[touchscreenCS], gpioChipName);
+        if (settingsMap[touchscreenIRQ] > 0)
+            initGPIOPin(settingsMap[touchscreenIRQ], gpioChipName);
+    }
+
+    // Only initialize the radio pins when dealing with real, kernel controlled SPI hardware
+    if (settingsStrings[spidev] != "" && settingsStrings[spidev] != "ch341") {
+        if (settingsMap.count(cs) > 0 && settingsMap[cs] != RADIOLIB_NC) {
             if (initGPIOPin(settingsMap[cs], gpioChipName) != ERRNO_OK) {
                 settingsMap[cs] = RADIOLIB_NC;
             }
@@ -177,11 +201,6 @@ void portduinoSetup()
                 settingsMap[sx126x_ant_sw] = RADIOLIB_NC;
             }
         }
-    if (settingsMap.count(user) > 0 && settingsMap[user] != RADIOLIB_NC) {
-        if (initGPIOPin(settingsMap[user], gpioChipName) != ERRNO_OK) {
-            settingsMap[user] = RADIOLIB_NC;
-        }
-    }
         if (settingsMap.count(rxen) > 0 && settingsMap[rxen] != RADIOLIB_NC) {
             if (initGPIOPin(settingsMap[rxen], gpioChipName) != ERRNO_OK) {
                 settingsMap[rxen] = RADIOLIB_NC;
@@ -191,26 +210,7 @@ void portduinoSetup()
             if (initGPIOPin(settingsMap[txen], gpioChipName) != ERRNO_OK) {
                 settingsMap[txen] = RADIOLIB_NC;
             }
-    } */
-
-    if (settingsMap[displayPanel] != no_screen) {
-        if (settingsMap[displayCS] > 0)
-            initGPIOPin(settingsMap[displayCS], gpioChipName);
-        if (settingsMap[displayDC] > 0)
-            initGPIOPin(settingsMap[displayDC], gpioChipName);
-        if (settingsMap[displayBacklight] > 0)
-            initGPIOPin(settingsMap[displayBacklight], gpioChipName);
-        if (settingsMap[displayReset] > 0)
-            initGPIOPin(settingsMap[displayReset], gpioChipName);
         }
-    if (settingsMap[touchscreenModule] != no_touchscreen) {
-        if (settingsMap[touchscreenCS] > 0)
-            initGPIOPin(settingsMap[touchscreenCS], gpioChipName);
-        if (settingsMap[touchscreenIRQ] > 0)
-            initGPIOPin(settingsMap[touchscreenIRQ], gpioChipName);
-    }
-
-    if (settingsStrings[spidev] != "") {
         SPI.begin(settingsStrings[spidev].c_str());
     }
     if (settingsStrings[traceFilename] != "") {
@@ -296,17 +296,22 @@ bool loadConfig(const char *configPath)
             settingsMap[ch341Quirk] = yamlConfig["Lora"]["ch341_quirk"].as<bool>(false);
             settingsMap[spiSpeed] = yamlConfig["Lora"]["spiSpeed"].as<int>(2000000);
 
-            settingsStrings[spidev] = "/dev/" + yamlConfig["Lora"]["spidev"].as<std::string>("spidev0.0");
+            settingsStrings[spidev] = yamlConfig["Lora"]["spidev"].as<std::string>("spidev0.0");
+            if (settingsStrings[spidev] != "ch341") {
+                settingsStrings[spidev] = "/dev/" + settingsStrings[spidev];
                 if (settingsStrings[spidev].length() == 14) {
                     int x = settingsStrings[spidev].at(11) - '0';
                     int y = settingsStrings[spidev].at(13) - '0';
+                    // Pretty sure this is always true
                     if (x >= 0 && x < 10 && y >= 0 && y < 10) {
+                        // I believe this bit of weirdness is specifically for the new GUI
                         settingsMap[spidev] = x + y << 4;
                         settingsMap[displayspidev] = settingsMap[spidev];
                         settingsMap[touchscreenspidev] = settingsMap[spidev];
                     }
                 }
             }
+        }
         if (yamlConfig["GPIO"]) {
             settingsMap[user] = yamlConfig["GPIO"]["User"].as<int>(RADIOLIB_NC);
         }