Sync (#134)

nitko12 · BornaBiro · lanrat · web-flow · commit 7cb9825c9256 · 2022-02-11T08:40:54.000+01:00
* fixes touchpad wake examples * Fixes for new board def * remove wake interupt from inkplate6 * Update Inkplate6plus.cpp * Update intro comments IP10/Inkplate_Touchpads.ino (#125) Cleaned up some of the verbiage to remove spelling mistakes and make read a bit easier. * Update compile.yml * Update compile.yml * fix of Inkplate 5 not compiling examples * Update compile.yml * Update the bitmap offset to 32-bit word to match the GFXglyph (#126) The GFXglyph bitmapOffset field was modified to 32 bit for large bitmaps. However, when reading the word, only the lower 16-bit are read, resulting in bad offsets for bitmaps greater than 65535. * fix network client joinAP wait logic (#120) * Added microSD card test on Inkplate10 * Added micro SD card slot for all Inkplate boards with VCOM programming, fixed micro SD card test code on Inkplate 10, fixed VCOM programming on Inkplate 5 board. * Fixed epaper power up sequence Default TPS65186 power up sequence had swapped VEE and VNEG sequence. * Committing clang-format changes * Fixed bug with SD card and Factory VCOM programming * 5.5.2 Fixed functions for getting time rtcReadTime() function renamed to rtcGetRtcData() and examples renamed accordingly. Time variables are transfered to struct called date_time and are defined as a variable rtc_time. Now before getting any of time variables it is necessary to call function rtcGetRtcData(); so rtc can save data to rtc_time. * Committing clang-format changes * Update Inkplate6plus.cpp Fixed enabling of frontlight at waking up Inkplate 6PLUS. * Time variables fixed * Fixed Inkplate6Plus Factory Programming VCOM example. * Committing clang-format changes * Updated documentation Descriptions of functions are updated. * Committing clang-format changes * Update System.cpp Fixed reference year for writing to RTC. * Update System.cpp Previous commit fix. * Fixes for new board def (#128) Co-authored-by: Borna Biro <43830307+BornaBiro@users.noreply.github.com> * Fixed wake up on touchpads on Inkplate5, Inkplate6 and Inkplate10. * Removed Inkplate_Wake_up_on_touchpads example and added Inkplate_Wake_up_on_touchscreen * Added Inkplate Clean examples. Added examples for cleaning epaper panel from burn-in. * Comments in system.h * Update InkplateColor.h * Inkplate 6COLOR fix * Fixed jpg not compiling * Update Inkplate6plus.cpp * Update intro comments IP10/Inkplate_Touchpads.ino (#125) Cleaned up some of the verbiage to remove spelling mistakes and make read a bit easier. * Update compile.yml * Update compile.yml * Update compile.yml * Name fixes 6COLOR * Renamed example * Merging new changes (#132) * Fixes for new board def * Update Inkplate6plus.cpp * Update intro comments IP10/Inkplate_Touchpads.ino (#125) Cleaned up some of the verbiage to remove spelling mistakes and make read a bit easier. * Update compile.yml * Update compile.yml * fix of Inkplate 5 not compiling examples Co-authored-by: Borna Biro <43830307+BornaBiro@users.noreply.github.com> Co-authored-by: Goran Jurić <74900926+gogi640@users.noreply.github.com> Co-authored-by: Mike Gaffney <mr.gaffo@gmail.com> * Update the bitmap offset to 32-bit word to match the GFXglyph (#126) The GFXglyph bitmapOffset field was modified to 32 bit for large bitmaps. However, when reading the word, only the lower 16-bit are read, resulting in bad offsets for bitmaps greater than 65535. * fix network client joinAP wait logic (#120) * Merging * Waveform dimensions fix * Removed example touchpad note Co-authored-by: Borna Biro <43830307+BornaBiro@users.noreply.github.com> Co-authored-by: Ian Foster <mrlanrat@gmail.com> Co-authored-by: Ian Foster <ian@vorsk.com> Co-authored-by: Goran Jurić <74900926+gogi640@users.noreply.github.com> Co-authored-by: Mike Gaffney <mr.gaffo@gmail.com> Co-authored-by: samacleese <76889667+samacleese@users.noreply.github.com> Co-authored-by: Clang Robot <robot@example.com>
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
@@ -47,4 +47,4 @@ jobs:
             - name: ArduinoJson
             - name: Time
           sketch-paths: |
-            ${{ matrix.additional-sketch-paths }}
+            ${{ matrix.additional-sketch-paths }}
diff --git a/examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino b/examples/Inkplate10/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino
@@ -24,11 +24,12 @@
 // Time ESP32 will go to sleep (in seconds)
 #define TIME_TO_SLEEP 30
 
+// bitmask for GPIO_34 which is connected to MCP INTB
+#define TOUCHPAD_WAKE_MASK (int64_t(1) << GPIO_NUM_34)
+
 // Initiate Inkplate object
 Inkplate display(INKPLATE_1BIT);
 
-byte touchPadPin = 10;
-
 // Store int in rtc data, to remain persistent during deep sleep
 RTC_DATA_ATTR int bootCount = 0;
 
@@ -38,21 +39,18 @@ void setup()
     display.begin();
 
     // Setup mcp interrupts
-    display.pinModeInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, INPUT);
     display.setIntOutputInternal(MCP23017_INT_ADDR, display.mcpRegsInt, 1, false, false, HIGH);
-    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, RISING);
+    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, PAD1, RISING);
+    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, PAD2, RISING);
+    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, PAD3, RISING);
 
     ++bootCount;
 
     // Our function declared below
     displayInfo();
 
-    // Go to sleep for TIME_TO_SLEEP seconds, but also enable wake up from gpio 34
-    // Gpio 34 is where the mcp interrupt is connected, check
-    // https://github.com/e-radionicacom/Inkplate-6-hardware/blob/master/Schematics%2C%20Gerber%2C%20BOM/Inkplate6%20Schematics.pdf
-    // for more detail
+    // Go to sleep for TIME_TO_SLEEP seconds
     esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_34, 1);
 
     // Enable wakup from deep sleep on gpio 36
     esp_sleep_enable_ext1_wakeup((1ULL << 36), ESP_EXT1_WAKEUP_ALL_LOW);
diff --git a/examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_Touchpads/Inkplate_Touchpads.ino b/examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_Touchpads/Inkplate_Touchpads.ino
@@ -14,8 +14,7 @@
 
    In this example, if you touch first pad, ti will decrese number showed on screen, if you touch thirs touch pad,
    it will increase the number, if you touch second touchpad, it will reset number to zero.
-
-   NOTE: You can not use touch pads when enclosure is fitted on the Inkplate - they are not that sensitive!
+   Though with a bit of hacking you can get them to work!
 
    Want to learn more about Inkplate? Visit www.inkplate.io
    Looking to get support? Write on our forums: http://forum.e-radionica.com/en/
diff --git a/examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino b/examples/Inkplate5/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino
@@ -24,11 +24,12 @@
 // Time ESP32 will go to sleep (in seconds)
 #define TIME_TO_SLEEP 30
 
+// bitmask for GPIO_34 which is connected to MCP INTB
+#define TOUCHPAD_WAKE_MASK (int64_t(1) << GPIO_NUM_34)
+
 // Initiate Inkplate object
 Inkplate display(INKPLATE_1BIT);
 
-byte touchPadPin = 10;
-
 // Store int in rtc data, to remain persistent during deep sleep
 RTC_DATA_ATTR int bootCount = 0;
 
@@ -38,21 +39,18 @@ void setup()
     display.begin();
 
     // Setup mcp interrupts
-    display.pinModeInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, INPUT);
     display.setIntOutputInternal(MCP23017_INT_ADDR, display.mcpRegsInt, 1, false, false, HIGH);
-    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, RISING);
+    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, PAD1, RISING);
+    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, PAD2, RISING);
+    display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, PAD3, RISING);
 
     ++bootCount;
 
     // Our function declared below
     displayInfo();
 
-    // Go to sleep for TIME_TO_SLEEP seconds, but also enable wake up from gpio 34
-    // Gpio 34 is where the mcp interrupt is connected, check
-    // https://github.com/e-radionicacom/Inkplate-6-hardware/blob/master/Schematics%2C%20Gerber%2C%20BOM/Inkplate6%20Schematics.pdf
-    // for more detail
+    // Go to sleep for TIME_TO_SLEEP seconds
     esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_34, 1);
 
     // GPIO 36 is where the wake up button is connected
     esp_sleep_enable_ext1_wakeup((1ULL << 36), ESP_EXT1_WAKEUP_ALL_LOW);
diff --git a/examples/Inkplate6/Advanced_Inkplate_Features/Inkplate_Touchpads/Inkplate_Touchpads.ino b/examples/Inkplate6/Advanced_Inkplate_Features/Inkplate_Touchpads/Inkplate_Touchpads.ino
@@ -15,8 +15,6 @@
    In this example, if you touch first pad, ti will decrese number showed on screen, if you touch thirs touch pad,
    it will increase the number, if you touch second touchpad, it will reset number to zero.
 
-   NOTE: You can not use touch pads when enclosure is fitted on the Inkplate - they are not that sensitive!
-
    Want to learn more about Inkplate? Visit www.inkplate.io
    Looking to get support? Write on our forums: http://forum.e-radionica.com/en/
    15 July 2020 by e-radionica.com
diff --git a/examples/Inkplate6/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino b/examples/Inkplate6/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino
@@ -24,11 +24,12 @@
 // Time ESP32 will go to sleep (in seconds)
 #define TIME_TO_SLEEP 30
 
+// bitmask for GPIO_34 which is connected to MCP INTB
+#define TOUCHPAD_WAKE_MASK (int64_t(1) << GPIO_NUM_34)
+
 // Initiate Inkplate object
 Inkplate display(INKPLATE_1BIT);
 
-byte touchPadPin = PAD1;
-
 // Store int in rtc data, to remain persistent during deep sleep
 RTC_DATA_ATTR int bootCount = 0;
 
@@ -47,12 +48,11 @@ void setup()
     // Our function declared below
     displayInfo();
 
-    // Go to sleep for TIME_TO_SLEEP seconds, but also enable wake up from gpio 34
-    // Gpio 34 is where the mcp interrupt is connected, check
-    // https://github.com/e-radionicacom/Inkplate-6-hardware/blob/master/Schematics%2C%20Gerber%2C%20BOM/Inkplate6%20Schematics.pdf
-    // for more detail
+    // Go to sleep for TIME_TO_SLEEP seconds
     esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_34, 1);
+
+    // enable wake from MCP port expander on gpio 34
+    esp_sleep_enable_ext1_wakeup(TOUCHPAD_WAKE_MASK, ESP_EXT1_WAKEUP_ANY_HIGH);
 
     // Go to sleep
     esp_deep_sleep_start();
diff --git a/examples/Inkplate6COLOR/Advanced_Inkplate_Features/Inkplate_Touchpads/Inkplate_Touchpads.ino b/examples/Inkplate6COLOR/Advanced_Inkplate_Features/Inkplate_Touchpads/Inkplate_Touchpads.ino
@@ -15,8 +15,6 @@
    In this example, if you touch first pad, ti will decrese number showed on screen, if you touch thirs touch pad,
    it will increase the number, if you touch second touchpad, it will reset number to zero.
 
-   NOTE: You can not use touch pads when enclosure is fitted on the Inkplate - they are not that sensitive!
-
    Want to learn more about Inkplate? Visit www.inkplate.io
    Looking to get support? Write on our forums: http://forum.e-radionica.com/en/
    15 July 2020 by e-radionica.com
@@ -35,9 +33,9 @@ int n = 0;      // Variable that keeps track on how many times display is partia
 void setup()
 {
     Serial.begin(115200);
-    display.begin();                    // Init Inkplate library (you should call this function ONLY ONCE)
-    display.clearDisplay();             // Clear frame buffer of display
-    display.display();                  // Put clear image on display
+    display.begin();        // Init Inkplate library (you should call this function ONLY ONCE)
+    display.clearDisplay(); // Clear frame buffer of display
+    display.display();      // Put clear image on display
 
     display.setTextColor(INKPLATE_BLACK);
     display.setCursor(10, 10);
diff --git a/examples/Inkplate6COLOR/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino b/examples/Inkplate6COLOR/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino
@@ -24,11 +24,12 @@
 // Time ESP32 will go to sleep (in seconds)
 #define TIME_TO_SLEEP 30
 
+// bitmask for GPIO_34 which is connected to MCP INTB
+#define TOUCHPAD_WAKE_MASK (int64_t(1)<<GPIO_NUM_34)
+
 // Initiate Inkplate object
 Inkplate display;
 
-byte touchPadPin = PAD1;
-
 // Store int in rtc data, to remain persistent during deep sleep
 RTC_DATA_ATTR int bootCount = 0;
 
@@ -38,24 +39,24 @@ void setup()
     display.begin();
 
     // Setup mcp interrupts
-    display.pinModeInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, INPUT);
     display.setIntOutput(1, false, false, HIGH);
-    display.setIntPin(touchPadPin, RISING);
+    display.setIntPin(PAD1, RISING);
+    display.setIntPin(PAD2, RISING);
+    display.setIntPin(PAD3, RISING);
 
     ++bootCount;
 
     // Our function declared below
     displayInfo();
 
-    // Go to sleep for TIME_TO_SLEEP seconds, but also enable wake up from gpio 34
-    // Gpio 34 is where the mcp interrupt is connected, check
-    // https://github.com/e-radionicacom/Inkplate-6-hardware/blob/master/Schematics%2C%20Gerber%2C%20BOM/Inkplate6%20Schematics.pdf
-    // for more detail
+    // Go to sleep for TIME_TO_SLEEP seconds
     esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_34, 1);
 
-    // Enable wakup from deep sleep on gpio 36
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_36, 0);
+    // Enable wakeup from deep sleep on gpio 36 (wake button)
+    esp_sleep_enable_ext0_wakeup(GPIO_NUM_36, LOW);
+
+    // enable wake from MCP port expander on gpio 34
+    esp_sleep_enable_ext1_wakeup(TOUCHPAD_WAKE_MASK, ESP_EXT1_WAKEUP_ANY_HIGH);
 
     // Go to sleep
     esp_deep_sleep_start();
diff --git a/examples/Inkplate6PLUS/Advanced_Inkplate_Features/Inkplate_Wake_up_on_touchscreen/Inkplate_Wake_up_on_touchscreen.ino b/examples/Inkplate6PLUS/Advanced_Inkplate_Features/Inkplate_Wake_up_on_touchscreen/Inkplate_Wake_up_on_touchscreen.ino
@@ -25,11 +25,12 @@
 // Time ESP32 will go to sleep (in seconds)
 #define TIME_TO_SLEEP 30
 
+// bitmask for GPIO_34 which is connected to MCP INTB
+#define TOUCHPAD_WAKE_MASK (int64_t(1) << GPIO_NUM_34)
+
 // Initiate Inkplate object
 Inkplate display(INKPLATE_1BIT);
 
-byte touchPadPin = PAD1;
-
 // Store int in rtc data, to remain persistent during deep sleep
 RTC_DATA_ATTR int bootCount = 0;
 
@@ -39,9 +40,23 @@ void setup()
     display.begin();
 
     // Setup mcp interrupts
-    display.pinModeInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, INPUT);
     display.setIntOutput(1, false, false, HIGH);
-    display.setIntPin(touchPadPin, RISING);
+    display.setIntPin(PAD1, RISING);
+    display.setIntPin(PAD2, RISING);
+    display.setIntPin(PAD3, RISING);
+
+
+    // Init touchscreen and power it on after init (send false as argument to put it in deep sleep right after init)
+    if (display.tsInit(true))
+    {
+        Serial.println("Touchscreen init ok");
+    }
+    else
+    {
+        Serial.println("Touchscreen init fail");
+        while (true)
+            ;
+    }
 
     // Init touchscreen and power it on after init (send false as argument to put it in deep sleep right after init)
     if (display.tsInit(true))
@@ -60,13 +75,14 @@ void setup()
     // Our function declared below
     displayInfo();
 
-    // Go to sleep for TIME_TO_SLEEP seconds.
+    // Go to sleep for TIME_TO_SLEEP seconds
     esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR);
 
-    // Enable wake up from deep sleep on gpio 36 (wake up button and Touch INT pin), check
-    // https://github.com/e-radionicacom/Inkplate-6PLUS-Hardware/blob/main/Schematics%2C%20Gerber%2C%20BOM/v1.0/Inkplate%206PLUS%20Schematics%20v1.0.pdf
-    // for more detail
-    esp_sleep_enable_ext0_wakeup(GPIO_NUM_36, 0);
+    // Enable wakeup from deep sleep on gpio 36 (wake button)
+    esp_sleep_enable_ext0_wakeup(GPIO_NUM_36, LOW);
+
+    // enable wake from MCP port expander on gpio 34
+    esp_sleep_enable_ext1_wakeup(TOUCHPAD_WAKE_MASK, ESP_EXT1_WAKEUP_ANY_HIGH);
 
     // Go to sleep
     esp_deep_sleep_start();
diff --git a/src/boards/Inkplate10.cpp b/src/boards/Inkplate10.cpp
@@ -40,7 +40,7 @@ bool Inkplate::begin(uint8_t lightWaveform)
     if (lightWaveform)
     {
         _useLightMode = 1;
-        uint8_t alternateWaveform[8][9] = WAVEFORM3BIT_LIGHT;
+        uint8_t alternateWaveform[8][8] = WAVEFORM3BIT_LIGHT;
         memcpy(waveform3Bit, alternateWaveform, sizeof(waveform3Bit));
     }
     if (_beginDone == 1)
diff --git a/src/include/NetworkClient.cpp b/src/include/NetworkClient.cpp
@@ -42,8 +42,10 @@ bool NetworkClient::joinAP(const char *ssid, const char *pass)
     {
         Serial.print(".");
         if (cnt > 20)
+        {
             Serial.println();
-        return 0;
+            return 0;
+        }
         delay(1000);
         ++cnt;
     }
diff --git a/src/libs/Adafruit-GFX-Library/Adafruit_GFX.cpp b/src/libs/Adafruit-GFX-Library/Adafruit_GFX.cpp
@@ -1182,7 +1182,7 @@ void Adafruit_GFX::drawChar(int16_t x, int16_t y, unsigned char c,
     GFXglyph *glyph = pgm_read_glyph_ptr(gfxFont, c);
     uint8_t *bitmap = pgm_read_bitmap_ptr(gfxFont);
 
-    uint16_t bo = pgm_read_word(&glyph->bitmapOffset);
+    uint32_t bo = pgm_read_dword(&glyph->bitmapOffset);
     uint8_t w = pgm_read_byte(&glyph->width), h = pgm_read_byte(&glyph->height);
     int8_t xo = pgm_read_byte(&glyph->xOffset),
            yo = pgm_read_byte(&glyph->yOffset);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ bool Inkplate::begin(uint8_t lightWaveform)`
`40`	`40`	`if (lightWaveform)`
`41`	`41`	`{`
`42`	`42`	`_useLightMode = 1;`
`43`		`- uint8_t alternateWaveform[8][9] = WAVEFORM3BIT_LIGHT;`
	`43`	`+ uint8_t alternateWaveform[8][8] = WAVEFORM3BIT_LIGHT;`
`44`	`44`	`memcpy(waveform3Bit, alternateWaveform, sizeof(waveform3Bit));`
`45`	`45`	`}`
`46`	`46`	`if (_beginDone == 1)`