Rabbit Droppings

Author: troyhacks

pio-scripts/enable_lto_s3.py

@@ -44,10 +44,17 @@ def enable_lto(env):
     # library archives carry IR that the linker can optimise across.
     cc = str(env.get("CC", ""))
     if cc:
-        toolchain_prefix = cc.replace("gcc", "").replace("g++", "")
-        # toolchain_prefix is something like "xtensa-esp32s3-elf-"
-        new_ar     = toolchain_prefix + "gcc-ar"
-        new_ranlib = toolchain_prefix + "gcc-ranlib"
+        cc_basename = os.path.basename(cc)
+        # Strip trailing "gcc" or "g++" (with optional .exe suffix) from basename only
+        if cc_basename.endswith(".exe"):
+            cc_basename = cc_basename[:-4]
+        if cc_basename.endswith("gcc"):
+            cc_basename = cc_basename[:-3]
+        elif cc_basename.endswith("g++"):
+            cc_basename = cc_basename[:-3]
+        # cc_basename is now something like "xtensa-esp32s3-elf"
+        new_ar     = cc_basename + "-gcc-ar"
+        new_ranlib = cc_basename + "-gcc-ranlib"
 
         # Resolve CC to its real path so we can search the same directory
         cc_resolved = shutil.which(cc) or cc

usermods/M5Stack_CoreS3_Display/readme.md

@@ -19,7 +19,8 @@ Reset is controlled via the AW9523B GPIO expander (P1_1). Backlight is powered v
 
 In `platformio_override.ini` for your M5Stack Core S3 environment:
 
-```build_flags =
+```ini
+build_flags =
     -D USERMOD_M5STACK_CORE_S3_DISPLAY
     ;; For the M5Stack ModuleAudio:
     -D SR_ENABLE_DEFAULT
@@ -32,7 +33,8 @@ In `platformio_override.ini` for your M5Stack Core S3 environment:
     -D HW_SCL_PIN=11
 
 lib_deps =
-    https://github.com/lovyan03/LovyanGFX```
+    https://github.com/lovyan03/LovyanGFX
+```
 
 ## Features
 
@@ -48,7 +50,7 @@ lib_deps =
 
 - Uses LovyanGFX with `SPI3_HOST` (HSPI)
 - Native landscape 320x240 resolution
-- BGR color order, display inversion enabled
+- RGB color order, display inversion enabled
 - Backlight always on (controlled by AXP2101 DLDO1)
 
 ## TroyHacks Recommended AudioReactive Settings

usermods/M5Stack_CoreS3_Display/usermod_m5stack_s3_display.h

@@ -77,6 +77,7 @@ static LGFX_ILI9342_M5StackS3 tft;
 class M5StackCoreS3DisplayUsermod : public Usermod {
   private:
     bool enabled = true;
+    bool _initOk = false;
 
     // needRedraw marks if redraw is required to prevent often redrawing.
     bool needRedraw = true;
@@ -140,7 +141,7 @@ class M5StackCoreS3DisplayUsermod : public Usermod {
         Wire.write(0x90);
         Wire.endTransmission(false);
         Wire.requestFrom((uint8_t)AXP2101_ADDR, (uint8_t)1);
-        byte pwr_orig = Wire.read();
+        byte pwr_orig = Wire.available() ? Wire.read() : 0x00;
         Serial.printf("M5StackS3Display: 0x90 orig: 0x%02X\n", pwr_orig);
 
         // Set DLDO1 voltage to 3.3V (voltage reg 0x99)
@@ -155,7 +156,7 @@ class M5StackCoreS3DisplayUsermod : public Usermod {
         Wire.write(0x99);
         Wire.endTransmission(false);
         Wire.requestFrom((uint8_t)AXP2101_ADDR, (uint8_t)1);
-        byte dldo1_v = Wire.read();
+        byte dldo1_v = Wire.available() ? Wire.read() : 0x00;
         Serial.printf("M5StackS3Display: DLDO1 0x99: 0x%02X\n", dldo1_v);
 
         // Enable DLDO1 via bit 7 of 0x90
@@ -172,7 +173,7 @@ class M5StackCoreS3DisplayUsermod : public Usermod {
         Wire.write(0x90);
         Wire.endTransmission(false);
         Wire.requestFrom((uint8_t)AXP2101_ADDR, (uint8_t)1);
-        byte pwr_after = Wire.read();
+        byte pwr_after = Wire.available() ? Wire.read() : 0x00;
         Serial.printf("M5StackS3Display: 0x90 after: 0x%02X\n", pwr_after);
 
         // AW9523 GPIO expander for LCD reset
@@ -209,7 +210,7 @@ class M5StackCoreS3DisplayUsermod : public Usermod {
         Wire.write(0x03);  // P1 output register
         Wire.endTransmission(false);
         Wire.requestFrom((uint8_t)AW9523B_ADDR, (uint8_t)1);
-        byte p1_state = Wire.read();
+        byte p1_state = Wire.available() ? Wire.read() : 0x00;
         Serial.printf("M5StackS3Display: AW9523B P1 state: 0x%02X\n", p1_state);
 
         Serial.println("M5StackS3Display: init TFT");
@@ -222,11 +223,13 @@ class M5StackCoreS3DisplayUsermod : public Usermod {
             { (gpio_num_t)TFT_CS,   true },
             { (gpio_num_t)TFT_DC,  true }
         };
-        if (pinManager.allocateMultiplePins(pins, 4, PinOwner::UM_Unspecified)) {
-            Serial.println("M5StackS3Display: SPI pins allocated");
-        } else {
-            Serial.println("M5StackS3Display: SPI pin allocation FAILED");
+        if (!pinManager.allocateMultiplePins(pins, 4, PinOwner::UM_Unspecified)) {
+            Serial.println("M5StackS3Display: SPI pin allocation FAILED — disabling usermod");
+            enabled = false;
+            _initOk = false;
+            return;
         }
+        Serial.println("M5StackS3Display: SPI pins allocated");
 
         Serial.printf("M5StackS3Display: TFT width: %d, height: %d\n", tft.width(), tft.height());
 
@@ -248,13 +251,14 @@ class M5StackCoreS3DisplayUsermod : public Usermod {
         tft.drawString("Loading...", tft.width() - 10, textY);
 
         Serial.println("M5StackS3Display: setup complete");
+        _initOk = true;
     }
 
     /*
      * loop() is called continuously. Here you can check for events, read sensors, etc.
      */
     void loop() {
-        if (!enabled) return;
+        if (!enabled || !_initOk) return;
 
         unsigned long now = millis();