Merge branch 'master' into tft-gui-work

arch/portduino/portduino.ini

@@ -1,6 +1,6 @@
 ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#784007630ca43b4811c6637606440588bb5acf39
+platform = https://github.com/meshtastic/platform-native.git#9881bf3721d610cccacf5ae8e3a07839cce75d63
 framework = arduino
 
 build_src_filter = 
@@ -34,4 +34,4 @@ build_flags =
   -DPORTDUINO_LINUX_HARDWARE
   -lbluetooth
   -lgpiod
-  -lyaml-cpp
+  -lyaml-cpp

boards/tbeam-s3-core.json

@@ -7,6 +7,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DLILYGO_TBEAM_S3_CORE",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
       "-DARDUINO_USB_MODE=1",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"

src/platform/portduino/PortduinoGlue.cpp

@@ -75,20 +75,20 @@ void portduinoSetup()
 {
     printf("Setting up Meshtastic on Portduino...\n");
     int max_GPIO = 0;
-    int GPIO_lines[] = {cs,
-                        irq,
-                        busy,
-                        reset,
-                        txen,
-                        rxen,
-                        displayDC,
-                        displayCS,
-                        displayBacklight,
-                        displayBacklightPWMChannel,
-                        displayReset,
-                        touchscreenCS,
-                        touchscreenIRQ,
-                        user};
+    configNames GPIO_lines[] = {cs,
+                                irq,
+                                busy,
+                                reset,
+                                txen,
+                                rxen,
+                                displayDC,
+                                displayCS,
+                                displayBacklight,
+                                displayBacklightPWMChannel,
+                                displayReset,
+                                touchscreenCS,
+                                touchscreenIRQ,
+                                user};
 
     std::string gpioChipName = "gpiochip";
     settingsStrings[i2cdev] = "";
@@ -281,9 +281,9 @@ void portduinoSetup()
         exit(EXIT_FAILURE);
     }
 
-    for (int i : GPIO_lines) {
-        if (i > max_GPIO)
-            max_GPIO = i;
+    for (configNames i : GPIO_lines) {
+        if (settingsMap[i] > max_GPIO)
+            max_GPIO = settingsMap[i];
     }
 
     gpioInit(max_GPIO + 1); // Done here so we can inform Portduino how many GPIOs we need.

variants/tbeam-s3-core/platformio.ini

@@ -3,6 +3,8 @@
 extends = esp32s3_base
 board = tbeam-s3-core
 
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.15
+
 lib_deps =
   ${esp32s3_base.lib_deps}
   lewisxhe/PCF8563_Library@1.0.1