From 6d5b1d4c03b806233df84c1a7dd7517a1482b599 Mon Sep 17 00:00:00 2001 From: Ewoud Date: Sun, 3 Mar 2024 23:20:34 +0100 Subject: [PATCH] temp fix for mapping table crash --- src/App/AppFixture.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/App/AppFixture.cpp b/src/App/AppFixture.cpp index ca3d679e..0c233784 100644 --- a/src/App/AppFixture.cpp +++ b/src/App/AppFixture.cpp @@ -329,11 +329,12 @@ void Fixture::projectAndMap() { for (size_t i = leds->mappingTable.size(); i <= indexV; i++) { // USER_PRINTF("mapping %d,%d,%d add physMap before %d %d\n", pixel.y, pixel.y, pixel.z, indexV, leds->mappingTable.size()); std::vector physMap; + physMap.push_back(0); leds->mappingTable.push_back(physMap); //abort() was called at PC 0x40191473 on core 1 std::allocator >&&) } } //indexV is within the square - leds->mappingTable[indexV].push_back(indexP); //add the current led in the right physMap + leds->mappingTable[indexV].push_back(indexP); //add the current led in the right physMap } else USER_PRINTF("dev post [%d] indexP too high %d>=%d or %d (p:%d m:%d) p:%d,%d,%d\n", rowNr, indexP, nrOfLeds, NUM_LEDS_Max, leds->mappingTable.size(), indexP, pixel.x, pixel.y, pixel.z); @@ -402,13 +403,13 @@ void Fixture::projectAndMap() { } else { - if (leds->mappingTable.size() < leds->size.x * leds->size.y * leds->size.z) - USER_PRINTF("mapping add extra physMap %d to %d size: %d,%d,%d\n", leds->mappingTable.size(), leds->size.x * leds->size.y * leds->size.z, leds->size.x, leds->size.y, leds->size.z); - for (size_t i = leds->mappingTable.size(); i < leds->size.x * leds->size.y * leds->size.z; i++) { - std::vector physMap; - // physMap.push_back(0); - leds->mappingTable.push_back(physMap); - } + // if (leds->mappingTable.size() < leds->size.x * leds->size.y * leds->size.z) + // USER_PRINTF("mapping add extra physMap %d to %d size: %d,%d,%d\n", leds->mappingTable.size(), leds->size.x * leds->size.y * leds->size.z, leds->size.x, leds->size.y, leds->size.z); + // for (size_t i = leds->mappingTable.size(); i < leds->size.x * leds->size.y * leds->size.z; i++) { + // std::vector physMap; + // // physMap.push_back(0); + // leds->mappingTable.push_back(physMap); + // } leds->nrOfLeds = leds->mappingTable.size();