Merge pull request MoonModules#224 from troyhacks/P4_experimental

P4 experimental

Author: troyhacks

boards/lolin_s3_mini.json

@@ -0,0 +1,47 @@
+{
+    "build": {
+      "arduino": {
+        "ldscript": "esp32s3_out.ld",
+        "memory_type": "qio_qspi"
+      },
+      "core": "esp32",
+      "extra_flags": [
+        "-DBOARD_HAS_PSRAM",
+        "-DARDUINO_LOLIN_S3_MINI",
+        "-DARDUINO_USB_MODE=1"
+      ],
+      "f_cpu": "240000000L",
+      "f_flash": "80000000L",
+      "flash_mode": "qio",
+      "hwids": [
+        [
+          "0x303A",
+          "0x8167"
+        ]
+      ],
+      "mcu": "esp32s3",
+      "variant": "lolin_s3_mini"
+    },
+    "connectivity": [
+      "bluetooth",
+      "wifi"
+    ],
+    "debug": {
+      "openocd_target": "esp32s3.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "WEMOS LOLIN S3 Mini",
+    "upload": {
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://www.wemos.cc/en/latest/s3/index.html",
+    "vendor": "WEMOS"
+}
+  

platformio.ini

@@ -294,7 +294,8 @@ class PIRsensorSwitch : public Usermod
   void loop()
   {
     // only check sensors 4x/s
-    if (!enabled || millis() - lastLoop < 250 || strip.isUpdating()) return;
+    if (!enabled || millis() - lastLoop < 250) return;
+    if (strip.isUpdating() && (millis() - lastLoop < 250)) return; // WLEDMM be nice, but not too nice
     lastLoop = millis();
 
     if (!updatePIRsensorState()) {

usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h

@@ -1836,54 +1836,62 @@ class AudioReactive : public Usermod {
       agcSensitivity = 128.0f; // substitute - V1 format does not include this value
     }
 
-    bool receiveAudioData()   // check & process new data. return TRUE in case that new audio data was received. 
-    {
+    bool receiveAudioData() {
       if (!udpSyncConnected) return false;
       bool haveFreshData = false;
-
       size_t packetSize = 0;
-      // WLEDMM use exception handler to catch out-of-memory errors
-      #if __cpp_exceptions
-        try{
+      static uint8_t fftUdpBuffer[UDPSOUND_MAX_PACKET + 1] = {0};
+      size_t lastValidPacketSize = 0;
+
+      // Loop to read all available packets
+      while (true) {
+        #if __cpp_exceptions
+        try {
           packetSize = fftUdp.parsePacket();
-        } catch(...) {
-          packetSize = 0; // low heap memory -> discard packet.
-#ifdef ARDUINO_ARCH_ESP32
-          fftUdp.flush();  // this does not work on 8266
-#endif
+        } catch (...) {
+          packetSize = 0;
+          #ifdef ARDUINO_ARCH_ESP32
+          fftUdp.flush();
+          #endif
           DEBUG_PRINTLN(F("receiveAudioData: parsePacket out of memory exception caught!"));
           USER_FLUSH();
+          continue; // Skip to next iteration
         }
-      #else
+        #else
         packetSize = fftUdp.parsePacket();
-      #endif
+        #endif
 
-#ifdef ARDUINO_ARCH_ESP32
-      if ((packetSize > 0) && ((packetSize < 5) || (packetSize > UDPSOUND_MAX_PACKET))) fftUdp.flush(); // discard invalid packets (too small or too big)
-#endif
-      if ((packetSize > 5) && (packetSize <= UDPSOUND_MAX_PACKET)) {
-        static uint8_t fftUdpBuffer[UDPSOUND_MAX_PACKET+1] = { 0 }; // static buffer for receiving, to reuse the same memory and avoid heap fragmentation
-        //DEBUGSR_PRINTLN("Received UDP Sync Packet");
-        fftUdp.read(fftUdpBuffer, packetSize);
+        #ifdef ARDUINO_ARCH_ESP32
+        if ((packetSize > 0) && ((packetSize < 5) || (packetSize > UDPSOUND_MAX_PACKET))) {
+          fftUdp.flush();
+          continue; // Skip invalid packets
+        }
+        #endif
+
+        if (packetSize == 0) break; // No more packets available
 
-        // VERIFY THAT THIS IS A COMPATIBLE PACKET
-        if (packetSize == sizeof(audioSyncPacket) && (isValidUdpSyncVersion((const char *)fftUdpBuffer))) {
+        if ((packetSize > 5) && (packetSize <= UDPSOUND_MAX_PACKET)) {
+          fftUdp.read(fftUdpBuffer, packetSize);
+          lastValidPacketSize = packetSize;
+        }
+      }
+
+      // Process only the last valid packet
+      if (lastValidPacketSize > 0) {
+        if (lastValidPacketSize == sizeof(audioSyncPacket) && (isValidUdpSyncVersion((const char *)fftUdpBuffer))) {
           receivedFormat = 2;
-          haveFreshData = decodeAudioData(packetSize, fftUdpBuffer);
-          //DEBUGSR_PRINTLN("Finished parsing UDP Sync Packet v2");
+          haveFreshData = decodeAudioData(lastValidPacketSize, fftUdpBuffer);
+        } else if (lastValidPacketSize == sizeof(audioSyncPacket_v1) && (isValidUdpSyncVersion_v1((const char *)fftUdpBuffer))) {
+          decodeAudioData_v1(lastValidPacketSize, fftUdpBuffer);
+          receivedFormat = 1;
+          haveFreshData = true;
         } else {
-          if (packetSize == sizeof(audioSyncPacket_v1) && (isValidUdpSyncVersion_v1((const char *)fftUdpBuffer))) {
-            decodeAudioData_v1(packetSize, fftUdpBuffer);
-            receivedFormat = 1;
-            //DEBUGSR_PRINTLN("Finished parsing UDP Sync Packet v1");
-            haveFreshData = true;
-          } else receivedFormat = 0; // unknown format
+          receivedFormat = 0; // unknown format
         }
       }
       return haveFreshData;
     }
 
-
     //////////////////////
     // usermod functions//
     //////////////////////
@@ -2319,6 +2327,7 @@ class AudioReactive : public Usermod {
           static float syncVolumeSmth = 0;
           bool have_new_sample = false;
           if (millis() - lastTime > delayMs) {
+            // DEBUG_PRINTF(F("AR reading at %d compared to %d max\n"), millis() - lastTime, delayMs); // TroyHacks
             have_new_sample = receiveAudioData();
             if (have_new_sample) {
               last_UDPTime = millis();

usermods/audioreactive/audio_reactive.h

@@ -677,7 +677,7 @@ class ES8311Source : public I2SSource {
 
     void _es8311InitAdc() {
       // 
-      // Currently only tested with the ESP32-P4 EV board with the onboard mic.
+      // Currently only tested with the ESP32-P4 boards with the onboard mic.
       // Datasheet with I2C commands: https://dl.xkwy2018.com/downloads/RK3588/01_Official%20Release/04_Product%20Line%20Branch_NVR/02_Key%20Device%20Specifications/ES8311%20DS.pdf
       //
       _es8311I2cBegin(); 
@@ -693,24 +693,23 @@ class ES8311Source : public I2SSource {
       _es8311I2cWrite(0x08, 0b11111111); // 22050hz calculated
       _es8311I2cWrite(0x06, 0b11100011); // 22050hz calculated
 
-      _es8311I2cWrite(0x16, 0b00100100); // ADC was 0b00000011 trying 0b00100100 was good, trying ...111 (...111 is better?)
+      _es8311I2cWrite(0x16, 0b00100100); // ADC was 0b00000011 trying 0b00100100 was good
       _es8311I2cWrite(0x0B, 0b00000000); // SYSTEM at default
       _es8311I2cWrite(0x0C, 0b00100000); // SYSTEM was 0b00001111 trying 0b00100000
       _es8311I2cWrite(0x10, 0b00010011); // SYSTEM was 0b00011111 trying 0b00010011
       _es8311I2cWrite(0x11, 0b01111100); // SYSTEM was 0b01111111 trying 0b01111100
       _es8311I2cWrite(0x00, 0b11000000); // *** RESET (again - seems important?)
       _es8311I2cWrite(0x01, 0b00111010); // *** CLOCK MANAGER was 0b00111111 trying 0b00111010 (again?? seems important)
-      _es8311I2cWrite(0x14, 0b00010000); // *** SYSTEM was 0b00011010 trying 0b00010000 (or 0b01111010) (PGA gain)
+      _es8311I2cWrite(0x14, 0b00010000); // *** SYSTEM was 0b00011010 trying 0b00010000 (PGA gain)
       _es8311I2cWrite(0x0A, 0b00001000); // *** SDP OUT, was 0b00001100 trying 0b00001000 (I2S 32-bit)
-      _es8311I2cWrite(0x0E, 0b00000010); // *** SYSTEM was 0b00000010 trying 0b00011010 (seems best so far!) (or 0b00000010)
+      _es8311I2cWrite(0x0E, 0b00000010); // *** SYSTEM was 0b00000010 trying 0b00000010
       _es8311I2cWrite(0x0F, 0b01000100); // SYSTEM was 0b01000100
       _es8311I2cWrite(0x15, 0b00010000); // ADC soft ramp (disabled 0000xxxx)
       _es8311I2cWrite(0x1B, 0b00000101); // ADC soft-mute was 0b00000101
-      _es8311I2cWrite(0x1C, 0b01100101); // ADC EQ and offset freeze was 0b01100101 (bad at 0b00101100)
-      _es8311I2cWrite(0x17, 0b10111111); // ADC volume was 0b11111111 trying ADC volume 0b10111111 = 0db (maxgain) 0x16
+      _es8311I2cWrite(0x1C, 0b01100101); // ADC EQ and offset freeze at 0b01100101 (bad at 0b00101100)
+      _es8311I2cWrite(0x17, 0b10111111); // ADC volume was 0b11111111 trying ADC volume 0b10111111 = 0db (maxgain)
       _es8311I2cWrite(0x18, 0b10000001); // ADC ALC enabled and AutoMute disabled.
-      // _es8311I2cWrite(0x19, 0b11110100); // ADC ALC max and min
-
+      // _es8311I2cWrite(0x19, 0b11110100); // ADC ALC max and min - not sure how best to use this, default seems fine
     }
 
   public:

usermods/audioreactive/audio_source.h

@@ -9,7 +9,7 @@ The actual / original code that controls the LED modes is from Adam Zeloof. I ta
 It was quite a bit more work than I hoped, but I got there eventually :)
 
 ## Requirements
-* "ESP Rotary" by Lennart Hennigs, v1.5.0 or higher: https://github.com/LennartHennigs/ESPRotary
+* "ESP Rotary" by Lennart Hennigs, v2.1.1 or higher: https://github.com/LennartHennigs/ESPRotary
 
 ## Usermod installation
 Simply copy the below block (build task) to your `platformio_override.ini` and compile WLED using this new build task. Or use an existing one and add the buildflag `-D RGB_ROTARY_ENCODER`.
@@ -20,7 +20,7 @@ ESP32:
 extends = env:esp32dev
 build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 -D RGB_ROTARY_ENCODER
 lib_deps = ${esp32.lib_deps}
-    lennarthennigs/ESP Rotary@^1.5.0
+    lennarthennigs/ESP Rotary@^2.1.1
 ```
 
 ESP8266 / D1 Mini:
@@ -29,7 +29,7 @@ ESP8266 / D1 Mini:
 extends = env:d1_mini
 build_flags = ${common.build_flags_esp8266} -D RGB_ROTARY_ENCODER
 lib_deps = ${esp8266.lib_deps}
-    lennarthennigs/ESP Rotary@^1.5.0
+    lennarthennigs/ESP Rotary@^2.1.1
 ```
 
 ## How to connect the board to your ESP

usermods/rgb-rotary-encoder/readme.md

@@ -607,12 +607,18 @@ typedef struct Segment {
     // transition functions
     void     startTransition(uint16_t dur); // transition has to start before actual segment values change
     void     handleTransition(void);
-    uint16_t progress(void) const; //transition progression between 0-65535
+    // transition progression between 0-65535
+    [[gnu::hot]] inline uint16_t progress() const {
+      if (!transitional || !_t) return 0xFFFFU;
+      unsigned long timeNow = millis();
+      if (timeNow - _t->_start > _t->_dur || _t->_dur == 0) return 0xFFFFU;
+      return (timeNow - _t->_start) * 0xFFFFU / _t->_dur;
+    }
 
     // WLEDMM method inlined for speed (its called at each setPixelColor)
-    inline uint8_t  currentBri(uint8_t briNew, bool useCct = false) {
-      uint32_t prog = (transitional && _t) ? progress() : 0xFFFFU;
-      if (transitional && _t && prog < 0xFFFFU) {
+    [[gnu::hot]] inline uint8_t currentBri(uint8_t briNew, bool useCct = false) const {
+      uint32_t prog = progress();
+      if (prog < 0xFFFFU) {  // progress() < 0xFFFFU implies that _t is valid (see progress() function)
         if (useCct) return ((briNew * prog) + _t->_cctT * (0xFFFFU - prog)) >> 16;
         else        return ((briNew * prog) + _t->_briT * (0xFFFFU - prog)) >> 16;
       } else {
@@ -703,15 +709,15 @@ typedef struct Segment {
     void deletejMap(); //WLEDMM jMap
 
   #ifndef WLED_DISABLE_2D
-    inline uint16_t XY(uint_fast16_t x, uint_fast16_t y)  const  { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
+    [[gnu::hot]] inline uint16_t XY(uint_fast16_t x, uint_fast16_t y)  const  { // support function to get relative index within segment (for leds[]) // WLEDMM inline for speed
       uint_fast16_t width  = max(uint16_t(1), virtualWidth());   // segment width in logical pixels  -- softhack007 avoid div/0
       uint_fast16_t height = max(uint16_t(1), virtualHeight());  // segment height in logical pixels -- softhack007 avoid div/0
       return (x%width) + (y%height) * width;
     }
 
 #ifdef WLEDMM_FASTPATH
     // WLEDMM this is a "gateway" function - we either call _fast or fall back to "slow" 
-    inline void setPixelColorXY(int x, int y, uint32_t col) {
+    [[gnu::hot]] inline void setPixelColorXY(int x, int y, uint32_t col) {
       if (!_isSimpleSegment) { // slow path
         setPixelColorXY_slow(x, y, col);
       } else {                 // fast path
@@ -724,7 +730,7 @@ typedef struct Segment {
         setPixelColorXY_fast(x, y, col, scaled_col, int(_2dWidth), int(_2dHeight));       // call "fast" function
       }
     }
-    inline uint32_t getPixelColorXY(int x, int y) const {
+    [[gnu::hot]] inline uint32_t getPixelColorXY(int x, int y) const {
       // minimal sanity checks
       if (!_isValid2D) return 0;                                                // not active
       if ((unsigned(x) >= _2dWidth) || (unsigned(y) >= _2dHeight)) return 0 ;   // check if (x,y) are out-of-range - due to 2's complement, this also catches negative values
@@ -1081,7 +1087,7 @@ class WS2812FX {  // 96 bytes
 #endif
 
     std::vector<segment> _segments;
-    friend class Segment;
+    friend struct Segment;
 
     uint32_t getPixelColorXYRestored(uint16_t x, uint16_t y)  const;  // WLEDMM gets the original color from the driver (without downscaling by _bri)
 

wled00/FX.h

@@ -68,7 +68,7 @@ void WS2812FX::setUpMatrix() {
       if (!needLedMap) size = 0;                                                        // softhack007
       USER_PRINTF("setupmatrix customMappingTable alloc %d from %d\n", size, customMappingTableSize);
       //if (customMappingTable != nullptr) delete[] customMappingTable;
-      //customMappingTable = new uint16_t[size];
+      //customMappingTable = new(std::nothrow) uint16_t[size];
 
       // don't use new / delete
       if ((size > 0) && (customMappingTable != nullptr)) {  // resize
@@ -129,7 +129,7 @@ void WS2812FX::setUpMatrix() {
           JsonArray map = doc.as<JsonArray>();
           gapSize = map.size();
           if (!map.isNull() && (gapSize > 0) && gapSize >= customMappingSize) { // not an empty map //softhack also check gapSize>0 
-            gapTable = new int8_t[gapSize];
+            gapTable = new(std::nothrow) int8_t[gapSize];
             if (gapTable) for (size_t i = 0; i < gapSize; i++) {
               gapTable[i] = constrain(map[i], -1, 1);
             }