reduced default USB package sitze for original EPS32, added more meta…

… data to handshake response
PPUC · Feb 7, 2025 · ca274b7 · ca274b7
1 parent 18d509e
commit ca274b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 48 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -61,7 +61,7 @@
 #endif
 #else
 #define SERIAL_BAUD 921600
-#define USB_PACKAGE_SIZE 512
+#define USB_PACKAGE_SIZE 64
 #endif
 #define SERIAL_TIMEOUT \
   8  // Time in milliseconds to wait for the next data chunk.
@@ -781,6 +781,17 @@ static uint8_t IRAM_ATTR HandleData(uint8_t *pData, size_t len) {
                 (usbPackageSizeMultiplier * 32) & 0xff;
             response[N_INTERMEDIATE_CTR_CHARS + 8] =
                 ((usbPackageSizeMultiplier * 32) >> 8) & 0xff;
+
+            response[N_INTERMEDIATE_CTR_CHARS + 9] = brightness;
+            response[N_INTERMEDIATE_CTR_CHARS + 10] = rgbMode;
+            response[N_INTERMEDIATE_CTR_CHARS + 11] = yOffset;
+            response[N_INTERMEDIATE_CTR_CHARS + 12] = panelClkphase;
+            response[N_INTERMEDIATE_CTR_CHARS + 13] = panelDriver;
+            response[N_INTERMEDIATE_CTR_CHARS + 14] = panelI2sspeed;
+            response[N_INTERMEDIATE_CTR_CHARS + 15] = panelLatchBlanking;
+            response[N_INTERMEDIATE_CTR_CHARS + 16] = panelMinRefreshRate;
+            response[N_INTERMEDIATE_CTR_CHARS + 17] = udpDelay;
+
             response[63 - N_ACK_CHARS] = 'R';
             Serial.write(response, 64 - N_ACK_CHARS);
             // This flush is required for USB CDC on Windows.
@@ -789,31 +800,6 @@ static uint8_t IRAM_ATTR HandleData(uint8_t *pData, size_t len) {
             return 1;
           }
 
-          case 32:  // get version
-          {
-            headerBytesReceived = 0;
-            numCtrlCharsFound = 0;
-            if (wifiActive) break;
-
-            Serial.write(ZEDMD_VERSION_MAJOR);
-            Serial.write(ZEDMD_VERSION_MINOR);
-            Serial.write(ZEDMD_VERSION_PATCH);
-            return 1;
-          }
-
-          case 33:  // get panel resolution
-          {
-            headerBytesReceived = 0;
-            numCtrlCharsFound = 0;
-            if (wifiActive) break;
-
-            Serial.write(TOTAL_WIDTH & 0xff);
-            Serial.write((TOTAL_WIDTH >> 8) & 0xff);
-            Serial.write(TOTAL_HEIGHT & 0xff);
-            Serial.write((TOTAL_HEIGHT >> 8) & 0xff);
-            return 1;
-          }
-
           case 22:  // set brightness
           {
             brightness = pData[pos++];
@@ -832,27 +818,6 @@ static uint8_t IRAM_ATTR HandleData(uint8_t *pData, size_t len) {
             if (wifiActive) break;
             return 1;
           }
-#endif
-          case 24:  // get brightness
-          {
-            headerBytesReceived = 0;
-            numCtrlCharsFound = 0;
-            if (wifiActive) break;
-
-            Serial.write(brightness);
-            return 1;
-          }
-
-#ifndef DISPLAY_RM67162_AMOLED
-          case 25:  // get RGB order
-          {
-            headerBytesReceived = 0;
-            numCtrlCharsFound = 0;
-            if (wifiActive) break;
-
-            Serial.write(rgbMode);
-            return 1;
-          }
 #endif
           case 27:  // set SSID
           {

diff --git a/src/version.h b/src/version.h
@@ -4,6 +4,6 @@
 // Version constants
 #define ZEDMD_VERSION_MAJOR 5
 #define ZEDMD_VERSION_MINOR 1
-#define ZEDMD_VERSION_PATCH 2
+#define ZEDMD_VERSION_PATCH 3
 
 #endif  // VERSION_H