Fix serial + web setup for S3

quadule · Jan 28, 2024 · 1e4113b · 1e4113b
1 parent f28aa68
commit 1e4113b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -76,6 +76,7 @@ lib_deps =
 board = lilygo-t-display-s3
 build_flags =
   ${common.build_flags}
+  -DARDUINO_USB_CDC_ON_BOOT=1
   -DADC_EN=15
   -DADC_PIN=4
   -DBOARD_HAS_PSRAM=1

diff --git a/setup/firmware/tdisplay-s3/manifest.json b/setup/firmware/tdisplay-s3/manifest.json
@@ -5,7 +5,7 @@
     {
       "chipFamily": "ESP32-S3",
       "parts": [
-        { "path": "bootloader.bin", "offset": 4096 },
+        { "path": "bootloader.bin", "offset": 0 },
         { "path": "partitions.bin", "offset": 32768 },
         { "path": "ota_data_initial.bin", "offset": 57344 },
         { "path": "firmware.bin", "offset": 65536 }

diff --git a/setup/index.html b/setup/index.html
@@ -40,7 +40,7 @@
     </style>
     <script
       type="module"
-      src="https://unpkg.com/esp-web-tools@9.0.3/dist/web/install-button.js?module"
+      src="https://unpkg.com/esp-web-tools@9/dist/web/install-button.js?module"
     ></script>
   </head>
   <body>

diff --git a/src/main.cpp b/src/main.cpp
@@ -26,7 +26,11 @@ void setup() {
   spotifyLinkedPlaylists.reserve(10);
   spotifyPlaylists.reserve(100);
 
-  Serial.begin(115200);
+  #ifdef CONFIG_IDF_TARGET_ESP32S3
+    Serial.begin();
+  #else
+    Serial.begin(115200);
+  #endif
 
   knobby.setup();
   rtc_gpio_hold_dis((gpio_num_t)ROTARY_ENCODER_BUTTON_PIN);

diff --git a/src/main.h b/src/main.h
@@ -5,6 +5,7 @@
 #include <ESPAsync_WiFiManager.h>
 #include <ESPAsyncDNSServer.h>
 #include <ESPAsyncWebServer.h>
+#include <HardwareSerial.h>
 #include <HTTPClient.h>
 #include <list>
 #include <OneButton.h>