From 71400103b3e9f981cc1ac7f3dff4c24b663a93ab Mon Sep 17 00:00:00 2001
From: Oliver Seiler <oseiler2@users.noreply.github.com>
Date: Thu, 2 May 2024 18:39:18 +0000
Subject: [PATCH 1/3] set USB_CDC_ON_BOOT, udate arduinoespressif32 to 2.0.15
 (#3764)

---
 boards/tbeam-s3-core.json             | 1 +
 variants/tbeam-s3-core/platformio.ini | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/boards/tbeam-s3-core.json b/boards/tbeam-s3-core.json
index 4c82a2789..8d2c3eed6 100644
--- a/boards/tbeam-s3-core.json
+++ b/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"
diff --git a/variants/tbeam-s3-core/platformio.ini b/variants/tbeam-s3-core/platformio.ini
index 99d315a69..926f15a39 100644
--- a/variants/tbeam-s3-core/platformio.ini
+++ b/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

From 06e7d2b8459f86e55cae1ab5a2bb5e2a21d7b118 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Thu, 2 May 2024 13:39:28 -0500
Subject: [PATCH 2/3] Track actual GPIO values, not just the enum values
 (#3768)

* Track actual GPIO values, not just the enum values

* trunk
---
 src/platform/portduino/PortduinoGlue.cpp | 34 ++++++++++++------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/platform/portduino/PortduinoGlue.cpp b/src/platform/portduino/PortduinoGlue.cpp
index 6151da227..35cee2d2f 100644
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/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.

From b69a1cada916bec7bf39cd970f9412e5de464cb7 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Thu, 2 May 2024 13:54:50 -0500
Subject: [PATCH 3/3] Portduino bump to pick up minor fix (#3770)

---
 arch/portduino/portduino.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 162411972..63f5576b6 100644
--- a/arch/portduino/portduino.ini
+++ b/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
\ No newline at end of file
+  -lyaml-cpp