Bugfix add indexP to mappingTable

MoonModules · Jul 26, 2024 · 9bd1210 · 9bd1210
1 parent 85f3e97
commit 9bd1210
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/App/LedFixture.cpp b/src/App/LedFixture.cpp
@@ -202,6 +202,9 @@ void Fixture::projectAndMap() {
 
           uint16_t nrOfLogical = 0;
           uint16_t nrOfPhysical = 0;
+          uint16_t nrOfPhysicalM = 0;
+          uint16_t nrOfColor = 0;
+          uint16_t nrOfColorPal = 0;
 
           if (leds->projectionNr == p_Random || leds->projectionNr == p_None) {
 
@@ -222,29 +225,34 @@ void Fixture::projectAndMap() {
 
             //debug info + summary values
             for (PhysMap &map:leds->mappingTable) {
-              // ppf("i: %d t:%d\n", nrOfLogical, map.mapType);
               switch (map.mapType) {
+                case m_color:
+                  nrOfColor++;
+                  break;
                 case m_onePixel:
-                  // ppf("ledV %d mapping: #ledsP : %d\n", nrOfLogical, map.indexP);
+                  // ppf("ledV %d mapping =1: #ledsP : %d\n", nrOfLogical, map.indexP);
                   nrOfPhysical++;
                   break;
                 case m_morePixels:
-                  // ppf("ledV %d mapping: #ledsP :", nrOfLogical);
+                  // ppf("ledV %d mapping >1: #ledsP :", nrOfLogical);
 
                   for (uint16_t indexP: leds->mappingTableIndexes[map.indexes]) {
-                    // ppf(" %d", indexP);
-                    nrOfPhysical++;
+                    ppf(" %d", indexP);
+                    nrOfPhysicalM++;
                   }
                   // ppf("\n");
                   break;
+                case m_colorPal:
+                  nrOfColorPal++;
+                  break;
               }
               nrOfLogical++;
               // else
               //   ppf("ledV %d no mapping\n", x);
             }
           }
 
-          ppf("projectAndMap leds[%d] V:%d x %d x %d -> %d (v:%d - p:%d)\n", rowNr, leds->size.x, leds->size.y, leds->size.z, leds->nrOfLeds, nrOfLogical, nrOfPhysical);
+          ppf("projectAndMap leds[%d] V:%d x %d x %d -> %d (v:%d - p:%d pm:%d c:%d cp:%d)\n", rowNr, leds->size.x, leds->size.y, leds->size.z, leds->nrOfLeds, nrOfLogical, nrOfPhysical, nrOfPhysicalM, nrOfColor, nrOfColorPal);
 
           // mdl->setValueV("ledsSize", rowNr, "%d x %d x %d = %d", leds->size.x, leds->size.y, leds->size.z, leds->nrOfLeds);
           char buf[32];

diff --git a/src/App/LedLeds.cpp b/src/App/LedLeds.cpp
@@ -164,11 +164,11 @@ void PhysMap::addIndexP(Leds &leds, uint16_t indexP) {
   switch (mapType) {
     case m_color:
     // case m_rgbColor:
-      indexP = indexP;
+      this->indexP = indexP;
       mapType = m_onePixel;
       break;
     case m_onePixel: {
-      uint16_t oldIndexP = indexP;
+      uint16_t oldIndexP = this->indexP;
       std::vector<uint16_t> newVector;
       newVector.push_back(oldIndexP);
       newVector.push_back(indexP);

diff --git a/src/App/LedLeds.h b/src/App/LedLeds.h
@@ -215,9 +215,9 @@ struct PhysMap {
     mapType = m_color; // the default until indexP is added
   }
 
-  void addIndexP(Leds &leds, uint16_t indexP); // addIndexP: temp method until all effects have been converted to Palette / 2 byte mapping mode
+  void addIndexP(Leds &leds, uint16_t indexP);
 
-}; // 4 bytes
+}; // 2 bytes
 
 class Projection; //forward for cached virtual class methods!