Merge branch 'dev'

JosipKuci · JosipKuci · commit 9f6d92b3e78d · 2026-06-17T12:11:09.000+02:00
diff --git a/examples/Inkplate10/Diagnostics/Inkplate10_Factory_Programming_VCOM/Inkplate10_Factory_Programming_VCOM.ino b/examples/Inkplate10/Diagnostics/Inkplate10_Factory_Programming_VCOM/Inkplate10_Factory_Programming_VCOM.ino
@@ -64,10 +64,11 @@
 // Create object on Inkplate library and set library to work in monochrome mode
 Inkplate display(INKPLATE_1BIT);
 
-// We only store: provision marker + waveform number for UI / reselection.
-// Driver stores the actual VCOM and waveform data internally.
-int EEPROM_PROVISION_MARKER_ADDR = 0; // 170 => provisioned
-int EEPROM_WAVEFORM_NUM_ADDR     = 1; // 1..5
+// Provision marker and waveform number for factory flow.
+// Addresses 0-75 are occupied by the waveformData struct written by setWaveform();
+// the marker and waveform number must live beyond that range to avoid collisions.
+int EEPROM_PROVISION_MARKER_ADDR = 76; // 170 => provisioned
+int EEPROM_WAVEFORM_NUM_ADDR     = 77; // 1..5
 
 // Peripheral mode variables and arrays (kept from original)
 #define BUFFER_SIZE 1000
diff --git a/examples/Inkplate10/Diagnostics/Inkplate10_Factory_Programming_VCOM/test.cpp b/examples/Inkplate10/Diagnostics/Inkplate10_Factory_Programming_VCOM/test.cpp
@@ -4,11 +4,11 @@ const char sdCardTestStringLength = 100;
 const char *testString = {"This is some test string..."};
 
 // Change this to your WiFi
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x76;
+const uint8_t easyCDeviceAddress = 0x30;
 
 // Test all peripherals
 void testPeripheral()
diff --git a/examples/Inkplate13SPECTRA/Diagnostics/Inkplate13SPECTRA_Factory_Programming/image.h b/examples/Inkplate13SPECTRA/Diagnostics/Inkplate13SPECTRA_Factory_Programming/image.h
diff --git a/examples/Inkplate13SPECTRA/Diagnostics/Inkplate13SPECTRA_Factory_Programming/test.cpp b/examples/Inkplate13SPECTRA/Diagnostics/Inkplate13SPECTRA_Factory_Programming/test.cpp
@@ -6,11 +6,11 @@ static constexpr size_t sdCardTestStringLength = 100;
 // Keep this short so it always fits comfortably
 static const char *testString = "This is some test string...";
 
-static const char *WSSID = "";
-static const char *WPASS = "";
+static const char *WSSID = "Soldered-testingPurposes";
+static const char *WPASS = "Testing443";
 
 // Change this to your used slave device
-static const uint8_t easyCDeviceAddress = 0x76;
+static const uint8_t easyCDeviceAddress = 0x30;
 
 void testPeripheral()
 {
diff --git a/examples/Inkplate2/Diagnostics/Inkplate2_Factory_Programming/test.cpp b/examples/Inkplate2/Diagnostics/Inkplate2_Factory_Programming/test.cpp
@@ -2,11 +2,11 @@
 #include "Wire.h"
 
 // Change this to your WiFi
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x76;
+const uint8_t easyCDeviceAddress = 0x30;
 
 // Test all peripherals
 void testPeripheral()
diff --git a/examples/Inkplate4TEMPERA/Diagnostics/Inkplate4TEMPERA_Factory_Programming_VCOM/Inkplate4TEMPERA_Factory_Programming_VCOM.ino b/examples/Inkplate4TEMPERA/Diagnostics/Inkplate4TEMPERA_Factory_Programming_VCOM/Inkplate4TEMPERA_Factory_Programming_VCOM.ino
@@ -171,6 +171,11 @@ void setup()
           if (display.setVCOM(vcomVoltage))
           {
             Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
+
+            // Mark the device as tested and provisioned so the tests
+            // don't run again on the next boot
+            EEPROM.write(EEPROMaddress, 170);
+            EEPROM.commit();
             break;
           }
           else
diff --git a/examples/Inkplate4TEMPERA/Diagnostics/Inkplate4TEMPERA_Factory_Programming_VCOM/test.cpp b/examples/Inkplate4TEMPERA/Diagnostics/Inkplate4TEMPERA_Factory_Programming_VCOM/test.cpp
@@ -3,11 +3,11 @@
 const char sdCardTestStringLength = 100;
 const char *testString = {"This is some test string..."};
 
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x76;
+const uint8_t easyCDeviceAddress = 0x30;
 
 const int TOUCHSCREEN_TIMEOUT = 30;
 const int GESTURE_TIMEOUT = 30;
diff --git a/examples/Inkplate5/Diagnostics/Inkplate5_Factory_Programming_VCOM/Inkplate5_Factory_Programming_VCOM.ino b/examples/Inkplate5/Diagnostics/Inkplate5_Factory_Programming_VCOM/Inkplate5_Factory_Programming_VCOM.ino
@@ -114,6 +114,11 @@ void setup()
           if (display.setVCOM(vcomVoltage))
           {
             Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
+
+            // Mark the device as tested and provisioned so the tests
+            // don't run again on the next boot
+            EEPROM.write(EEPROMaddress, 170);
+            EEPROM.commit();
             break;
           }
           else
diff --git a/examples/Inkplate5V2/Diagnostics/Inkplate5V2_Factory_Programming_VCOM/Inkplate5V2_Factory_Programming_VCOM.ino b/examples/Inkplate5V2/Diagnostics/Inkplate5V2_Factory_Programming_VCOM/Inkplate5V2_Factory_Programming_VCOM.ino
@@ -171,6 +171,11 @@ void setup()
           if (display.setVCOM(vcomVoltage))
           {
             Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
+
+            // Mark the device as tested and provisioned so the tests
+            // don't run again on the next boot
+            EEPROM.write(EEPROMaddress, 170);
+            EEPROM.commit();
             break;
           }
           else
@@ -196,6 +201,7 @@ void setup()
     memset(commandBuffer, 0, BUFFER_SIZE);
 
     // Print the initial image that remains on the screen
+    showSplashScreen(vcomVoltage);
 }
 
 void loop()
diff --git a/examples/Inkplate5V2/Diagnostics/Inkplate5V2_Factory_Programming_VCOM/test.cpp b/examples/Inkplate5V2/Diagnostics/Inkplate5V2_Factory_Programming_VCOM/test.cpp
@@ -3,11 +3,11 @@
 const char sdCardTestStringLength = 100;
 const char *testString = {"This is some test string..."};
 
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x76;
+const uint8_t easyCDeviceAddress = 0x30;
 
 void testPeripheral()
 {    
diff --git a/examples/Inkplate6/Diagnostics/Inkplate6_Factory_Programming_VCOM/Inkplate6_Factory_Programming_VCOM.ino b/examples/Inkplate6/Diagnostics/Inkplate6_Factory_Programming_VCOM/Inkplate6_Factory_Programming_VCOM.ino
@@ -165,6 +165,11 @@ void setup()
           if (display.setVCOM(vcomVoltage))
           {
             Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
+
+            // Mark the device as tested and provisioned so the tests
+            // don't run again on the next boot
+            EEPROM.write(EEPROMaddress, 170);
+            EEPROM.commit();
             break;
           }
           else
diff --git a/examples/Inkplate6/Diagnostics/Inkplate6_Factory_Programming_VCOM/test.cpp b/examples/Inkplate6/Diagnostics/Inkplate6_Factory_Programming_VCOM/test.cpp
@@ -3,11 +3,11 @@
 const char sdCardTestStringLength = 100;
 const char *testString = {"This is some test string..."};
 
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x76;
+const uint8_t easyCDeviceAddress = 0x30;
 
 void testPeripheral()
 {
diff --git a/examples/Inkplate6COLOR/Diagnostics/Inkplate6COLOR_Factory_Programming/Inkplate6COLOR_Factory_Programming.ino b/examples/Inkplate6COLOR/Diagnostics/Inkplate6COLOR_Factory_Programming/Inkplate6COLOR_Factory_Programming.ino
@@ -111,7 +111,8 @@ void setup()
     // Wakeup button
     pinMode(GPIO_NUM_36, INPUT);
 
-    bool isFirstStartup = true;
+    // Check for the first run of this code by reading the marker from EEPROM
+    bool isFirstStartup = (EEPROM.read(EEPROMaddress) != 170);
 
     if (isFirstStartup)
     {
diff --git a/examples/Inkplate6COLOR/Diagnostics/Inkplate6COLOR_Factory_Programming/test.cpp b/examples/Inkplate6COLOR/Diagnostics/Inkplate6COLOR_Factory_Programming/test.cpp
@@ -3,11 +3,11 @@
 const char sdCardTestStringLength = 100;
 const char *testString = {"This is some test string..."};
 
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x70;
+const uint8_t easyCDeviceAddress = 0x30;
 
 void testPeripheral()
 {
@@ -190,6 +190,7 @@ int checkMicroSDCard()
 
 int checkI2C(int address)
 {
+    Wire.begin();
     Wire.beginTransmission(address);
     if (Wire.endTransmission() == 0)
     {
diff --git a/examples/Inkplate6FLICK/Diagnostics/Inkplate6FLICK_Factory_Programming_VCOM/Inkplate6FLICK_Factory_Programming_VCOM.ino b/examples/Inkplate6FLICK/Diagnostics/Inkplate6FLICK_Factory_Programming_VCOM/Inkplate6FLICK_Factory_Programming_VCOM.ino
@@ -110,6 +110,11 @@ void setup()
           if (display.setVCOM(vcomVoltage))
           {
             Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
+
+            // Mark the device as tested and provisioned so the tests
+            // don't run again on the next boot
+            EEPROM.write(EEPROMaddress, 170);
+            EEPROM.commit();
             break;
           }
           else
diff --git a/examples/Inkplate6FLICK/Diagnostics/Inkplate6FLICK_Factory_Programming_VCOM/test.cpp b/examples/Inkplate6FLICK/Diagnostics/Inkplate6FLICK_Factory_Programming_VCOM/test.cpp
@@ -3,11 +3,11 @@
 const char sdCardTestStringLength = 100;
 const char *testString = {"This is some test string..."};
 
-const char *WSSID = {""};
-const char *WPASS = {""};
+const char *WSSID = {"Soldered-testingPurposes"};
+const char *WPASS = {"Testing443"};
 
 // Change this to your used slave device
-const uint8_t easyCDeviceAddress = 0x76;
+const uint8_t easyCDeviceAddress = 0x30;
 
 const int TOUCHSCREEN_TIMEOUT = 30;
 
diff --git a/examples/Inkplate6PLUS/Diagnostics/Inkplate6PLUS_Factory_Programming_VCOM/Inkplate6PLUS_Factory_Programming_VCOM.ino b/examples/Inkplate6PLUS/Diagnostics/Inkplate6PLUS_Factory_Programming_VCOM/Inkplate6PLUS_Factory_Programming_VCOM.ino
@@ -117,6 +117,11 @@ void setup()
           if (display.setVCOM(vcomVoltage))
           {
             Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");
+
+            // Mark the device as tested and provisioned so the tests
+            // don't run again on the next boot
+            EEPROM.write(EEPROMaddress, 170);
+            EEPROM.commit();
             break;
           }
           else
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=InkplateLibrary
-version=11.1.0
+version=11.1.1
 author=Soldered <hello@soldered.com>
 maintainer=David Zovko <hello@soldered.com>
 sentence=Inkplate boards driver library
diff --git a/src/boards/Inkplate10/Inkplate10Driver.cpp b/src/boards/Inkplate10/Inkplate10Driver.cpp
@@ -99,10 +99,20 @@ int EPDDriver::initDriver(Inkplate *_inkplatePtr)
         return 0;
     }
 
+    // Load the 3-bit waveform stored in EEPROM during factory programming before
+    // calculating LUTs, so the LUTs are built from the correct waveform.
+    // Falls back to the compiled-in default if EEPROM data is absent or corrupt.
+    EEPROM.begin(512);
+    struct waveformData waveformEEPROM;
+    if (getWaveformFromEEPROM(&waveformEEPROM) && waveformEEPROM.waveformId >= INKPLATE10_WAVEFORM1 &&
+        waveformEEPROM.waveformId <= INKPLATE10_WAVEFORM5)
+    {
+        memcpy(waveform3Bit, waveformEEPROM.waveform, sizeof(waveform3Bit));
+    }
+
     // Calculate color LUTs to optimize drawing to the screen
     calculateLUTs();
 
-
     _beginDone = 1;
     return 1;
 }
diff --git a/src/features/touchscreen/touchCypress/TouchCypress.cpp b/src/features/touchscreen/touchCypress/TouchCypress.cpp
@@ -341,7 +341,10 @@ bool Touch::getTouchData(struct cypressTouchData *_touchData)
     _touchData->y[1] = _regs[11] << 8 | _regs[12];
     _touchData->z[1] = _regs[13];
     _touchData->detectionType = _regs[8];
-    _touchData->fingers = _regs[2];
+
+    // Hardware can report spurious high finger counts (e.g. when palm-swiping).
+    // Clamp to 2 — the maximum the controller and all callers' arrays support.
+    _touchData->fingers = (_regs[2] > 2) ? 2 : _regs[2];
 
     // Everything went ok? Return true.
     return true;

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,11 @@ void setup()`
`171`	`171`	`if (display.setVCOM(vcomVoltage))`
`172`	`172`	`{`
`173`	`173`	`Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");`
	`174`	`+`
	`175`	`+ // Mark the device as tested and provisioned so the tests`
	`176`	`+ // don't run again on the next boot`
	`177`	`+ EEPROM.write(EEPROMaddress, 170);`
	`178`	`+ EEPROM.commit();`
`174`	`179`	`break;`
`175`	`180`	`}`
`176`	`181`	`else`
Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,11 @@ void setup()`
`114`	`114`	`if (display.setVCOM(vcomVoltage))`
`115`	`115`	`{`
`116`	`116`	`Serial.println("\nVCOM EEPROM PROGRAMMING OK\n");`
	`117`	`+`
	`118`	`+ // Mark the device as tested and provisioned so the tests`
	`119`	`+ // don't run again on the next boot`
	`120`	`+ EEPROM.write(EEPROMaddress, 170);`
	`121`	`+ EEPROM.commit();`
`117`	`122`	`break;`
`118`	`123`	`}`
`119`	`124`	`else`