LED Map improvements and cache alignment for weird sized matricies

Author: troyhacks

usermods/usermod_v2_artnetmap/usermod_v2_artnetmap.h

@@ -73,15 +73,6 @@ class ArtNetMapUsermod : public Usermod {
     return numOutputs > 0 ? maxUni + 1 : 0;
   }
 
-  // Get total LED count
-  uint32_t getTotalLeds() {
-    uint32_t total = 0;
-    for (uint16_t i = 0; i < numOutputs; i++) {
-      total += ledsPerOutput[i];
-    }
-    return total;
-  }
-
   // Generate sequential outputs
   void generateSequential(uint16_t count, uint16_t universesPerOutput, uint32_t leds) {
     numOutputs = min((uint16_t)ARTNETMAP_MAX_OUTPUTS, count);
@@ -184,6 +175,16 @@ class ArtNetMapUsermod : public Usermod {
 
 public:
 
+  // Get total LED count
+  uint32_t getTotalLeds() {
+    uint32_t total = 0;
+    for (uint16_t i = 0; i < numOutputs; i++) {
+      total += ledsPerOutput[i];
+    }
+    return total;
+  }
+
+
   ArtNetMapUsermod(bool enabled) : Usermod("ArtNetMap", enabled) {
     // Initialize arrays
     for (uint16_t i = 0; i < ARTNETMAP_MAX_OUTPUTS; i++) {

wled00/ArtNetReceiver.cpp

@@ -154,7 +154,7 @@ void ArtNetReceiver::_process_frame_internal() {
       if (!bus->isOk()) return;
       uint8_t* busPixelData = bus->getPixelData();
       uint32_t busLedCount = bus->getLength();
-      uint32_t bus_len_bytes = busLedCount * 3;
+      uint32_t bus_len_bytes = bus->getPixelDataSize();
 
       #if defined(CONFIG_IDF_TARGET_ESP32P4)
       // You will need p4_mul16x16.S for this to work.

wled00/FX.cpp

@@ -139,7 +139,7 @@ inline bool ppaEffectBegin(PPAEffectContext& ctx) {
   if (!bus->isOk()) return false;
 
   ctx.busPixelData = bus->getPixelData();
-  ctx.busPixelSize = ctx.max_width * ctx.max_height * 3;
+  ctx.busPixelSize = bus->getPixelDataSize();
 
   if (ctx.busPixelData == nullptr || ctx.busPixelSize == 0) {
     ctx.valid = false;
@@ -9751,7 +9751,7 @@ uint16_t mode_PPA_IMAGEPLAYER() {
   if (bus) {
     if (!bus->isOk()) return false;
     busPixelData = bus->getPixelData();
-    busPixelSize = SEGMENT.length() * 3;
+    busPixelSize = bus->getPixelDataSize();
     if (busPixelData == NULL || busPixelSize == 0) return 1;
   } else {
     return 1;
@@ -10274,7 +10274,7 @@ uint16_t mode_PRO_LINK() {
   if (bus) {
     if (!bus->isOk()) return false;
     busPixelData = bus->getPixelData();
-    busPixelSize = SEGMENT.length() * 3;
+    busPixelSize = bus->getPixelDataSize();
     if (!busPixelData || busPixelSize == 0) return 1;
   } else {
     return 1;
@@ -10576,7 +10576,7 @@ uint16_t mode_DJLight_Circles(void) {
   if (bus) {
     if (!bus->isOk()) return false;
     busPixelData = bus->getPixelData();
-    busPixelSize = SEGMENT.length() * 3;
+    busPixelSize = bus->getPixelDataSize();
     if (!busPixelData || busPixelSize == 0) return FRAMETIME;
   } else {
     return FRAMETIME;
@@ -10786,7 +10786,7 @@ uint16_t mode_DJLight_Circles(void) {
     srm_config.in.pic_h = rows;
     srm_config.in.block_w = qw;
     srm_config.in.block_h = qh;
-    srm_config.out.block_offset_x = qw;
+    srm_config.out.block_offset_x = cols - qw;
     srm_config.out.block_offset_y = 0;
     srm_config.mirror_x = true;
     srm_config.mirror_y = false;
@@ -10796,7 +10796,7 @@ uint16_t mode_DJLight_Circles(void) {
     srm_config.in.block_w = cols;
     srm_config.in.block_h = qh;
     srm_config.out.block_offset_x = 0;
-    srm_config.out.block_offset_y = qh;
+    srm_config.out.block_offset_y = rows - qh;
     srm_config.mirror_x = false;
     srm_config.mirror_y = true;
     ESP_ERROR_CHECK_WITHOUT_ABORT(ppa_do_scale_rotate_mirror(ppa_srm_handle, &srm_config));
@@ -10843,7 +10843,7 @@ uint16_t IRAM_ATTR mode_AkemiPPA() {
   if (bus) {
     if (!bus->isOk()) return false;
     busPixelData = bus->getPixelData();
-    busPixelSize = SEGMENT.length() * 3;
+    busPixelSize = bus->getPixelDataSize();
     if (busPixelData == NULL || busPixelSize == 0) return mode_static();
   } else {
     return mode_static();

wled00/FX.h

@@ -976,6 +976,7 @@ class WS2812FX {  // 96 bytes
       show(void),
       setTargetFps(uint8_t fps),
       enumerateLedmaps(); //WLEDMM (from fcn_declare)
+      void createLedmapBinaryCache();
 
     void setColor(uint8_t slot, uint8_t r, uint8_t g, uint8_t b, uint8_t w = 0) { setColor(slot, RGBW32(r,g,b,w)); }
     void fill(uint32_t c) { for (int i = 0; i < getLengthTotal(); i++) setPixelColor(i, c); } // fill whole strip with color (inline)