Merge pull request #225 from SolderedElectronics/dev

BornaBiro · web-flow · commit cbb736fc72e2 · 2023-10-30T07:53:38.000+01:00
Dev
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=InkplateLibrary
-version=8.2.0
+version=8.2.1
 author=e-radionica.com <inkplate@soldered.com>
 maintainer=David Zovko <inkplate@soldered.com>
 sentence=Inkplate boards driver library
diff --git a/src/boards/Inkplate10.cpp b/src/boards/Inkplate10.cpp
@@ -143,14 +143,22 @@ bool Inkplate::begin()
     pinMode(25, OUTPUT);
     pinMode(26, OUTPUT);
     pinMode(27, OUTPUT); // D7
-
+#ifdef ARDUINO_INKPLATE10
     // TOUCHPAD PINS
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 10, INPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, INPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, INPUT);
-
+#else
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 10, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, OUTPUT);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 10, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 11, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 12, LOW);
+#endif
     // Battery voltage Switch MOSFET
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 9, OUTPUT);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, LOW);
 
     DMemoryNew = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
     _partial = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
diff --git a/src/boards/Inkplate4.cpp b/src/boards/Inkplate4.cpp
@@ -45,9 +45,19 @@ bool Inkplate::begin()
             return false;
         }
 
+        // Set SPI Pins for microSD card to input to reduce power consumption.
+        pinMode(12, INPUT);
+        pinMode(13, INPUT);
+        pinMode(14, INPUT);
+        pinMode(15, INPUT);
+
         // Init TwoWire and GPIO expander
         setIOExpanderForLowPower();
 
+        // Disable the microSD card pin for now.
+        pinModeInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, OUTPUT);
+        digitalWriteInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, HIGH);
+
         // Set the default text color
         setTextColor(INKPLATE4_BLACK);
 
@@ -399,7 +409,6 @@ void Inkplate::setIOExpanderForLowPower()
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A6, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A7, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B0, OUTPUT);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B2, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B3, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B4, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B5, OUTPUT);
@@ -415,7 +424,6 @@ void Inkplate::setIOExpanderForLowPower()
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A6, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A7, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B0, LOW);
-    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B2, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B3, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B4, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B5, LOW);
diff --git a/src/boards/Inkplate4TEMPERA.cpp b/src/boards/Inkplate4TEMPERA.cpp
@@ -163,6 +163,7 @@ bool Inkplate::begin(void)
     pinModeInternal(TOUCHSCREEN_IO_EXPANDER, ioRegsEx, TOUCHSCREEN_EN, OUTPUT);
     digitalWriteInternal(TOUCHSCREEN_IO_EXPANDER, ioRegsEx, TOUCHSCREEN_EN, HIGH);
 
+    // Set the rest of the IO Expander pins to low to reduce power in deep sleep.
     for (int i = 2; i < 15; i++)
     {
         pinModeInternal(IO_EXT_ADDR, ioRegsEx, i, OUTPUT);
diff --git a/src/boards/Inkplate5.cpp b/src/boards/Inkplate5.cpp
@@ -72,19 +72,23 @@ bool Inkplate::begin(void)
     WAKEUP_CLEAR;
 
     // To reduce power consumption in deep sleep, unused pins of
-    // first I/O expander have to be also set as inputs with pull down
-    // resistors.
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, INPUT_PULLDOWN);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, INPUT_PULLDOWN);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 13, INPUT_PULLDOWN);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 14, INPUT_PULLDOWN);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 15, INPUT_PULLDOWN);
-
-    // Set SPI pins to input to reduce power consumption in deep sleep
-    pinMode(12, INPUT);
-    pinMode(13, INPUT);
-    pinMode(14, INPUT);
-    pinMode(15, INPUT);
+    // first I/O expander have to be also set as output with pulled low.
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 13, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 14, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 15, OUTPUT);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 11, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 12, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 13, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 14, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 15, LOW);
+
+    // Enable pull down resistors on SPI lines to reduce power consumption in deep sleep.
+    pinMode(12, INPUT_PULLDOWN);
+    pinMode(13, INPUT_PULLDOWN);
+    pinMode(14, INPUT_PULLDOWN);
+    pinMode(15, INPUT_PULLDOWN);
 
     // And also disable uSD card supply
     pinModeInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, INPUT);
@@ -108,11 +112,6 @@ bool Inkplate::begin(void)
     pinMode(26, OUTPUT);
     pinMode(27, OUTPUT); // D7
 
-    // TOUCHPAD PINS
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 10, INPUT);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, INPUT);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, INPUT);
-
     // Battery voltage Switch MOSFET
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 9, OUTPUT);
 
diff --git a/src/boards/Inkplate6.cpp b/src/boards/Inkplate6.cpp
@@ -134,13 +134,23 @@ bool Inkplate::begin(void)
     // driver.
     I2SInit(myI2S, NULL, NULL);
 
+#ifndef ARDUINO_INKPLATE6V2
     // TOUCHPAD PINS
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 10, INPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, INPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, INPUT);
+#else
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 10, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 11, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, 12, OUTPUT);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 10, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 11, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 12, LOW);
+#endif
 
     // Battery voltage Switch MOSFET
     pinModeInternal(IO_INT_ADDR, ioRegsInt, 9, OUTPUT);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, 9, LOW);
 
     DMemoryNew = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
     _partial = (uint8_t *)ps_malloc(E_INK_WIDTH * E_INK_HEIGHT / 8);
diff --git a/src/boards/Inkplate6Color.cpp b/src/boards/Inkplate6Color.cpp
@@ -320,6 +320,10 @@ bool Inkplate::setPanelDeepSleep(bool _state)
         sendCommand(0xE3);
         sendData(0xAA);
 
+        delay(100);
+        sendCommand(VCOM_DATA_INTERVAL_REGISTER);
+        sendData(0x37);
+
         return true;
     }
     else
@@ -336,8 +340,6 @@ bool Inkplate::setPanelDeepSleep(bool _state)
 
         epdSPI.end();
 
-        pinMode(EPAPER_DIN, INPUT);
-        pinMode(EPAPER_CLK, INPUT);
         return true;
     }
 }
@@ -390,4 +392,4 @@ void Inkplate::setIOExpanderForLowPower()
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B6, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B7, LOW);
 }
-#endif
+#endif
diff --git a/src/boards/Inkplate7.cpp b/src/boards/Inkplate7.cpp
@@ -46,9 +46,19 @@ bool Inkplate::begin()
             return false;
         }
 
+        // Set SPI Pins for microSD card to input pull down to reduce power consumption.
+        pinMode(12, INPUT_PULLDOWN);
+        pinMode(13, INPUT_PULLDOWN);
+        pinMode(14, INPUT_PULLDOWN);
+        pinMode(15, INPUT_PULLDOWN);
+
         // Init TwoWire and GPIO expander
         setIOExpanderForLowPower();
 
+        // Disable the microSD card pin for now.
+        pinModeInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, OUTPUT);
+        digitalWriteInternal(IO_INT_ADDR, ioRegsInt, SD_PMOS_PIN, HIGH);
+
         // Set the default text color
         setTextColor(INKPLATE7_BLACK);
 
@@ -58,7 +68,6 @@ bool Inkplate::begin()
         _beginDone = 1;
     }
 
-
     // Wake the ePaper and initialize everything
     // If it fails, return false
     if (!setPanelDeepSleep(false))
@@ -345,15 +354,11 @@ void Inkplate::setIOExpanderForLowPower()
     memset(ioRegsInt, 0, 22);
     ioBegin(IO_INT_ADDR, ioRegsInt);
 
-    // TOUCHPAD PINS
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B2, INPUT);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B3, INPUT);
-    pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B4, INPUT);
-
     // Battery voltage Switch MOSFET
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B1, OUTPUT);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B1, LOW);
 
-    // Rest of pins go to OUTPUT LOW state because in deepSleep mode they are
+    // Rest of pins go to low because in deepSleep mode they are
     // using least amount of power
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A0, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A1, OUTPUT);
@@ -364,6 +369,8 @@ void Inkplate::setIOExpanderForLowPower()
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A6, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A7, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B0, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B3, OUTPUT);
+    pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B4, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B5, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B6, OUTPUT);
     pinModeInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B7, OUTPUT);
@@ -377,6 +384,8 @@ void Inkplate::setIOExpanderForLowPower()
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A6, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_A7, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B0, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B3, LOW);
+    digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B4, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B5, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B6, LOW);
     digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B7, LOW);

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 name=InkplateLibrary
 -version=8.2.0
 +version=8.2.1
 author=e-radionica.com <[email protected]>
 maintainer=David Zovko <[email protected]>
 sentence=Inkplate boards driver library
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ bool Inkplate::begin(void)`
`163`	`163`	`pinModeInternal(TOUCHSCREEN_IO_EXPANDER, ioRegsEx, TOUCHSCREEN_EN, OUTPUT);`
`164`	`164`	`digitalWriteInternal(TOUCHSCREEN_IO_EXPANDER, ioRegsEx, TOUCHSCREEN_EN, HIGH);`
`165`	`165`
	`166`	`+ // Set the rest of the IO Expander pins to low to reduce power in deep sleep.`
`166`	`167`	`for (int i = 2; i < 15; i++)`
`167`	`168`	`{`
`168`	`169`	`pinModeInternal(IO_EXT_ADDR, ioRegsEx, i, OUTPUT);`
Original file line number	Diff line number	Diff line change
`@@ -320,6 +320,10 @@ bool Inkplate::setPanelDeepSleep(bool _state)`
`320`	`320`	`sendCommand(0xE3);`
`321`	`321`	`sendData(0xAA);`
`322`	`322`
	`323`	`+ delay(100);`
	`324`	`+ sendCommand(VCOM_DATA_INTERVAL_REGISTER);`
	`325`	`+ sendData(0x37);`
	`326`	`+`
`323`	`327`	`return true;`
`324`	`328`	`}`
`325`	`329`	`else`
`@@ -336,8 +340,6 @@ bool Inkplate::setPanelDeepSleep(bool _state)`
`336`	`340`
`337`	`341`	`epdSPI.end();`
`338`	`342`
`339`		`- pinMode(EPAPER_DIN, INPUT);`
`340`		`- pinMode(EPAPER_CLK, INPUT);`
`341`	`343`	`return true;`
`342`	`344`	`}`
`343`	`345`	`}`
`@@ -390,4 +392,4 @@ void Inkplate::setIOExpanderForLowPower()`
`390`	`392`	`digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B6, LOW);`
`391`	`393`	`digitalWriteInternal(IO_INT_ADDR, ioRegsInt, IO_PIN_B7, LOW);`
`392`	`394`	`}`
`393`		`-#endif`
	`395`	`+#endif`