added Y-Offset for 128x64, support 4 buttons with S3, re-added debug mode

Author: mkalkbrenner

src/displayConfig.cpp

@@ -1,7 +1,8 @@
 #include "displayConfig.h"
 
-uint8_t rgbMode = 0;
+int8_t rgbMode = 0;
 uint8_t rgbModeLoaded = 0;
+uint8_t yOffset = 0;
 
 // I needed to change these from RGB to RC (Red Color), BC, GC to prevent
 // conflicting with the TFT_SPI Library.

src/displayConfig.h

@@ -8,8 +8,9 @@
 #define BC 2
 
 // Global variables
-extern uint8_t rgbMode;
+extern int8_t rgbMode;
 extern uint8_t rgbModeLoaded;
+extern uint8_t yOffset;
 
 // Constant array
 extern const uint8_t rgbOrder[3 * 6];

src/displays/LEDMatrix.cpp

@@ -47,11 +47,11 @@ void LedMatrix::SetCurrentScalingMode(uint8_t mode) {}
 
 void LedMatrix::DrawPixel(uint16_t x, uint16_t y, uint8_t r, uint8_t g,
                           uint8_t b) {
-  dma_display->drawPixelRGB888(x, y, r, g, b);
+  dma_display->drawPixelRGB888(x, y + yOffset, r, g, b);
 }
 
 void LedMatrix::DrawPixel(uint16_t x, uint16_t y, uint16_t color) {
-  dma_display->drawPixel(x, y, color);
+  dma_display->drawPixel(x, y + yOffset, color);
 }
 
 void LedMatrix::ClearScreen() { dma_display->clearScreen(); }
@@ -78,48 +78,48 @@ void LedMatrix::DisplayText(const char *text, uint16_t x, uint16_t y, uint8_t r,
         if (transparent && !p) {
           continue;
         }
-        dma_display->drawPixelRGB888(x + pixel + (ti * 4), y + tj, r * p, g * p,
+        dma_display->drawPixelRGB888(x + pixel + (ti * 4), y + yOffset + tj, r * p, g * p,
                                      b * p);
       }
     }
   }
 }
 
 void IRAM_ATTR LedMatrix::FillZoneRaw(uint8_t idx, uint8_t *pBuffer) {
-  const uint8_t yOffset = (idx / ZONES_PER_ROW) * ZONE_HEIGHT;
-  const uint8_t xOffset = (idx % ZONES_PER_ROW) * ZONE_WIDTH;
+  const uint8_t zoneYOffset = (idx / ZONES_PER_ROW) * ZONE_HEIGHT;
+  const uint8_t zoneXOffset = (idx % ZONES_PER_ROW) * ZONE_WIDTH;
 
   for (uint8_t y = 0; y < ZONE_HEIGHT; y++) {
     for (uint8_t x = 0; x < ZONE_WIDTH; x++) {
       uint16_t pos = (y * ZONE_WIDTH + x) * 3;
 
-      dma_display->drawPixelRGB888(x + xOffset, y + yOffset, pBuffer[pos],
+      dma_display->drawPixelRGB888(x + zoneXOffset, y + zoneYOffset + yOffset, pBuffer[pos],
                                    pBuffer[pos + 1], pBuffer[pos + 2]);
     }
   }
 }
 
 void IRAM_ATTR LedMatrix::FillZoneRaw565(uint8_t idx, uint8_t *pBuffer) {
-  const uint8_t yOffset = (idx / ZONES_PER_ROW) * ZONE_HEIGHT;
-  const uint8_t xOffset = (idx % ZONES_PER_ROW) * ZONE_WIDTH;
+  const uint8_t zoneYOffset = (idx / ZONES_PER_ROW) * ZONE_HEIGHT;
+  const uint8_t zoneXOffset = (idx % ZONES_PER_ROW) * ZONE_WIDTH;
 
   for (uint8_t y = 0; y < ZONE_HEIGHT; y++) {
     for (uint8_t x = 0; x < ZONE_WIDTH; x++) {
       uint16_t pos = (y * ZONE_WIDTH + x) * 2;
       dma_display->drawPixel(
-          x + xOffset, y + yOffset,
+          x + zoneXOffset, y + zoneYOffset + yOffset,
           (((uint16_t)pBuffer[pos + 1]) << 8) + pBuffer[pos]);
     }
   }
 }
 
 void IRAM_ATTR LedMatrix::ClearZone(uint8_t idx) {
-  const uint8_t yOffset = (idx / ZONES_PER_ROW) * ZONE_HEIGHT;
-  const uint8_t xOffset = (idx % ZONES_PER_ROW) * ZONE_WIDTH;
+  const uint8_t zoneYOffset = (idx / ZONES_PER_ROW) * ZONE_HEIGHT;
+  const uint8_t zoneXOffset = (idx % ZONES_PER_ROW) * ZONE_WIDTH;
 
   for (uint8_t y = 0; y < ZONE_HEIGHT; y++) {
     for (uint8_t x = 0; x < ZONE_WIDTH; x++) {
-      dma_display->drawPixelRGB888(x + xOffset, y + yOffset, 0, 0, 0);
+      dma_display->drawPixelRGB888(x + zoneXOffset, y + zoneYOffset + yOffset, 0, 0, 0);
     }
   }
 }
@@ -131,7 +131,7 @@ void IRAM_ATTR LedMatrix::FillPanelRaw(uint8_t *pBuffer) {
     for (uint16_t x = 0; x < TOTAL_WIDTH; x++) {
       pos = (y * TOTAL_WIDTH + x) * 3;
 
-      dma_display->drawPixelRGB888(x, y, pBuffer[pos], pBuffer[pos + 1],
+      dma_display->drawPixelRGB888(x, y + yOffset, pBuffer[pos], pBuffer[pos + 1],
                                    pBuffer[pos + 2]);
     }
   }