Skip to content

Commit 2dc63c0

Browse files
nitko12BornaBirogogi640gaffolanrat
authored
Pushing dev changes to master (#135)
* Syncing changes (#133) * 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 * Update compile.yml Co-authored-by: Borna Biro <[email protected]> Co-authored-by: Goran Jurić <[email protected]> Co-authored-by: Mike Gaffney <[email protected]> * Sync (#134) * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: Goran Jurić <[email protected]> Co-authored-by: Mike Gaffney <[email protected]> * 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 <[email protected]> Co-authored-by: Ian Foster <[email protected]> Co-authored-by: Ian Foster <[email protected]> Co-authored-by: Goran Jurić <[email protected]> Co-authored-by: Mike Gaffney <[email protected]> Co-authored-by: samacleese <[email protected]> Co-authored-by: Clang Robot <[email protected]> * Reverting touchpads on Inkplate 6 Co-authored-by: Borna Biro <[email protected]> Co-authored-by: Goran Jurić <[email protected]> Co-authored-by: Mike Gaffney <[email protected]> Co-authored-by: Ian Foster <[email protected]> Co-authored-by: Ian Foster <[email protected]> Co-authored-by: samacleese <[email protected]> Co-authored-by: Clang Robot <[email protected]>
1 parent a297164 commit 2dc63c0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

examples/Inkplate6/Advanced_Inkplate_Features/Inkplate_Wake_Up_On_Touchpads/Inkplate_Wake_Up_On_Touchpads.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ void setup()
4040

4141
// Setup mcp interrupts
4242
display.pinModeInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, INPUT);
43-
display.setIntOutputInternal(MCP23017_INT_ADDR, display.mcpRegsInt, 1, false, false, HIGH);
44-
display.setIntPinInternal(MCP23017_INT_ADDR, display.mcpRegsInt, touchPadPin, RISING);
43+
display.setIntOutput(1, false, false, HIGH);
44+
display.setIntPin(touchPadPin, RISING);
4545

4646
++bootCount;
4747

0 commit comments

Comments
 (0)