From 12e41a9c20291a8546144b94c7fc681c2eb9c932 Mon Sep 17 00:00:00 2001 From: kraus Date: Sun, 19 Mar 2023 20:31:12 +0100 Subject: [PATCH] 2.34.16 --- README.md | 2 +- examples/full_buffer/FPS/FPS.ino | 12 +- examples/full_buffer/FontUsage/FontUsage.ino | 12 +- .../full_buffer/GraphicsTest/GraphicsTest.ino | 12 +- .../full_buffer/HelloWorld/HelloWorld.ino | 12 +- examples/full_buffer/IconMenu/IconMenu.ino | 12 +- examples/full_buffer/PrintUTF8/PrintUTF8.ino | 12 +- .../full_buffer/ScreenShot/ScreenShot.ino | 12 +- .../SelectionList/SelectionList.ino | 12 +- examples/full_buffer/Shennong/Shennong.ino | 12 +- examples/full_buffer/U8g2Logo/U8g2Logo.ino | 12 +- .../full_buffer/UpdateArea/UpdateArea.ino | 12 +- examples/full_buffer/Weather/Weather.ino | 6 +- examples/games/SpaceTrash/SpaceTrash.ino | 6 +- .../ButtonEmoticon/ButtonEmoticon.ino | 6 +- examples/page_buffer/Chinese/Chinese.ino | 6 +- .../page_buffer/ClipWindow/ClipWindow.ino | 6 +- examples/page_buffer/Clock/Clock.ino | 6 +- .../page_buffer/ContrastTest/ContrastTest.ino | 6 +- .../page_buffer/Devanagari/Devanagari.ino | 6 +- .../page_buffer/DirectAccess/DirectAccess.ino | 6 +- examples/page_buffer/DrawLog/DrawLog.ino | 6 +- examples/page_buffer/ExtUTF8/ExtUTF8.ino | 6 +- examples/page_buffer/FPS/FPS.ino | 6 +- examples/page_buffer/FlipMode/FlipMode.ino | 6 +- .../page_buffer/GraphicsTest/GraphicsTest.ino | 6 +- .../page_buffer/HelloWorld/HelloWorld.ino | 8 +- examples/page_buffer/IconMenu/IconMenu.ino | 12 +- examples/page_buffer/Japanese/Japanese.ino | 6 +- examples/page_buffer/Korean/Korean.ino | 6 +- .../page_buffer/LoadFromSD/LoadFromSD.ino | 6 +- examples/page_buffer/MechCount/MechCount.ino | 6 +- .../PowerSaveTest/PowerSaveTest.ino | 6 +- .../PrintHelloWorld/PrintHelloWorld.ino | 6 +- .../page_buffer/PrintProgmem/PrintProgmem.ino | 6 +- examples/page_buffer/PrintUTF8/PrintUTF8.ino | 6 +- .../ScrollingText/ScrollingText.ino | 6 +- .../SelectionList/SelectionList.ino | 6 +- examples/page_buffer/Serial/Serial.ino | 6 +- examples/page_buffer/Shennong/Shennong.ino | 6 +- .../StateBufferLoop/StateBufferLoop.ino | 6 +- examples/page_buffer/Terminal/Terminal.ino | 6 +- examples/page_buffer/U8g2Logo/U8g2Logo.ino | 6 +- .../page_buffer/UpdatePartly/UpdatePartly.ino | 6 +- examples/page_buffer/Weather/Weather.ino | 6 +- examples/page_buffer/XBM/XBM.ino | 6 +- examples/page_buffer/XORTest/XORTest.ino | 6 +- extras/ChangeLog | 1 + library.properties | 2 +- src/U8g2lib.h | 108 ++++++++++++++++++ src/U8x8lib.cpp | 28 +++-- src/U8x8lib.h | 36 ++++++ src/clib/u8g2.h | 9 ++ src/clib/u8g2_d_memory.c | 33 ++++++ src/clib/u8g2_d_setup.c | 56 +++++++++ src/clib/u8g2_polygon.c | 10 +- src/clib/u8x8.h | 1 + src/clib/u8x8_d_a2printer.c | 2 +- src/clib/u8x8_d_gp1247ai.c | 2 +- src/clib/u8x8_d_gp1287ai.c | 2 +- src/clib/u8x8_d_gu800.c | 4 +- src/clib/u8x8_d_hd44102.c | 4 +- src/clib/u8x8_d_il3820_296x128.c | 2 +- src/clib/u8x8_d_ist3020.c | 2 +- src/clib/u8x8_d_ist3088.c | 2 +- src/clib/u8x8_d_ist7920.c | 2 +- src/clib/u8x8_d_ks0108.c | 4 +- src/clib/u8x8_d_lc7981.c | 10 +- src/clib/u8x8_d_ld7032_60x32.c | 92 ++++++++++++++- src/clib/u8x8_d_ls013b7dh03.c | 8 +- src/clib/u8x8_d_max7219.c | 8 +- src/clib/u8x8_d_pcd8544_84x48.c | 2 +- src/clib/u8x8_d_pcf8812.c | 2 +- src/clib/u8x8_d_pcf8814_hx1230.c | 2 +- src/clib/u8x8_d_s1d15300.c | 2 +- src/clib/u8x8_d_s1d15721.c | 2 +- src/clib/u8x8_d_s1d15e06.c | 2 +- src/clib/u8x8_d_sbn1661.c | 2 +- src/clib/u8x8_d_sed1330.c | 6 +- src/clib/u8x8_d_sh1106_64x32.c | 2 +- src/clib/u8x8_d_sh1106_72x40.c | 2 +- src/clib/u8x8_d_sh1107.c | 12 +- src/clib/u8x8_d_sh1122.c | 2 +- src/clib/u8x8_d_ssd1305.c | 10 +- src/clib/u8x8_d_ssd1306_128x32.c | 6 +- src/clib/u8x8_d_ssd1306_128x64_noname.c | 4 +- src/clib/u8x8_d_ssd1306_64x32.c | 2 +- src/clib/u8x8_d_ssd1306_64x48.c | 2 +- src/clib/u8x8_d_ssd1306_72x40.c | 2 +- src/clib/u8x8_d_ssd1306_96x16.c | 2 +- src/clib/u8x8_d_ssd1306_96x40.c | 4 +- src/clib/u8x8_d_ssd1309.c | 6 +- src/clib/u8x8_d_ssd1316.c | 4 +- src/clib/u8x8_d_ssd1317.c | 2 +- src/clib/u8x8_d_ssd1318.c | 2 +- src/clib/u8x8_d_ssd1320.c | 6 +- src/clib/u8x8_d_ssd1322.c | 8 +- src/clib/u8x8_d_ssd1325.c | 4 +- src/clib/u8x8_d_ssd1326.c | 2 +- src/clib/u8x8_d_ssd1327.c | 10 +- src/clib/u8x8_d_ssd1329.c | 4 +- src/clib/u8x8_d_ssd1362.c | 4 +- src/clib/u8x8_d_ssd1606_172x72.c | 2 +- src/clib/u8x8_d_ssd1607_200x200.c | 2 +- src/clib/u8x8_d_st7511.c | 2 +- src/clib/u8x8_d_st75160.c | 2 +- src/clib/u8x8_d_st75256.c | 18 +-- src/clib/u8x8_d_st7528.c | 4 +- src/clib/u8x8_d_st75320.c | 2 +- src/clib/u8x8_d_st7565.c | 16 +-- src/clib/u8x8_d_st7567.c | 18 +-- src/clib/u8x8_d_st7571.c | 4 +- src/clib/u8x8_d_st7588.c | 2 +- src/clib/u8x8_d_st7920.c | 8 +- src/clib/u8x8_d_t6963.c | 10 +- src/clib/u8x8_d_uc1601.c | 4 +- src/clib/u8x8_d_uc1604.c | 2 +- src/clib/u8x8_d_uc1608.c | 8 +- src/clib/u8x8_d_uc1609.c | 2 +- src/clib/u8x8_d_uc1610.c | 2 +- src/clib/u8x8_d_uc1611.c | 10 +- src/clib/u8x8_d_uc1617.c | 2 +- src/clib/u8x8_d_uc1638.c | 6 +- src/clib/u8x8_d_uc1701_dogs102.c | 2 +- src/clib/u8x8_d_uc1701_mini12864.c | 2 +- 125 files changed, 731 insertions(+), 301 deletions(-) diff --git a/README.md b/README.md index 289a5645..3d00c644 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,5 @@ Description: https://github.com/olikraus/u8g2/wiki Issue Tracker: https://github.com/olikraus/u8g2/issues -Download (2.34.15): https://github.com/olikraus/U8g2_Arduino/archive/master.zip +Download (2.34.16): https://github.com/olikraus/U8g2_Arduino/archive/master.zip diff --git a/examples/full_buffer/FPS/FPS.ino b/examples/full_buffer/FPS/FPS.ino index a09d2c25..e9736015 100644 --- a/examples/full_buffer/FPS/FPS.ino +++ b/examples/full_buffer/FPS/FPS.ino @@ -219,9 +219,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -299,9 +299,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/FontUsage/FontUsage.ino b/examples/full_buffer/FontUsage/FontUsage.ino index f0ed384f..94c9578c 100644 --- a/examples/full_buffer/FontUsage/FontUsage.ino +++ b/examples/full_buffer/FontUsage/FontUsage.ino @@ -124,9 +124,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -204,9 +204,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/GraphicsTest/GraphicsTest.ino b/examples/full_buffer/GraphicsTest/GraphicsTest.ino index 4c2e2fed..0e4b2a83 100644 --- a/examples/full_buffer/GraphicsTest/GraphicsTest.ino +++ b/examples/full_buffer/GraphicsTest/GraphicsTest.ino @@ -90,9 +90,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -170,9 +170,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/HelloWorld/HelloWorld.ino b/examples/full_buffer/HelloWorld/HelloWorld.ino index 70164b0e..bd8b48c8 100644 --- a/examples/full_buffer/HelloWorld/HelloWorld.ino +++ b/examples/full_buffer/HelloWorld/HelloWorld.ino @@ -89,9 +89,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -169,9 +169,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/IconMenu/IconMenu.ino b/examples/full_buffer/IconMenu/IconMenu.ino index ef4bf6f3..3b10565c 100644 --- a/examples/full_buffer/IconMenu/IconMenu.ino +++ b/examples/full_buffer/IconMenu/IconMenu.ino @@ -92,9 +92,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -172,9 +172,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/PrintUTF8/PrintUTF8.ino b/examples/full_buffer/PrintUTF8/PrintUTF8.ino index 201f191b..7213d92c 100644 --- a/examples/full_buffer/PrintUTF8/PrintUTF8.ino +++ b/examples/full_buffer/PrintUTF8/PrintUTF8.ino @@ -92,9 +92,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -172,9 +172,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/ScreenShot/ScreenShot.ino b/examples/full_buffer/ScreenShot/ScreenShot.ino index 79cc676a..a18e3e22 100644 --- a/examples/full_buffer/ScreenShot/ScreenShot.ino +++ b/examples/full_buffer/ScreenShot/ScreenShot.ino @@ -89,9 +89,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -169,9 +169,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/SelectionList/SelectionList.ino b/examples/full_buffer/SelectionList/SelectionList.ino index 36599b87..7a164cbf 100644 --- a/examples/full_buffer/SelectionList/SelectionList.ino +++ b/examples/full_buffer/SelectionList/SelectionList.ino @@ -89,9 +89,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -169,9 +169,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/Shennong/Shennong.ino b/examples/full_buffer/Shennong/Shennong.ino index 39df52ae..28f6dea9 100644 --- a/examples/full_buffer/Shennong/Shennong.ino +++ b/examples/full_buffer/Shennong/Shennong.ino @@ -133,9 +133,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -213,9 +213,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/U8g2Logo/U8g2Logo.ino b/examples/full_buffer/U8g2Logo/U8g2Logo.ino index 87c62e15..d8484fc7 100644 --- a/examples/full_buffer/U8g2Logo/U8g2Logo.ino +++ b/examples/full_buffer/U8g2Logo/U8g2Logo.ino @@ -90,9 +90,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -170,9 +170,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/UpdateArea/UpdateArea.ino b/examples/full_buffer/UpdateArea/UpdateArea.ino index df1b87ef..3b94b752 100644 --- a/examples/full_buffer/UpdateArea/UpdateArea.ino +++ b/examples/full_buffer/UpdateArea/UpdateArea.ino @@ -91,9 +91,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -171,9 +171,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/full_buffer/Weather/Weather.ino b/examples/full_buffer/Weather/Weather.ino index 81c1e16f..99d10661 100644 --- a/examples/full_buffer/Weather/Weather.ino +++ b/examples/full_buffer/Weather/Weather.ino @@ -178,9 +178,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/games/SpaceTrash/SpaceTrash.ino b/examples/games/SpaceTrash/SpaceTrash.ino index 08c61e0f..0c002701 100644 --- a/examples/games/SpaceTrash/SpaceTrash.ino +++ b/examples/games/SpaceTrash/SpaceTrash.ino @@ -161,9 +161,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/ButtonEmoticon/ButtonEmoticon.ino b/examples/page_buffer/ButtonEmoticon/ButtonEmoticon.ino index da546dd9..bd20d905 100644 --- a/examples/page_buffer/ButtonEmoticon/ButtonEmoticon.ino +++ b/examples/page_buffer/ButtonEmoticon/ButtonEmoticon.ino @@ -171,9 +171,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Chinese/Chinese.ino b/examples/page_buffer/Chinese/Chinese.ino index c838b30d..f9cda348 100644 --- a/examples/page_buffer/Chinese/Chinese.ino +++ b/examples/page_buffer/Chinese/Chinese.ino @@ -172,9 +172,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/ClipWindow/ClipWindow.ino b/examples/page_buffer/ClipWindow/ClipWindow.ino index 54e143eb..ddd94baa 100644 --- a/examples/page_buffer/ClipWindow/ClipWindow.ino +++ b/examples/page_buffer/ClipWindow/ClipWindow.ino @@ -171,9 +171,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Clock/Clock.ino b/examples/page_buffer/Clock/Clock.ino index 9e44a9a4..33bc02b3 100644 --- a/examples/page_buffer/Clock/Clock.ino +++ b/examples/page_buffer/Clock/Clock.ino @@ -174,9 +174,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/ContrastTest/ContrastTest.ino b/examples/page_buffer/ContrastTest/ContrastTest.ino index 067d8251..db2fbe9f 100644 --- a/examples/page_buffer/ContrastTest/ContrastTest.ino +++ b/examples/page_buffer/ContrastTest/ContrastTest.ino @@ -171,9 +171,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Devanagari/Devanagari.ino b/examples/page_buffer/Devanagari/Devanagari.ino index d12d02cc..3c2248b8 100644 --- a/examples/page_buffer/Devanagari/Devanagari.ino +++ b/examples/page_buffer/Devanagari/Devanagari.ino @@ -180,9 +180,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/DirectAccess/DirectAccess.ino b/examples/page_buffer/DirectAccess/DirectAccess.ino index 43970158..5165ec27 100644 --- a/examples/page_buffer/DirectAccess/DirectAccess.ino +++ b/examples/page_buffer/DirectAccess/DirectAccess.ino @@ -175,9 +175,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/DrawLog/DrawLog.ino b/examples/page_buffer/DrawLog/DrawLog.ino index f7a30e07..3911e1c9 100644 --- a/examples/page_buffer/DrawLog/DrawLog.ino +++ b/examples/page_buffer/DrawLog/DrawLog.ino @@ -173,9 +173,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/ExtUTF8/ExtUTF8.ino b/examples/page_buffer/ExtUTF8/ExtUTF8.ino index e7235287..c655c1bd 100644 --- a/examples/page_buffer/ExtUTF8/ExtUTF8.ino +++ b/examples/page_buffer/ExtUTF8/ExtUTF8.ino @@ -171,9 +171,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/FPS/FPS.ino b/examples/page_buffer/FPS/FPS.ino index bff66ba8..9a8680d7 100644 --- a/examples/page_buffer/FPS/FPS.ino +++ b/examples/page_buffer/FPS/FPS.ino @@ -400,9 +400,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/FlipMode/FlipMode.ino b/examples/page_buffer/FlipMode/FlipMode.ino index aaafd889..23ee8eb6 100644 --- a/examples/page_buffer/FlipMode/FlipMode.ino +++ b/examples/page_buffer/FlipMode/FlipMode.ino @@ -166,9 +166,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/GraphicsTest/GraphicsTest.ino b/examples/page_buffer/GraphicsTest/GraphicsTest.ino index dc050b32..24354d91 100644 --- a/examples/page_buffer/GraphicsTest/GraphicsTest.ino +++ b/examples/page_buffer/GraphicsTest/GraphicsTest.ino @@ -171,9 +171,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/HelloWorld/HelloWorld.ino b/examples/page_buffer/HelloWorld/HelloWorld.ino index e1242f5a..0032e1d0 100644 --- a/examples/page_buffer/HelloWorld/HelloWorld.ino +++ b/examples/page_buffer/HelloWorld/HelloWorld.ino @@ -189,9 +189,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display @@ -314,7 +316,7 @@ //U8G2_T6963_128X64_ALT_1_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable/wr=*/ 17, /*cs/ce=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // Connect RD with +5V, FS0 and FS1 with GND //U8G2_SED1330_240X128_1_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // Connect /RD = E with +5V, enable is /WR = RW, FG with GND, 14=Uno Pin A0 //U8G2_SED1330_240X128_1_6800 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // A0 is dc pin, /WR = RW = GND, enable is /RD = E -U8G2_SED1330_256X128_1_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // Connect /RD = E with +5V, enable is /WR = RW, FG with GND, 14=Uno Pin A0, enable U8g2 16Bit Mode +//U8G2_SED1330_256X128_1_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // Connect /RD = E with +5V, enable is /WR = RW, FG with GND, 14=Uno Pin A0, enable U8g2 16Bit Mode //U8G2_SED1330_256X128_1_6800 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // A0 is dc pin, /WR = RW = GND, enable is /RD = E, enable U8g2 16Bit Mode //U8G2_RA8835_NHD_240X128_1_8080 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // Connect /RD = E with +5V, enable is /WR = RW, FG with GND, 14=Uno Pin A0 //U8G2_RA8835_NHD_240X128_1_6800 u8g2(U8G2_R0, 8, 9, 10, 11, 4, 5, 6, 7, /*enable=*/ 17, /*cs=*/ 14, /*dc=*/ 15, /*reset=*/ 16); // A0 is dc pin, /WR = RW = GND, enable is /RD = E diff --git a/examples/page_buffer/IconMenu/IconMenu.ino b/examples/page_buffer/IconMenu/IconMenu.ino index c2b1232f..1dc52b56 100644 --- a/examples/page_buffer/IconMenu/IconMenu.ino +++ b/examples/page_buffer/IconMenu/IconMenu.ino @@ -92,9 +92,9 @@ //U8G2_SH1107_PIMORONI_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ 8); //U8G2_SH1107_SEEED_128X128_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ SCL, /* data=*/ SDA, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1107_SEEED_128X128_F_HW_I2C u8g2(U8G2_R0, /* reset=*/ U8X8_PIN_NONE); -//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_HJR_OEL1M0201_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); -//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); +//U8G2_SH1107_SEEED_96X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8);# +//U8G2_SH1107_HJR_OEL1M0201_96X96_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 2, /* data=*/ 0, /* reset=*/ U8X8_PIN_NONE); +//U8G2_SH1107_TK078F288_80X128_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 15, /* dc=*/ 0, /* reset=*/ U8X8_PIN_NONE); //U8G2_SH1108_128X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1108_160X160_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SH1122_256X64_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Enable U8G2_16BIT in u8g2.h @@ -172,9 +172,11 @@ //U8G2_SSD1318_128X96_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1318_128X96_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_F_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_F_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_F_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_F_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Japanese/Japanese.ino b/examples/page_buffer/Japanese/Japanese.ino index 5ccddb9d..b956bae5 100644 --- a/examples/page_buffer/Japanese/Japanese.ino +++ b/examples/page_buffer/Japanese/Japanese.ino @@ -172,9 +172,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Korean/Korean.ino b/examples/page_buffer/Korean/Korean.ino index 2721d62b..13b859b4 100644 --- a/examples/page_buffer/Korean/Korean.ino +++ b/examples/page_buffer/Korean/Korean.ino @@ -172,9 +172,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/LoadFromSD/LoadFromSD.ino b/examples/page_buffer/LoadFromSD/LoadFromSD.ino index 829046cd..bf238485 100644 --- a/examples/page_buffer/LoadFromSD/LoadFromSD.ino +++ b/examples/page_buffer/LoadFromSD/LoadFromSD.ino @@ -181,9 +181,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/MechCount/MechCount.ino b/examples/page_buffer/MechCount/MechCount.ino index 82df96d7..c631160a 100644 --- a/examples/page_buffer/MechCount/MechCount.ino +++ b/examples/page_buffer/MechCount/MechCount.ino @@ -171,9 +171,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/PowerSaveTest/PowerSaveTest.ino b/examples/page_buffer/PowerSaveTest/PowerSaveTest.ino index b137211c..021812c0 100644 --- a/examples/page_buffer/PowerSaveTest/PowerSaveTest.ino +++ b/examples/page_buffer/PowerSaveTest/PowerSaveTest.ino @@ -165,9 +165,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/PrintHelloWorld/PrintHelloWorld.ino b/examples/page_buffer/PrintHelloWorld/PrintHelloWorld.ino index e81b5c5d..65cd7f02 100644 --- a/examples/page_buffer/PrintHelloWorld/PrintHelloWorld.ino +++ b/examples/page_buffer/PrintHelloWorld/PrintHelloWorld.ino @@ -172,9 +172,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/PrintProgmem/PrintProgmem.ino b/examples/page_buffer/PrintProgmem/PrintProgmem.ino index f5146f5c..f82af5de 100644 --- a/examples/page_buffer/PrintProgmem/PrintProgmem.ino +++ b/examples/page_buffer/PrintProgmem/PrintProgmem.ino @@ -175,9 +175,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/PrintUTF8/PrintUTF8.ino b/examples/page_buffer/PrintUTF8/PrintUTF8.ino index fc843ff8..a63ea5b1 100644 --- a/examples/page_buffer/PrintUTF8/PrintUTF8.ino +++ b/examples/page_buffer/PrintUTF8/PrintUTF8.ino @@ -172,9 +172,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/ScrollingText/ScrollingText.ino b/examples/page_buffer/ScrollingText/ScrollingText.ino index 9372aff0..76808c66 100644 --- a/examples/page_buffer/ScrollingText/ScrollingText.ino +++ b/examples/page_buffer/ScrollingText/ScrollingText.ino @@ -175,9 +175,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/SelectionList/SelectionList.ino b/examples/page_buffer/SelectionList/SelectionList.ino index 5126a7e1..c699506e 100644 --- a/examples/page_buffer/SelectionList/SelectionList.ino +++ b/examples/page_buffer/SelectionList/SelectionList.ino @@ -161,9 +161,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Serial/Serial.ino b/examples/page_buffer/Serial/Serial.ino index 2c48d979..f9024c5a 100644 --- a/examples/page_buffer/Serial/Serial.ino +++ b/examples/page_buffer/Serial/Serial.ino @@ -173,9 +173,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Shennong/Shennong.ino b/examples/page_buffer/Shennong/Shennong.ino index 72cde68e..d0a09047 100644 --- a/examples/page_buffer/Shennong/Shennong.ino +++ b/examples/page_buffer/Shennong/Shennong.ino @@ -213,9 +213,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/StateBufferLoop/StateBufferLoop.ino b/examples/page_buffer/StateBufferLoop/StateBufferLoop.ino index bf4325fa..dfba44df 100644 --- a/examples/page_buffer/StateBufferLoop/StateBufferLoop.ino +++ b/examples/page_buffer/StateBufferLoop/StateBufferLoop.ino @@ -178,9 +178,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Terminal/Terminal.ino b/examples/page_buffer/Terminal/Terminal.ino index e38077ee..de63cac6 100644 --- a/examples/page_buffer/Terminal/Terminal.ino +++ b/examples/page_buffer/Terminal/Terminal.ino @@ -173,9 +173,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/U8g2Logo/U8g2Logo.ino b/examples/page_buffer/U8g2Logo/U8g2Logo.ino index f285252d..39bb3795 100644 --- a/examples/page_buffer/U8g2Logo/U8g2Logo.ino +++ b/examples/page_buffer/U8g2Logo/U8g2Logo.ino @@ -170,9 +170,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/UpdatePartly/UpdatePartly.ino b/examples/page_buffer/UpdatePartly/UpdatePartly.ino index aef510bf..aad5b621 100644 --- a/examples/page_buffer/UpdatePartly/UpdatePartly.ino +++ b/examples/page_buffer/UpdatePartly/UpdatePartly.ino @@ -177,9 +177,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/Weather/Weather.ino b/examples/page_buffer/Weather/Weather.ino index ecd14060..9973292f 100644 --- a/examples/page_buffer/Weather/Weather.ino +++ b/examples/page_buffer/Weather/Weather.ino @@ -175,9 +175,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/XBM/XBM.ino b/examples/page_buffer/XBM/XBM.ino index 1910f4da..0002f8c9 100644 --- a/examples/page_buffer/XBM/XBM.ino +++ b/examples/page_buffer/XBM/XBM.ino @@ -175,9 +175,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/examples/page_buffer/XORTest/XORTest.ino b/examples/page_buffer/XORTest/XORTest.ino index e7cb9a35..604d21fd 100644 --- a/examples/page_buffer/XORTest/XORTest.ino +++ b/examples/page_buffer/XORTest/XORTest.ino @@ -175,9 +175,11 @@ //U8G2_SSD1320_160X80_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_SSD1320_160X80_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_LD7032_60X32_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_LD7032_60X32_ALT_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board -//U8G2_LD7032_60X32_ALT_1_4W_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_60X32_ALT_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! +//U8G2_LD7032_128X36_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* cs=*/ 9, /* dc=*/ 10, /* reset=*/ 8); // SW SPI Nano Board +//U8G2_LD7032_128X36_1_SW_I2C u8g2(U8G2_R0, /* clock=*/ 11, /* data=*/ 12, /* reset=*/ U8X8_PIN_NONE); // NOT TESTED! //U8G2_UC1701_EA_DOGS102_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_UC1701_EA_DOGS102_1_4W_HW_SPI u8g2(U8G2_R0, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); //U8G2_PCD8544_84X48_1_4W_SW_SPI u8g2(U8G2_R0, /* clock=*/ 13, /* data=*/ 11, /* cs=*/ 10, /* dc=*/ 9, /* reset=*/ 8); // Nokia 5110 Display diff --git a/extras/ChangeLog b/extras/ChangeLog index 78f44ede..a2e84f98 100644 --- a/extras/ChangeLog +++ b/extras/ChangeLog @@ -312,3 +312,4 @@ https://github.com/olikraus/u8g2 ChangeLog * Bugfix: Fix line draw procedure in 16 bit mode (issue 2053) * Added Spleen Monospaced Font from https://github.com/fcambus/spleen (issue 2015) * Extended the "E" font range with subscript characters if available in the original font (issue 2079) + * Bugfix for ESP32 HW SPI Pin Remapping (issue 377, PR 2123) diff --git a/library.properties b/library.properties index 61822bd9..9fd57e44 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=U8g2 -version=2.34.15 +version=2.34.16 author=oliver maintainer=oliver sentence=Monochrome LCD, OLED and eInk Library. Display controller: SSD1305, SSD1306, SSD1309, SSD1312, SSD1316, SSD1318, SSD1320, SSD1322, SSD1325, SSD1327, SSD1329, SSD1606, SSD1607, SH1106, SH1107, SH1108, SH1122, T6963, RA8835, LC7981, PCD8544, PCF8812, HX1230, UC1601, UC1604, UC1608, UC1610, UC1611, UC1617, UC1638, UC1701, ST7511, ST7528, ST7565, ST7567, ST7571, ST7586, ST7588, ST75160, ST75256, ST75320, NT7534, ST7920, IST3020, IST3088, IST7920, LD7032, KS0108, KS0713, HD44102, T7932, SED1520, SBN1661, IL3820, MAX7219, GP1287, GP1247, GU800. Interfaces: I2C, SPI, Parallel. diff --git a/src/U8g2lib.h b/src/U8g2lib.h index 04cb92c0..232801fa 100644 --- a/src/U8g2lib.h +++ b/src/U8g2lib.h @@ -10173,6 +10173,114 @@ class U8G2_LD7032_60X32_ALT_F_2ND_HW_I2C : public U8G2 { u8x8_SetPin_HW_I2C(getU8x8(), reset); } }; +class U8G2_LD7032_128X36_1_4W_SW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_1_4W_SW_SPI(const u8g2_cb_t *rotation, uint8_t clock, uint8_t data, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_1(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_SW_SPI(getU8x8(), clock, data, cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_1_4W_HW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_1_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_1(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_1_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_1_2ND_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_1(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_2_4W_SW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_2_4W_SW_SPI(const u8g2_cb_t *rotation, uint8_t clock, uint8_t data, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_2(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_SW_SPI(getU8x8(), clock, data, cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_2_4W_HW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_2_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_2(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_2_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_2_2ND_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_2(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_F_4W_SW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_F_4W_SW_SPI(const u8g2_cb_t *rotation, uint8_t clock, uint8_t data, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_f(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_SW_SPI(getU8x8(), clock, data, cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_F_4W_HW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_F_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_f(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_F_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_LD7032_128X36_F_2ND_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_128x36_f(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8G2_LD7032_128X36_1_SW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_1_SW_I2C(const u8g2_cb_t *rotation, uint8_t clock, uint8_t data, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_1(&u8g2, rotation, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_SW_I2C(getU8x8(), clock, data, reset); + } +}; +class U8G2_LD7032_128X36_1_HW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_1_HW_I2C(const u8g2_cb_t *rotation, uint8_t reset = U8X8_PIN_NONE, uint8_t clock = U8X8_PIN_NONE, uint8_t data = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_1(&u8g2, rotation, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset, clock, data); + } +}; +class U8G2_LD7032_128X36_1_2ND_HW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_1_2ND_HW_I2C(const u8g2_cb_t *rotation, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_1(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset); + } +}; +class U8G2_LD7032_128X36_2_SW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_2_SW_I2C(const u8g2_cb_t *rotation, uint8_t clock, uint8_t data, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_2(&u8g2, rotation, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_SW_I2C(getU8x8(), clock, data, reset); + } +}; +class U8G2_LD7032_128X36_2_HW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_2_HW_I2C(const u8g2_cb_t *rotation, uint8_t reset = U8X8_PIN_NONE, uint8_t clock = U8X8_PIN_NONE, uint8_t data = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_2(&u8g2, rotation, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset, clock, data); + } +}; +class U8G2_LD7032_128X36_2_2ND_HW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_2_2ND_HW_I2C(const u8g2_cb_t *rotation, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_2(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset); + } +}; +class U8G2_LD7032_128X36_F_SW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_F_SW_I2C(const u8g2_cb_t *rotation, uint8_t clock, uint8_t data, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_f(&u8g2, rotation, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_SW_I2C(getU8x8(), clock, data, reset); + } +}; +class U8G2_LD7032_128X36_F_HW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_F_HW_I2C(const u8g2_cb_t *rotation, uint8_t reset = U8X8_PIN_NONE, uint8_t clock = U8X8_PIN_NONE, uint8_t data = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_f(&u8g2, rotation, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset, clock, data); + } +}; +class U8G2_LD7032_128X36_F_2ND_HW_I2C : public U8G2 { + public: U8G2_LD7032_128X36_F_2ND_HW_I2C(const u8g2_cb_t *rotation, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_ld7032_i2c_128x36_f(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset); + } +}; class U8G2_ST7920_256X32_1_8080 : public U8G2 { public: U8G2_ST7920_256X32_1_8080(const u8g2_cb_t *rotation, uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7, uint8_t enable, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { u8g2_Setup_st7920_p_256x32_1(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); diff --git a/src/U8x8lib.cpp b/src/U8x8lib.cpp index ca65dbf0..e72f3653 100644 --- a/src/U8x8lib.cpp +++ b/src/U8x8lib.cpp @@ -789,11 +789,14 @@ extern "C" uint8_t u8x8_byte_arduino_3wire_hw_spi(u8x8_t *u8x8, uint8_t msg, uin #if defined(ESP_PLATFORM) || defined(ARDUINO_ARCH_ESP32) /* ESP32 has the following begin: SPI.begin(int8_t sck=SCK, int8_t miso=MISO, int8_t mosi=MOSI, int8_t ss=-1); */ /* not sure about ESP8266 */ - if ( u8x8->pins[U8X8_PIN_I2C_CLOCK] != U8X8_PIN_NONE && u8x8->pins[U8X8_PIN_I2C_DATA] != U8X8_PIN_NONE ) - { + /* apply bugfix from PR 2123 */ + //if ( u8x8->pins[U8X8_PIN_I2C_CLOCK] != U8X8_PIN_NONE && u8x8->pins[U8X8_PIN_I2C_DATA] != U8X8_PIN_NONE ) + if ( u8x8->pins[U8X8_PIN_SPI_CLOCK] != U8X8_PIN_NONE && u8x8->pins[U8X8_PIN_SPI_DATA] != U8X8_PIN_NONE ) + { /* SPI.begin(int8_t sck=SCK, int8_t miso=MISO, int8_t mosi=MOSI, int8_t ss=-1); */ /* actually MISO is not used, but what else could be used here??? */ - SPI.begin(u8x8->pins[U8X8_PIN_I2C_CLOCK], MISO, u8x8->pins[U8X8_PIN_I2C_DATA]); + //SPI.begin(u8x8->pins[U8X8_PIN_I2C_CLOCK], MISO, u8x8->pins[U8X8_PIN_I2C_DATA]); + SPI.begin(u8x8->pins[U8X8_PIN_SPI_CLOCK], MISO, u8x8->pins[U8X8_PIN_SPI_DATA]); } else { @@ -885,6 +888,12 @@ extern "C" uint8_t u8x8_byte_arduino_hw_spi(u8x8_t *u8x8, uint8_t msg, uint8_t a { case U8X8_MSG_BYTE_SEND: + + +#if defined(ESP_PLATFORM) + //T.M.L 2023-02-28: use the block transfer function on ESP, which does not overwrite the buffer. + SPI.writeBytes((uint8_t*)arg_ptr, arg_int); +#else // 1.6.5 offers a block transfer, but the problem is, that the // buffer is overwritten with the incoming data // so it can not be used... @@ -893,11 +902,12 @@ extern "C" uint8_t u8x8_byte_arduino_hw_spi(u8x8_t *u8x8, uint8_t msg, uint8_t a data = (uint8_t *)arg_ptr; while( arg_int > 0 ) { - SPI.transfer((uint8_t)*data); - data++; - arg_int--; + SPI.transfer((uint8_t)*data); + data++; + arg_int--; } - +#endif + break; case U8X8_MSG_BYTE_INIT: if ( u8x8->bus_clock == 0 ) /* issue 769 */ @@ -920,11 +930,11 @@ extern "C" uint8_t u8x8_byte_arduino_hw_spi(u8x8_t *u8x8, uint8_t msg, uint8_t a #if defined(ESP_PLATFORM) || defined(ARDUINO_ARCH_ESP32) /* ESP32 has the following begin: SPI.begin(int8_t sck=SCK, int8_t miso=MISO, int8_t mosi=MOSI, int8_t ss=-1); */ /* not sure about ESP8266 */ - if ( u8x8->pins[U8X8_PIN_I2C_CLOCK] != U8X8_PIN_NONE && u8x8->pins[U8X8_PIN_I2C_DATA] != U8X8_PIN_NONE ) + if ( u8x8->pins[U8X8_PIN_SPI_CLOCK] != U8X8_PIN_NONE && u8x8->pins[U8X8_PIN_SPI_DATA] != U8X8_PIN_NONE ) { /* SPI.begin(int8_t sck=SCK, int8_t miso=MISO, int8_t mosi=MOSI, int8_t ss=-1); */ /* actually MISO is not used, but what else could be used here??? */ - SPI.begin(u8x8->pins[U8X8_PIN_I2C_CLOCK], MISO, u8x8->pins[U8X8_PIN_I2C_DATA]); + SPI.begin(u8x8->pins[U8X8_PIN_SPI_CLOCK], MISO, u8x8->pins[U8X8_PIN_SPI_DATA]); } else { diff --git a/src/U8x8lib.h b/src/U8x8lib.h index 614c4aae..6b7ae600 100644 --- a/src/U8x8lib.h +++ b/src/U8x8lib.h @@ -3663,6 +3663,42 @@ class U8X8_LD7032_60X32_ALT_2ND_HW_I2C : public U8X8 { u8x8_SetPin_HW_I2C(getU8x8(), reset); } }; +class U8X8_LD7032_128X36_4W_SW_SPI : public U8X8 { + public: U8X8_LD7032_128X36_4W_SW_SPI(uint8_t clock, uint8_t data, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_ld7032_128x36, u8x8_cad_011, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_SW_SPI(getU8x8(), clock, data, cs, dc, reset); + } +}; +class U8X8_LD7032_128X36_4W_HW_SPI : public U8X8 { + public: U8X8_LD7032_128X36_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_ld7032_128x36, u8x8_cad_011, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8X8_LD7032_128X36_2ND_4W_HW_SPI : public U8X8 { + public: U8X8_LD7032_128X36_2ND_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_ld7032_128x36, u8x8_cad_011, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); + } +}; +class U8X8_LD7032_128X36_SW_I2C : public U8X8 { + public: U8X8_LD7032_128X36_SW_I2C(uint8_t clock, uint8_t data, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_ld7032_128x36, u8x8_cad_ld7032_i2c, u8x8_byte_arduino_sw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_SW_I2C(getU8x8(), clock, data, reset); + } +}; +class U8X8_LD7032_128X36_HW_I2C : public U8X8 { + public: U8X8_LD7032_128X36_HW_I2C(uint8_t reset = U8X8_PIN_NONE, uint8_t clock = U8X8_PIN_NONE, uint8_t data = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_ld7032_128x36, u8x8_cad_ld7032_i2c, u8x8_byte_arduino_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset, clock, data); + } +}; +class U8X8_LD7032_128X36_2ND_HW_I2C : public U8X8 { + public: U8X8_LD7032_128X36_2ND_HW_I2C(uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_ld7032_128x36, u8x8_cad_ld7032_i2c, u8x8_byte_arduino_2nd_hw_i2c, u8x8_gpio_and_delay_arduino); + u8x8_SetPin_HW_I2C(getU8x8(), reset); + } +}; class U8X8_ST7920_256X32_8080 : public U8X8 { public: U8X8_ST7920_256X32_8080(uint8_t d0, uint8_t d1, uint8_t d2, uint8_t d3, uint8_t d4, uint8_t d5, uint8_t d6, uint8_t d7, uint8_t enable, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { u8x8_Setup(getU8x8(), u8x8_d_st7920_256x32, u8x8_cad_001, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); diff --git a/src/clib/u8g2.h b/src/clib/u8g2.h index f4649ddb..385840ec 100644 --- a/src/clib/u8g2.h +++ b/src/clib/u8g2.h @@ -531,6 +531,9 @@ uint8_t *u8g2_m_32_4_f(uint8_t *page_cnt); uint8_t *u8g2_m_12_8_1(uint8_t *page_cnt); uint8_t *u8g2_m_12_8_2(uint8_t *page_cnt); uint8_t *u8g2_m_12_8_f(uint8_t *page_cnt); +uint8_t *u8g2_m_16_5_1(uint8_t *page_cnt); +uint8_t *u8g2_m_16_5_2(uint8_t *page_cnt); +uint8_t *u8g2_m_16_5_f(uint8_t *page_cnt); uint8_t *u8g2_m_20_4_1(uint8_t *page_cnt); uint8_t *u8g2_m_20_4_2(uint8_t *page_cnt); uint8_t *u8g2_m_20_4_f(uint8_t *page_cnt); @@ -983,6 +986,12 @@ void u8g2_Setup_ld7032_i2c_60x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8 void u8g2_Setup_ld7032_i2c_60x32_alt_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_ld7032_i2c_60x32_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_ld7032_i2c_60x32_alt_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_ld7032_128x36_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_ld7032_128x36_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_ld7032_128x36_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_ld7032_i2c_128x36_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_ld7032_i2c_128x36_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_ld7032_i2c_128x36_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_st7920_p_256x32_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_st7920_p_256x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_st7920_p_256x32_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); diff --git a/src/clib/u8g2_d_memory.c b/src/clib/u8g2_d_memory.c index b53ae024..d52346ff 100644 --- a/src/clib/u8g2_d_memory.c +++ b/src/clib/u8g2_d_memory.c @@ -696,6 +696,39 @@ uint8_t *u8g2_m_12_8_f(uint8_t *page_cnt) return buf; #endif } +uint8_t *u8g2_m_16_5_1(uint8_t *page_cnt) +{ + #ifdef U8G2_USE_DYNAMIC_ALLOC + *page_cnt = 1; + return 0; + #else + static uint8_t buf[128]; + *page_cnt = 1; + return buf; + #endif +} +uint8_t *u8g2_m_16_5_2(uint8_t *page_cnt) +{ + #ifdef U8G2_USE_DYNAMIC_ALLOC + *page_cnt = 2; + return 0; + #else + static uint8_t buf[256]; + *page_cnt = 2; + return buf; + #endif +} +uint8_t *u8g2_m_16_5_f(uint8_t *page_cnt) +{ + #ifdef U8G2_USE_DYNAMIC_ALLOC + *page_cnt = 5; + return 0; + #else + static uint8_t buf[640]; + *page_cnt = 5; + return buf; + #endif +} uint8_t *u8g2_m_20_4_1(uint8_t *page_cnt) { #ifdef U8G2_USE_DYNAMIC_ALLOC diff --git a/src/clib/u8g2_d_setup.c b/src/clib/u8g2_d_setup.c index eb249c0e..b01b98fb 100644 --- a/src/clib/u8g2_d_setup.c +++ b/src/clib/u8g2_d_setup.c @@ -2999,6 +2999,62 @@ void u8g2_Setup_ld7032_i2c_60x32_alt_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, buf = u8g2_m_8_4_f(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); } +/* ld7032 */ +/* ld7032 1 */ +void u8g2_Setup_ld7032_128x36_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +{ + uint8_t tile_buf_height; + uint8_t *buf; + u8g2_SetupDisplay(u8g2, u8x8_d_ld7032_128x36, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_16_5_1(&tile_buf_height); + u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); +} +/* ld7032 2 */ +void u8g2_Setup_ld7032_128x36_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +{ + uint8_t tile_buf_height; + uint8_t *buf; + u8g2_SetupDisplay(u8g2, u8x8_d_ld7032_128x36, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_16_5_2(&tile_buf_height); + u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); +} +/* ld7032 f */ +void u8g2_Setup_ld7032_128x36_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +{ + uint8_t tile_buf_height; + uint8_t *buf; + u8g2_SetupDisplay(u8g2, u8x8_d_ld7032_128x36, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_16_5_f(&tile_buf_height); + u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); +} +/* ld7032 */ +/* ld7032 1 */ +void u8g2_Setup_ld7032_i2c_128x36_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +{ + uint8_t tile_buf_height; + uint8_t *buf; + u8g2_SetupDisplay(u8g2, u8x8_d_ld7032_128x36, u8x8_cad_ld7032_i2c, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_16_5_1(&tile_buf_height); + u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); +} +/* ld7032 2 */ +void u8g2_Setup_ld7032_i2c_128x36_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +{ + uint8_t tile_buf_height; + uint8_t *buf; + u8g2_SetupDisplay(u8g2, u8x8_d_ld7032_128x36, u8x8_cad_ld7032_i2c, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_16_5_2(&tile_buf_height); + u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); +} +/* ld7032 f */ +void u8g2_Setup_ld7032_i2c_128x36_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +{ + uint8_t tile_buf_height; + uint8_t *buf; + u8g2_SetupDisplay(u8g2, u8x8_d_ld7032_128x36, u8x8_cad_ld7032_i2c, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_16_5_f(&tile_buf_height); + u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_horizontal_right_lsb, rotation); +} /* st7920 */ /* st7920 1 */ void u8g2_Setup_st7920_p_256x32_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) diff --git a/src/clib/u8g2_polygon.c b/src/clib/u8g2_polygon.c index bc1f14ab..060cf49f 100644 --- a/src/clib/u8g2_polygon.c +++ b/src/clib/u8g2_polygon.c @@ -216,17 +216,17 @@ static void pg_hline(pg_struct *pg, u8g2_t *u8g2) if ( y < 0 ) return; - if ( y >= u8g2_GetDisplayHeight(u8g2) ) // does not work for 256x64 display??? + if ( y >= (pg_word_t)u8g2_GetDisplayHeight(u8g2) ) // does not work for 256x64 display??? return; if ( x1 < x2 ) { if ( x2 < 0 ) return; - if ( x1 >= u8g2_GetDisplayWidth(u8g2) ) + if ( x1 >= (pg_word_t)u8g2_GetDisplayWidth(u8g2) ) return; if ( x1 < 0 ) x1 = 0; - if ( x2 >= u8g2_GetDisplayWidth(u8g2) ) + if ( x2 >= (pg_word_t)u8g2_GetDisplayWidth(u8g2) ) x2 = u8g2_GetDisplayWidth(u8g2); u8g2_DrawHLine(u8g2, x1, y, x2 - x1); } @@ -234,11 +234,11 @@ static void pg_hline(pg_struct *pg, u8g2_t *u8g2) { if ( x1 < 0 ) return; - if ( x2 >= u8g2_GetDisplayWidth(u8g2) ) + if ( x2 >= (pg_word_t)u8g2_GetDisplayWidth(u8g2) ) return; if ( x2 < 0 ) x1 = 0; - if ( x1 >= u8g2_GetDisplayWidth(u8g2) ) + if ( x1 >= (pg_word_t)u8g2_GetDisplayWidth(u8g2) ) x1 = u8g2_GetDisplayWidth(u8g2); u8g2_DrawHLine(u8g2, x2, y, x1 - x2); } diff --git a/src/clib/u8x8.h b/src/clib/u8x8.h index 179e9ba8..ffc51461 100644 --- a/src/clib/u8x8.h +++ b/src/clib/u8x8.h @@ -924,6 +924,7 @@ uint8_t u8x8_d_st75320_jlx320240(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, voi uint8_t u8x8_d_nt7534_tg12864r(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); /* u8x8_d_st7565.c */ uint8_t u8x8_d_ld7032_60x32(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_ld7032_60x32_alt(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); +uint8_t u8x8_d_ld7032_128x36(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_t6963_240x128(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_t6963_240x64(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); uint8_t u8x8_d_t6963_128x64(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr); diff --git a/src/clib/u8x8_d_a2printer.c b/src/clib/u8x8_d_a2printer.c index b2177f99..9d57b610 100644 --- a/src/clib/u8x8_d_a2printer.c +++ b/src/clib/u8x8_d_a2printer.c @@ -155,7 +155,7 @@ static const u8x8_display_info_t u8x8_a2printer_384x240_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 48, - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 384, diff --git a/src/clib/u8x8_d_gp1247ai.c b/src/clib/u8x8_d_gp1247ai.c index e44db2dc..f972b5d9 100644 --- a/src/clib/u8x8_d_gp1247ai.c +++ b/src/clib/u8x8_d_gp1247ai.c @@ -57,7 +57,7 @@ static const u8x8_display_info_t u8x8_gp1247ai_display_info = { /* data_setup_time_ns = */ 60, /* tsu */ /* write_pulse_width_ns = */ 120, /* tcyc/2 */ /* tile_width = */ 32, /* 32*8=256 memory size */ - /* tile_hight = */ 8, /* 8*8=64 memory size */ + /* tile_height = */ 8, /* 8*8=64 memory size */ /* default_x_offset = */ 0, /* */ /* flipmode_x_offset = */ 0, /* */ /* pixel_width = */ 253, /* display size */ diff --git a/src/clib/u8x8_d_gp1287ai.c b/src/clib/u8x8_d_gp1287ai.c index c426bc79..b876a5fa 100644 --- a/src/clib/u8x8_d_gp1287ai.c +++ b/src/clib/u8x8_d_gp1287ai.c @@ -57,7 +57,7 @@ static const u8x8_display_info_t u8x8_gp1287ai_display_info = { /* data_setup_time_ns = */ 60, /* tsu */ /* write_pulse_width_ns = */ 120, /* tcyc/2 */ /* tile_width = */ 32, /* 32*8=256 memory size */ - /* tile_hight = */ 7, /* 7*8=56 memory size */ + /* tile_height = */ 7, /* 7*8=56 memory size */ /* default_x_offset = */ 0, /* */ /* flipmode_x_offset = */ 0, /* */ /* pixel_width = */ 256, /* display size */ diff --git a/src/clib/u8x8_d_gu800.c b/src/clib/u8x8_d_gu800.c index 2a557dae..e00f709d 100644 --- a/src/clib/u8x8_d_gu800.c +++ b/src/clib/u8x8_d_gu800.c @@ -185,7 +185,7 @@ static const u8x8_display_info_t u8x8_d_gu800_128x64_display_info = /* data_setup_time_ns = */ 40, /* GU800: Min 40ns per datasheet */ /* write_pulse_width_ns = */ 150, /* GU800: Min 150ns per datasheet */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -263,7 +263,7 @@ static const u8x8_display_info_t u8x8_d_gu800_160x16_display_info = /* data_setup_time_ns = */ 40, /* GU800: Min 40ns per datasheet */ /* write_pulse_width_ns = */ 150, /* GU800: Min 150ns per datasheet */ /* tile_width = */ 20, /* width of 8*20=160 pixel */ - /* tile_hight = */ 2, + /* tile_height = */ 2, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_hd44102.c b/src/clib/u8x8_d_hd44102.c index 66f62a2f..62da5f40 100644 --- a/src/clib/u8x8_d_hd44102.c +++ b/src/clib/u8x8_d_hd44102.c @@ -165,7 +165,7 @@ static const u8x8_display_info_t u8x8_hd44102_150x32_display_info = /* data_setup_time_ns = */ 200, /* write_pulse_width_ns = */ 250, /* KS0108/HD44102: actially 450 ns, but additional 200 ns are added by the byte transfer function */ /* tile_width = */ 19, /* width of 19*8=152 pixel */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 150, @@ -260,7 +260,7 @@ static const u8x8_display_info_t u8x8_hd44102_100x64_display_info = /* data_setup_time_ns = */ 200, /* write_pulse_width_ns = */ 250, /* KS0108/HD44102: actially 450 ns, but additional 200 ns are added by the byte transfer function */ /* tile_width = */ 13, /* width of 13*8=104 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 100, diff --git a/src/clib/u8x8_d_il3820_296x128.c b/src/clib/u8x8_d_il3820_296x128.c index 18d6f3dd..621ba623 100644 --- a/src/clib/u8x8_d_il3820_296x128.c +++ b/src/clib/u8x8_d_il3820_296x128.c @@ -156,7 +156,7 @@ static const u8x8_display_info_t u8x8_il3820_296x128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 37, /* 37*8 = 296 */ - /* tile_hight = */ 16, /* 16*8 = 128 */ + /* tile_height = */ 16, /* 16*8 = 128 */ /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 296, diff --git a/src/clib/u8x8_d_ist3020.c b/src/clib/u8x8_d_ist3020.c index cfeca84d..8a440638 100644 --- a/src/clib/u8x8_d_ist3020.c +++ b/src/clib/u8x8_d_ist3020.c @@ -88,7 +88,7 @@ static const u8x8_display_info_t u8x8_ist3020_erc19264_display_info = /* data_setup_time_ns = */ 40, /* IST3020 datasheet, page 54 */ /* write_pulse_width_ns = */ 60, /* IST3020 datasheet, page 54 */ /* tile_width = */ 24, /* width of 24*8=192 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 64, /* pixel_width = */ 192, diff --git a/src/clib/u8x8_d_ist3088.c b/src/clib/u8x8_d_ist3088.c index 5f08673d..aaf886e7 100644 --- a/src/clib/u8x8_d_ist3088.c +++ b/src/clib/u8x8_d_ist3088.c @@ -251,7 +251,7 @@ static const u8x8_display_info_t u8x8_ist3088_320x240_display_info = /* data_setup_time_ns = */ 70, /* write_pulse_width_ns = */ 60, /* tile_width = */ 40, - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 320, diff --git a/src/clib/u8x8_d_ist7920.c b/src/clib/u8x8_d_ist7920.c index 9f7fd758..65a45168 100644 --- a/src/clib/u8x8_d_ist7920.c +++ b/src/clib/u8x8_d_ist7920.c @@ -86,7 +86,7 @@ static const u8x8_display_info_t u8x8_ist7920_128x128_display_info = /* data_setup_time_ns = */ 60, /* IST7920 datasheet, page 47 */ /* write_pulse_width_ns = */ 150, /* IST7920 datasheet, page 47 */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ks0108.c b/src/clib/u8x8_d_ks0108.c index e0047be2..75197c48 100644 --- a/src/clib/u8x8_d_ks0108.c +++ b/src/clib/u8x8_d_ks0108.c @@ -120,7 +120,7 @@ static const u8x8_display_info_t u8x8_ks0108_128x64_display_info = /* data_setup_time_ns = */ 200, /* write_pulse_width_ns = */ 250, /* KS0108: actially 450 ns, but additional 200 ns are added by the byte transfer function */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -227,7 +227,7 @@ static const u8x8_display_info_t u8x8_ks0108_192x64_display_info = /* data_setup_time_ns = */ 200, /* write_pulse_width_ns = */ 250, /* KS0108: actially 450 ns, but additional 200 ns are added by the byte transfer function */ /* tile_width = */ 24, /* width of 24*8=192 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 192, diff --git a/src/clib/u8x8_d_lc7981.c b/src/clib/u8x8_d_lc7981.c index 9560c057..12b56343 100644 --- a/src/clib/u8x8_d_lc7981.c +++ b/src/clib/u8x8_d_lc7981.c @@ -203,7 +203,7 @@ static const u8x8_display_info_t u8x8_lc7981_160x80_display_info = /* data_setup_time_ns = */ 220, /* write_pulse_width_ns = */ 20, /* tile_width = */ 20, /* width of 20*8=160 pixel */ - /* tile_hight = */ 10, + /* tile_height = */ 10, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, @@ -275,7 +275,7 @@ static const u8x8_display_info_t u8x8_lc7981_160x160_display_info = /* data_setup_time_ns = */ 220, /* write_pulse_width_ns = */ 20, /* tile_width = */ 20, /* width of 20*8=160 pixel */ - /* tile_hight = */ 20, + /* tile_height = */ 20, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, @@ -347,7 +347,7 @@ static const u8x8_display_info_t u8x8_lc7981_240x128_display_info = /* data_setup_time_ns = */ 220, /* write_pulse_width_ns = */ 20, /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -420,7 +420,7 @@ static const u8x8_display_info_t u8x8_lc7981_240x64_display_info = /* data_setup_time_ns = */ 220, /* write_pulse_width_ns = */ 20, /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -492,7 +492,7 @@ static const u8x8_display_info_t u8x8_lc7981_128x128_display_info = /* data_setup_time_ns = */ 220, /* write_pulse_width_ns = */ 20, /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ld7032_60x32.c b/src/clib/u8x8_d_ld7032_60x32.c index 86b00ddc..f79bd774 100644 --- a/src/clib/u8x8_d_ld7032_60x32.c +++ b/src/clib/u8x8_d_ld7032_60x32.c @@ -2,10 +2,12 @@ u8x8_d_ld7032_60x32.c Note: Flip Mode is NOT supported + + Also contains 128x36 OLED variant Universal 8bit Graphics Library (https://github.com/olikraus/u8g2/) - Copyright (c) 2016, olikraus@gmail.com + Copyright (c) 2023, olikraus@gmail.com All rights reserved. Redistribution and use in source and binary forms, with or without modification, @@ -223,7 +225,7 @@ static const u8x8_display_info_t u8x8_ld7032_60x32_display_info = /* data_setup_time_ns = */ 20, /* write_pulse_width_ns = */ 40, /* tile_width = */ 8, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 60, @@ -272,11 +274,13 @@ static const uint8_t u8x8_d_ld7032_60x32_alt_init_seq[] = { U8X8_CA(0x48, 0x03), U8X8_CA(0x17, 0x00), U8X8_CA(0x13, 0x01), - U8X8_CA(0x3F, 0x11), + U8X8_CA(0x3F, 0x11), // internal regulator enabled, vcc_c * 0.7 U8X8_CA(0x3D, 0x00), U8X8_END_TRANSFER(), /* disable chip */ - U8X8_END() /* end of sequence */}; + U8X8_END() /* end of sequence */ + + }; uint8_t u8x8_d_ld7032_60x32_alt(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr) { @@ -296,3 +300,83 @@ uint8_t u8x8_d_ld7032_60x32_alt(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void return u8x8_d_ld7032_generic(u8x8, msg, arg_int, arg_ptr); } +/*==========================================*/ +/* + 128x36 Flip Mode is NOT supported + see https://github.com/olikraus/u8g2/issues/2135 +*/ + +static const u8x8_display_info_t u8x8_ld7032_128x36_display_info = +{ + /* chip_enable_level = */ 0, + /* chip_disable_level = */ 1, + + /* post_chip_enable_wait_ns = */ 15, + /* pre_chip_disable_wait_ns = */ 20, + /* reset_pulse_width_ms = */ 100, + /* post_reset_wait_ms = */ 100, + /* sda_setup_time_ns = */ 30, /* 20ns, but cycle time is 60ns, so use 60/2 */ + /* sck_pulse_width_ns = */ 30, /* 20ns, but cycle time is 60ns, so use 60/2 */ + /* sck_clock_hz = */ 4000000UL, /* since Arduino 1.6.0, the SPI bus speed in Hz. Should be 1000000000/sck_pulse_width_ns */ + /* spi_mode = */ 0, /* active high, rising edge */ + /* i2c_bus_clock_100kHz = */ 4, + /* data_setup_time_ns = */ 20, + /* write_pulse_width_ns = */ 40, + /* tile_width = */ 16, + /* tile_height = */ 5, + /* default_x_offset = */ 0, + /* flipmode_x_offset = */ 0, + /* pixel_width = */ 128, + /* pixel_height = */ 36 +}; + +static const uint8_t u8x8_d_ld7032_128x36_init_seq[] = { + + U8X8_START_TRANSFER(), /* enable chip, delay is part of the transfer start */ + + U8X8_CA(0x14, 0x00), // standby mode + U8X8_CA(0x02, 0x00), // display off + U8X8_CA(0x1A, 0x05), // frame frequency + U8X8_CA(0x1D, 0x00), // data write direction (datasheet: 1d 0b + U8X8_CA(0x09, 0x00), // scan direction + U8X8_CAA(0x30, 0x00, 0x7F), // column driver active range + U8X8_CAA(0x32, 0x04, 0x27), // row driver active range + U8X8_CA(0x34, 0x00), // start line + U8X8_CA(0x35, 0x0f), // end line + U8X8_CA(0x36, 0x04), // row start line + U8X8_CA(0x37, 0x27), // row end line + U8X8_CA(0x38, 0x00), // x disp start, default 0 + U8X8_CA(0x39, 0x00), // y disp start, default 0 + U8X8_CA(0x10, 0x1f), // peak pulse width + U8X8_CA(0x16, 0x05), // pulse delay width + U8X8_CA(0x18, 0x1f), // pre charge width + U8X8_CA(0x12, 0x3F), // contrast control + U8X8_CA(0x44, 0x02), // PreC select, default: 2 + //U8X8_CA(0x48, 0x00), // row overlap, default: 0 (was 3) + U8X8_CA(0x17, 0x00), // row scan, default: 0 + U8X8_CA(0x13, 0x01), // scan mode sequence + //U8X8_CA(0x3F, 0x11), // VCC R Selection, default: 0 (int. reg. disabled, vcc_c*0.8) + U8X8_CA(0x3D, 0x01), // vdd selection 0: 2.8V-3.5, 1: 1.8V (1.65-2.5V) + + U8X8_END_TRANSFER(), /* disable chip */ + U8X8_END() /* end of sequence */ + + }; + +uint8_t u8x8_d_ld7032_128x36(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr) +{ + if ( msg == U8X8_MSG_DISPLAY_SETUP_MEMORY ) + { + u8x8_d_helper_display_setup_memory(u8x8, &u8x8_ld7032_128x36_display_info); + return 1; + } + + if ( msg ==U8X8_MSG_DISPLAY_INIT ) + { + u8x8_d_helper_display_init(u8x8); + u8x8_cad_SendSequence(u8x8, u8x8_d_ld7032_128x36_init_seq); + return 1; + } + + return u8x8_d_ld7032_generic(u8x8, msg, arg_int, arg_ptr); +} diff --git a/src/clib/u8x8_d_ls013b7dh03.c b/src/clib/u8x8_d_ls013b7dh03.c index a479d1e9..315585f0 100644 --- a/src/clib/u8x8_d_ls013b7dh03.c +++ b/src/clib/u8x8_d_ls013b7dh03.c @@ -60,7 +60,7 @@ static const u8x8_display_info_t u8x8_ls013b7dh03_128x128_display_info = /* data_setup_time_ns = */ 100, /* write_pulse_width_ns = */ 100, /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -138,7 +138,7 @@ static const u8x8_display_info_t u8x8_ls027b7dh01_400x240_display_info = /* data_setup_time_ns = */ 100, /* write_pulse_width_ns = */ 100, /* tile_width = */ 50, - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 400, @@ -174,7 +174,7 @@ static const u8x8_display_info_t u8x8_ls027b7dh01_m0_400x240_display_info = /* data_setup_time_ns = */ 100, /* write_pulse_width_ns = */ 100, /* tile_width = */ 50, - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 400, @@ -211,7 +211,7 @@ static const u8x8_display_info_t u8x8_ls013b7dh05_144x168_display_info = /* data_setup_time_ns = */ 100, /* write_pulse_width_ns = */ 100, /* tile_width = */ 18, - /* tile_hight = */ 21, + /* tile_height = */ 21, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 144, diff --git a/src/clib/u8x8_d_max7219.c b/src/clib/u8x8_d_max7219.c index ad41f726..0b621534 100644 --- a/src/clib/u8x8_d_max7219.c +++ b/src/clib/u8x8_d_max7219.c @@ -185,7 +185,7 @@ static const u8x8_display_info_t u8x8_max7219_32x8_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 4, - /* tile_hight = */ 1, + /* tile_height = */ 1, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 32, @@ -232,7 +232,7 @@ static const u8x8_display_info_t u8x8_max7219_16x16_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 2, - /* tile_hight = */ 2, + /* tile_height = */ 2, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 16, @@ -287,7 +287,7 @@ static const u8x8_display_info_t u8x8_max7219_8x8_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 1, - /* tile_hight = */ 1, + /* tile_height = */ 1, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 8, @@ -428,7 +428,7 @@ static const u8x8_display_info_t u8x8_max7219_64x8_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 8, - /* tile_hight = */ 1, + /* tile_height = */ 1, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 64, diff --git a/src/clib/u8x8_d_pcd8544_84x48.c b/src/clib/u8x8_d_pcd8544_84x48.c index 7a14dcd9..7da8aa62 100644 --- a/src/clib/u8x8_d_pcd8544_84x48.c +++ b/src/clib/u8x8_d_pcd8544_84x48.c @@ -91,7 +91,7 @@ static const u8x8_display_info_t u8x8_pcd8544_84x48_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 11, /* width of 11*8=88 pixel */ - /* tile_hight = */ 6, + /* tile_height = */ 6, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 84, diff --git a/src/clib/u8x8_d_pcf8812.c b/src/clib/u8x8_d_pcf8812.c index b103a7b4..a0616cee 100644 --- a/src/clib/u8x8_d_pcf8812.c +++ b/src/clib/u8x8_d_pcf8812.c @@ -173,7 +173,7 @@ static const u8x8_display_info_t u8x8_pcf8812_96x65_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 12, - /* tile_hight = */ 9, + /* tile_height = */ 9, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_pcf8814_hx1230.c b/src/clib/u8x8_d_pcf8814_hx1230.c index c2ce3d26..d6658c84 100644 --- a/src/clib/u8x8_d_pcf8814_hx1230.c +++ b/src/clib/u8x8_d_pcf8814_hx1230.c @@ -178,7 +178,7 @@ static const u8x8_display_info_t u8x8_hx1230_96x68_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 12, - /* tile_hight = */ 9, + /* tile_height = */ 9, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_s1d15300.c b/src/clib/u8x8_d_s1d15300.c index 91632980..608aa47b 100644 --- a/src/clib/u8x8_d_s1d15300.c +++ b/src/clib/u8x8_d_s1d15300.c @@ -152,7 +152,7 @@ static const u8x8_display_info_t u8x8_s1d15300_lm6023_display_info = /* data_setup_time_ns = */ 200, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 200, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 4, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_s1d15721.c b/src/clib/u8x8_d_s1d15721.c index c75f604a..dbc428e4 100644 --- a/src/clib/u8x8_d_s1d15721.c +++ b/src/clib/u8x8_d_s1d15721.c @@ -161,7 +161,7 @@ static const u8x8_display_info_t u8x8_s1d15721_240x64_display_info = /* data_setup_time_ns = */ 30, /* */ /* write_pulse_width_ns = */ 65, /* */ /* tile_width = */ 30, /* width of 20*8=160 pixel (30*8 = 240) */ - /* tile_hight = */ 8, /* height 8*8 = 64*/ + /* tile_height = */ 8, /* height 8*8 = 64*/ /* default_x_offset = */ 1, /* flipmode_x_offset = */ 1, /* pixel_width = */ 240, diff --git a/src/clib/u8x8_d_s1d15e06.c b/src/clib/u8x8_d_s1d15e06.c index a8f2b292..5b53925f 100644 --- a/src/clib/u8x8_d_s1d15e06.c +++ b/src/clib/u8x8_d_s1d15e06.c @@ -157,7 +157,7 @@ static const u8x8_display_info_t u8x8_s1d15e06_160100_display_info = /* data_setup_time_ns = */ 30, /* uc1608 datasheet, page 39 */ /* write_pulse_width_ns = */ 65, /* uc1608 datasheet, page 39 */ /* tile_width = */ 20, /* width of 20*8=160 pixel */ - /* tile_hight = */ 13, + /* tile_height = */ 13, /* default_x_offset = */ 0, /* reused as y page offset */ /* flipmode_x_offset = */ 0, /* reused as y page offset */ /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_sbn1661.c b/src/clib/u8x8_d_sbn1661.c index 978ab0df..7ac99f11 100644 --- a/src/clib/u8x8_d_sbn1661.c +++ b/src/clib/u8x8_d_sbn1661.c @@ -128,7 +128,7 @@ static const u8x8_display_info_t u8x8_sbn1661_122x32_display_info = /* data_setup_time_ns = */ 200, /* write_pulse_width_ns = */ 200, /* */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 122, diff --git a/src/clib/u8x8_d_sed1330.c b/src/clib/u8x8_d_sed1330.c index ecda3123..56b8e0c2 100644 --- a/src/clib/u8x8_d_sed1330.c +++ b/src/clib/u8x8_d_sed1330.c @@ -141,7 +141,7 @@ static const u8x8_display_info_t u8x8_sed1330_240x128_display_info = /* data_setup_time_ns = */ 120, /* G242CX Datasheet p5 */ /* write_pulse_width_ns = */ 220, /* G242CX Datasheet p5 */ /* tile_width = */ 0x01e, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -286,7 +286,7 @@ static const u8x8_display_info_t u8x8_sed1330_320x240_display_info = /* data_setup_time_ns = */ 120, /* G242CX Datasheet p5 */ /* write_pulse_width_ns = */ 220, /* G242CX Datasheet p5 */ /* tile_width = */ 40, - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 320, @@ -374,7 +374,7 @@ static const u8x8_display_info_t u8x8_sed1330_256x128_display_info = /* data_setup_time_ns = */ 120, /* G242CX Datasheet p5 */ /* write_pulse_width_ns = */ 220, /* G242CX Datasheet p5 */ /* tile_width = */ 32, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 256, diff --git a/src/clib/u8x8_d_sh1106_64x32.c b/src/clib/u8x8_d_sh1106_64x32.c index ffef9d16..a66ed354 100644 --- a/src/clib/u8x8_d_sh1106_64x32.c +++ b/src/clib/u8x8_d_sh1106_64x32.c @@ -189,7 +189,7 @@ static const u8x8_display_info_t u8x8_sh1106_64x32_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 8, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 32, /* flipmode_x_offset = */ 36, /* pixel_width = */ 64, diff --git a/src/clib/u8x8_d_sh1106_72x40.c b/src/clib/u8x8_d_sh1106_72x40.c index 46d4b2b9..7b8342a5 100644 --- a/src/clib/u8x8_d_sh1106_72x40.c +++ b/src/clib/u8x8_d_sh1106_72x40.c @@ -189,7 +189,7 @@ static const u8x8_display_info_t u8x8_sh1106_72x40_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 9, - /* tile_hight = */ 5, + /* tile_height = */ 5, /* default_x_offset = */ 30, /* flipmode_x_offset = */ 30, /* pixel_width = */ 72, diff --git a/src/clib/u8x8_d_sh1107.c b/src/clib/u8x8_d_sh1107.c index dfe4e933..3e994c3a 100644 --- a/src/clib/u8x8_d_sh1107.c +++ b/src/clib/u8x8_d_sh1107.c @@ -369,7 +369,7 @@ static const u8x8_display_info_t u8x8_sh1107_seeed_96x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* sh1107: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 12, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 96, @@ -515,7 +515,7 @@ static const u8x8_display_info_t u8x8_sh1107_128x128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* sh1107: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 96, /* flipmode_x_offset = */ 96, /* pixel_width = */ 128, @@ -566,7 +566,7 @@ static const u8x8_display_info_t u8x8_sh1107_128x80_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* sh1107: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 10, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 24, /* flipmode_x_offset = */ 24, /* pixel_width = */ 80, @@ -614,7 +614,7 @@ static const u8x8_display_info_t u8x8_sh1107_pimoroni_128x128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* sh1107: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -668,7 +668,7 @@ static const u8x8_display_info_t u8x8_seeed_128x128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* sh1107: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -832,7 +832,7 @@ static const u8x8_display_info_t u8x8_TK078F288_80x128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* sh1107: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 10, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 80, diff --git a/src/clib/u8x8_d_sh1122.c b/src/clib/u8x8_d_sh1122.c index eeaa5083..0cc1beda 100644 --- a/src/clib/u8x8_d_sh1122.c +++ b/src/clib/u8x8_d_sh1122.c @@ -222,7 +222,7 @@ static const u8x8_display_info_t u8x8_sh1122_256x64_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* sh1122: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 32, /* 256 pixel, so we require 32 bytes for this */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 256, diff --git a/src/clib/u8x8_d_ssd1305.c b/src/clib/u8x8_d_ssd1305.c index d5e6f96e..dd1b9061 100644 --- a/src/clib/u8x8_d_ssd1305.c +++ b/src/clib/u8x8_d_ssd1305.c @@ -148,7 +148,7 @@ static const u8x8_display_info_t u8x8_ssd1305_128x32_noname_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 2, /* flipmode_x_offset = */ 2, /* pixel_width = */ 128, @@ -246,7 +246,7 @@ static const u8x8_display_info_t u8x8_ssd1305_128x32_waveshare_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -310,7 +310,7 @@ static const u8x8_display_info_t u8x8_ssd1305_128x32_adafruit_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -375,7 +375,7 @@ static const u8x8_display_info_t u8x8_ssd1305_128x64_adafruit_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 2, /* flipmode_x_offset = */ 2, /* pixel_width = */ 128, @@ -473,7 +473,7 @@ static const u8x8_display_info_t u8x8_ssd1305_128x64_raystar_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1306_128x32.c b/src/clib/u8x8_d_ssd1306_128x32.c index 3141da22..e780b6f8 100644 --- a/src/clib/u8x8_d_ssd1306_128x32.c +++ b/src/clib/u8x8_d_ssd1306_128x32.c @@ -194,7 +194,7 @@ static const u8x8_display_info_t u8x8_ssd1306_128x32_univision_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -234,7 +234,7 @@ static const u8x8_display_info_t u8x8_ssd1306_128x32_winstar_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 125, /* flipmode_x_offset = */ 125, /* pixel_width = */ 128, @@ -297,7 +297,7 @@ static const u8x8_display_info_t u8x8_d_sh1106_128x32_visionox_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 2, /* flipmode_x_offset = */ 2, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1306_128x64_noname.c b/src/clib/u8x8_d_ssd1306_128x64_noname.c index c89439ba..0cbeba8f 100644 --- a/src/clib/u8x8_d_ssd1306_128x64_noname.c +++ b/src/clib/u8x8_d_ssd1306_128x64_noname.c @@ -349,7 +349,7 @@ static const u8x8_display_info_t u8x8_ssd1306_128x64_noname_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -469,7 +469,7 @@ static const u8x8_display_info_t u8x8_sh1106_128x64_noname_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 2, /* flipmode_x_offset = */ 2, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1306_64x32.c b/src/clib/u8x8_d_ssd1306_64x32.c index d4c705f5..88f7f280 100644 --- a/src/clib/u8x8_d_ssd1306_64x32.c +++ b/src/clib/u8x8_d_ssd1306_64x32.c @@ -155,7 +155,7 @@ static const u8x8_display_info_t u8x8_ssd1306_64x32_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 8, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 32, /* flipmode_x_offset = */ 32, /* pixel_width = */ 64, diff --git a/src/clib/u8x8_d_ssd1306_64x48.c b/src/clib/u8x8_d_ssd1306_64x48.c index 4b78fc89..01e09756 100644 --- a/src/clib/u8x8_d_ssd1306_64x48.c +++ b/src/clib/u8x8_d_ssd1306_64x48.c @@ -186,7 +186,7 @@ static const u8x8_display_info_t u8x8_ssd1306_64x48_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 8, - /* tile_hight = */ 6, + /* tile_height = */ 6, /* default_x_offset = */ 32, /* flipmode_x_offset = */ 32, /* pixel_width = */ 64, diff --git a/src/clib/u8x8_d_ssd1306_72x40.c b/src/clib/u8x8_d_ssd1306_72x40.c index 8df4c47d..61ebe150 100644 --- a/src/clib/u8x8_d_ssd1306_72x40.c +++ b/src/clib/u8x8_d_ssd1306_72x40.c @@ -236,7 +236,7 @@ static const u8x8_display_info_t u8x8_ssd1306_72x40_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 9, - /* tile_hight = */ 5, + /* tile_height = */ 5, /* default_x_offset = */ 28, /* flipmode_x_offset = */ 28, /* pixel_width = */ 72, diff --git a/src/clib/u8x8_d_ssd1306_96x16.c b/src/clib/u8x8_d_ssd1306_96x16.c index aaec01e2..c6491ae9 100644 --- a/src/clib/u8x8_d_ssd1306_96x16.c +++ b/src/clib/u8x8_d_ssd1306_96x16.c @@ -186,7 +186,7 @@ static const u8x8_display_info_t u8x8_ssd1306_96x16_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 12, - /* tile_hight = */ 2, + /* tile_height = */ 2, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 32, /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_ssd1306_96x40.c b/src/clib/u8x8_d_ssd1306_96x40.c index 95b1bea0..b46b37b4 100644 --- a/src/clib/u8x8_d_ssd1306_96x40.c +++ b/src/clib/u8x8_d_ssd1306_96x40.c @@ -193,7 +193,7 @@ static const u8x8_display_info_t u8x8_ssd1306_96x40_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 12, - /* tile_hight = */ 5, + /* tile_height = */ 5, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 32, /* pixel_width = */ 96, @@ -288,7 +288,7 @@ static const u8x8_display_info_t u8x8_ssd1306_96x39_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 12, - /* tile_hight = */ 5, + /* tile_height = */ 5, /* default_x_offset = */ 32, /* flipmode_x_offset = */ 0, /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_ssd1309.c b/src/clib/u8x8_d_ssd1309.c index 802531a0..1fc7df41 100644 --- a/src/clib/u8x8_d_ssd1309.c +++ b/src/clib/u8x8_d_ssd1309.c @@ -148,7 +148,7 @@ static const u8x8_display_info_t u8x8_ssd1309_128x64_noname2_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 2, /* flipmode_x_offset = */ 2, /* pixel_width = */ 128, @@ -247,7 +247,7 @@ static const u8x8_display_info_t u8x8_ssd1309_128x64_noname0_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -335,7 +335,7 @@ static const u8x8_display_info_t u8x8_ssd1309_102x64_ea_oleds102_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 13, /* width of 13*8=104 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 13, /* flipmode_x_offset = */ 13, /* pixel_width = */ 102, diff --git a/src/clib/u8x8_d_ssd1316.c b/src/clib/u8x8_d_ssd1316.c index 1067b4f4..ab7b466b 100644 --- a/src/clib/u8x8_d_ssd1316.c +++ b/src/clib/u8x8_d_ssd1316.c @@ -207,7 +207,7 @@ static const u8x8_display_info_t u8x8_ssd1316_128x32_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -302,7 +302,7 @@ static const u8x8_display_info_t u8x8_ssd1316_96x32_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 12, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_ssd1317.c b/src/clib/u8x8_d_ssd1317.c index 8b8e25b3..dd6a7684 100644 --- a/src/clib/u8x8_d_ssd1317.c +++ b/src/clib/u8x8_d_ssd1317.c @@ -212,7 +212,7 @@ static const u8x8_display_info_t u8x8_ssd1317_96x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 12, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 16, /* flipmode_x_offset = */ 16, /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_ssd1318.c b/src/clib/u8x8_d_ssd1318.c index 4eaaa732..2dadd8a8 100644 --- a/src/clib/u8x8_d_ssd1318.c +++ b/src/clib/u8x8_d_ssd1318.c @@ -267,7 +267,7 @@ static const u8x8_display_info_t u8x8_ssd1318_128x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* SSD1306: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1320.c b/src/clib/u8x8_d_ssd1320.c index 999ccce9..9b36905c 100644 --- a/src/clib/u8x8_d_ssd1320.c +++ b/src/clib/u8x8_d_ssd1320.c @@ -320,7 +320,7 @@ static const u8x8_display_info_t u8x8_d_ssd1320_cs1_160x32_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* ssd1320: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 20, /* 160 pixel, so we require 20 bytes for this */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, @@ -435,7 +435,7 @@ static const u8x8_display_info_t u8x8_d_ssd1320_cs1_160x132_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* ssd1320: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 20, /* 160 pixel, so we require 20 bytes for this */ - /* tile_hight = */ 17, + /* tile_height = */ 17, /* default_x_offset = */ 0, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, @@ -645,7 +645,7 @@ static const u8x8_display_info_t u8x8_d_ssd1320_160x80_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* ssd1320: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 20, /* 160 pixel, so we require 20 bytes for this */ - /* tile_hight = */ 10, + /* tile_height = */ 10, /* default_x_offset = */ 0, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_ssd1322.c b/src/clib/u8x8_d_ssd1322.c index f7e174d2..8f31feff 100644 --- a/src/clib/u8x8_d_ssd1322.c +++ b/src/clib/u8x8_d_ssd1322.c @@ -256,7 +256,7 @@ static const u8x8_display_info_t u8x8_ssd1322_256x64_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* SSD1322: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 32, /* 256 pixel, so we require 32 bytes for this */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0x01c, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0x01c, /* pixel_width = */ 256, @@ -353,8 +353,8 @@ static const u8x8_display_info_t u8x8_ssd1322_240x128_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* SSD1322: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 30, /* 256 pixel, so we require 32 bytes for this */ - /* tile_hight = */ 16, - /* default_x_offset = */ 0x000, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ + /* tile_height = */ 16, + /* default_x_offset = */ 24, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0x000, /* pixel_width = */ 240, /* pixel_height = */ 128 @@ -551,7 +551,7 @@ static const u8x8_display_info_t u8x8_ssd1322_128x64_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* SSD1322: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 16, /* 128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 28, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 28, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1325.c b/src/clib/u8x8_d_ssd1325.c index 7d9970b1..9d0ec85b 100644 --- a/src/clib/u8x8_d_ssd1325.c +++ b/src/clib/u8x8_d_ssd1325.c @@ -282,7 +282,7 @@ static const u8x8_display_info_t u8x8_nhd_ssd1325_128x64_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* SSD1325 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* x_offset is used as y offset for the SSD1325 */ /* flipmode_x_offset = */ 8, /* x_offset is used as y offset for the SSD1325 */ /* pixel_width = */ 128, @@ -394,7 +394,7 @@ static const u8x8_display_info_t u8x8_ssd0323_os128064_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* SSD1325 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* x_offset is used as y offset for the SSD1325 */ /* flipmode_x_offset = */ 0, /* x_offset is used as y offset for the SSD1325 */ /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1326.c b/src/clib/u8x8_d_ssd1326.c index 89a4a865..2180d1dd 100644 --- a/src/clib/u8x8_d_ssd1326.c +++ b/src/clib/u8x8_d_ssd1326.c @@ -257,7 +257,7 @@ static const u8x8_display_info_t u8x8_ssd1326_256x32_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* ssd1326 */ /* tile_width = */ 32, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* x_offset is used as y offset for the ssd1326 */ /* flipmode_x_offset = */ 0, /* x_offset is used as y offset for the ssd1326 */ /* pixel_width = */ 256, diff --git a/src/clib/u8x8_d_ssd1327.c b/src/clib/u8x8_d_ssd1327.c index 97178e8d..78163a35 100644 --- a/src/clib/u8x8_d_ssd1327.c +++ b/src/clib/u8x8_d_ssd1327.c @@ -227,7 +227,7 @@ static const u8x8_display_info_t u8x8_ssd1327_winstar_96x64_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* tile_width = */ 12, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 16, /* changed to 16, issue 1050 */ /* flipmode_x_offset = */ 16, /* changed to 16, issue 1050 */ /* pixel_width = */ 96, @@ -355,7 +355,7 @@ static const u8x8_display_info_t u8x8_ssd1327_96x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* tile_width = */ 12, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 16, /* flipmode_x_offset = */ 16, /* pixel_width = */ 96, @@ -479,7 +479,7 @@ static const u8x8_display_info_t u8x8_ssd1327_ea_w128128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -599,7 +599,7 @@ static const u8x8_display_info_t u8x8_ssd1327_128x128_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -924,7 +924,7 @@ static const u8x8_display_info_t u8x8_ssd1327_128x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* tile_width = */ 16, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_ssd1329.c b/src/clib/u8x8_d_ssd1329.c index 39d9a596..4b603b01 100644 --- a/src/clib/u8x8_d_ssd1329.c +++ b/src/clib/u8x8_d_ssd1329.c @@ -278,7 +278,7 @@ static const u8x8_display_info_t u8x8_ssd1329_128x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* ssd1329 */ /* tile_width = */ 16, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* x_offset is used as y offset for the ssd1329 */ /* flipmode_x_offset = */ 0, /* x_offset is used as y offset for the ssd1329 */ /* pixel_width = */ 128, @@ -495,7 +495,7 @@ static const u8x8_display_info_t u8x8_ssd1329_96x96_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 60, /* ssd1329 */ /* tile_width = */ 12, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* x offset for flip mode 0 */ /* flipmode_x_offset = */ 16, /* x offset for flip mode 1 */ /* pixel_width = */ 96, diff --git a/src/clib/u8x8_d_ssd1362.c b/src/clib/u8x8_d_ssd1362.c index 2922f2be..776f3d93 100644 --- a/src/clib/u8x8_d_ssd1362.c +++ b/src/clib/u8x8_d_ssd1362.c @@ -328,7 +328,7 @@ static const u8x8_display_info_t u8x8_ssd1362_256x64_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* ssd1362: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 32, /* 256 pixel, so we require 32 bytes for this */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 256, @@ -442,7 +442,7 @@ static const u8x8_display_info_t u8x8_ssd1362_206x36_display_info = /* data_setup_time_ns = */ 10, /* write_pulse_width_ns = */ 150, /* ssd1362: cycle time is 300ns, so use 300/2 = 150 */ /* tile_width = */ 26, /* 26*8 = 208 */ - /* tile_hight = */ 5, /* 5*8 = 40 */ + /* tile_height = */ 5, /* 5*8 = 40 */ /* default_x_offset = */ 0, /* this is the byte offset (there are two pixel per byte with 4 bit per pixel) */ /* flipmode_x_offset = */ 25, /* pixel_width = */ 206, diff --git a/src/clib/u8x8_d_ssd1606_172x72.c b/src/clib/u8x8_d_ssd1606_172x72.c index d66b403e..34d270bc 100644 --- a/src/clib/u8x8_d_ssd1606_172x72.c +++ b/src/clib/u8x8_d_ssd1606_172x72.c @@ -374,7 +374,7 @@ static const u8x8_display_info_t u8x8_ssd1606_172x72_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 22, /* 22*8 = 176 */ - /* tile_hight = */ 9, /* 9*8 = 72 */ + /* tile_height = */ 9, /* 9*8 = 72 */ /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 172, diff --git a/src/clib/u8x8_d_ssd1607_200x200.c b/src/clib/u8x8_d_ssd1607_200x200.c index 8ab398e1..9d7cc01a 100644 --- a/src/clib/u8x8_d_ssd1607_200x200.c +++ b/src/clib/u8x8_d_ssd1607_200x200.c @@ -80,7 +80,7 @@ static const u8x8_display_info_t u8x8_ssd1607_200x200_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 150, /* tile_width = */ 25, /* 25*8 = 200 */ - /* tile_hight = */ 25, + /* tile_height = */ 25, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 200, diff --git a/src/clib/u8x8_d_st7511.c b/src/clib/u8x8_d_st7511.c index 56fa6808..5c7811a6 100644 --- a/src/clib/u8x8_d_st7511.c +++ b/src/clib/u8x8_d_st7511.c @@ -94,7 +94,7 @@ static const u8x8_display_info_t u8x8_st7511_320x240_display_info = /* data_setup_time_ns = */ 200, /* */ /* write_pulse_width_ns = */ 250, /* ST7511 Datasheet: 500ns */ /* tile_width = */ 40, /* width of 17*8=136 pixel */ - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 160, /* flipmode_x_offset = */ 0, /* pixel_width = */ 320, diff --git a/src/clib/u8x8_d_st75160.c b/src/clib/u8x8_d_st75160.c index a87946be..edd72e16 100644 --- a/src/clib/u8x8_d_st75160.c +++ b/src/clib/u8x8_d_st75160.c @@ -186,7 +186,7 @@ static const u8x8_display_info_t u8x8_st75160_jm16096_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 20, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* x offset in flipmode 0 */ /* flipmode_x_offset = */ 0, /* */ /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_st75256.c b/src/clib/u8x8_d_st75256.c index 4e37d590..e9fc5736 100644 --- a/src/clib/u8x8_d_st75256.c +++ b/src/clib/u8x8_d_st75256.c @@ -251,7 +251,7 @@ static const u8x8_display_info_t u8x8_st75256_256x128_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 32, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* must be 0, because this is checked also for normal mode */ /* flipmode_x_offset = */ 5, /* used as y offset */ /* pixel_width = */ 256, @@ -386,7 +386,7 @@ static const u8x8_display_info_t u8x8_st75256_wo256x128_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 32, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 5, /* must be 0, because this is checked also for normal mode */ /* flipmode_x_offset = */ 0, /* used as y offset */ /* pixel_width = */ 256, @@ -520,7 +520,7 @@ static const u8x8_display_info_t u8x8_st75256_256x64_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 32, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* must be 0, because this is checked also for normal mode */ /* flipmode_x_offset = */ 13, /* used as y offset */ /* pixel_width = */ 256, @@ -654,7 +654,7 @@ static const u8x8_display_info_t u8x8_st75256_172x104_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 22, /* 22=176 */ - /* tile_hight = */ 13, + /* tile_height = */ 13, /* default_x_offset = */ 84, /* */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 172, @@ -845,7 +845,7 @@ static const u8x8_display_info_t u8x8_st75256_240x160_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 30, - /* tile_hight = */ 20, + /* tile_height = */ 20, /* default_x_offset = */ 16, /* x offset in flipmode 0 */ /* flipmode_x_offset = */ 0, /* */ /* pixel_width = */ 240, @@ -1040,7 +1040,7 @@ static const u8x8_display_info_t u8x8_st75256_256x160_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 32, - /* tile_hight = */ 20, + /* tile_height = */ 20, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 1, /* x offset is used as y offset in flipmode */ /* pixel_width = */ 256, @@ -1399,7 +1399,7 @@ static const u8x8_display_info_t u8x8_st75256_256x160_alt_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 32, - /* tile_hight = */ 20, + /* tile_height = */ 20, /* default_x_offset = */ 0, /* x offset in flipmode 0 */ /* flipmode_x_offset = */ 0, /* */ /* pixel_width = */ 256, @@ -1591,7 +1591,7 @@ static const u8x8_display_info_t u8x8_st75256_192x96_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 24, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* */ /* flipmode_x_offset = */ 64, /* pixel_width = */ 192, @@ -1795,7 +1795,7 @@ static const u8x8_display_info_t u8x8_st75256_jlx16080_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 20, - /* tile_hight = */ 10, + /* tile_height = */ 10, /* default_x_offset = */ 0, /* */ /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_st7528.c b/src/clib/u8x8_d_st7528.c index 8541b2e5..e2b90c1f 100644 --- a/src/clib/u8x8_d_st7528.c +++ b/src/clib/u8x8_d_st7528.c @@ -281,7 +281,7 @@ static const u8x8_display_info_t u8x8_st7528_160x100_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 80, /* st7528 */ /* tile_width = */ 20, - /* tile_hight = */ 13, + /* tile_height = */ 13, /* default_x_offset = */ 0, /* x_offset is used as y offset for the ssd1326 */ /* flipmode_x_offset = */ 0, /* x_offset is used as y offset for the ssd1326 */ /* pixel_width = */ 160, @@ -433,7 +433,7 @@ static const u8x8_display_info_t u8x8_st7528_erc16064_display_info = /* data_setup_time_ns = */ 40, /* write_pulse_width_ns = */ 80, /* st7528 */ /* tile_width = */ 20, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* x_offset is used as y offset for the ssd1326 */ /* flipmode_x_offset = */ 0, /* x_offset is used as y offset for the ssd1326 */ /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_st75320.c b/src/clib/u8x8_d_st75320.c index 4b928a75..659fe433 100644 --- a/src/clib/u8x8_d_st75320.c +++ b/src/clib/u8x8_d_st75320.c @@ -242,7 +242,7 @@ static const u8x8_display_info_t u8x8_st75320_jlx320240_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 40, - /* tile_hight = */ 30, + /* tile_height = */ 30, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 320, diff --git a/src/clib/u8x8_d_st7565.c b/src/clib/u8x8_d_st7565.c index 35e3aa9d..cb087d5d 100644 --- a/src/clib/u8x8_d_st7565.c +++ b/src/clib/u8x8_d_st7565.c @@ -105,7 +105,7 @@ static const u8x8_display_info_t u8x8_st7565_128x64_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 4, /* pixel_width = */ 128, @@ -393,7 +393,7 @@ static const u8x8_display_info_t u8x8_st7565_64128n_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -521,7 +521,7 @@ static const u8x8_display_info_t u8x8_st7565_128x32_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -611,7 +611,7 @@ static const u8x8_display_info_t u8x8_st7565_nhd_c12864_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -739,7 +739,7 @@ static const u8x8_display_info_t u8x8_st7565_lm6059_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 1, /* not sure... */ /* flipmode_x_offset = */ 3, /* pixel_width = */ 128, @@ -886,7 +886,7 @@ static const u8x8_display_info_t u8x8_st7565_lx12864_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 1, /* not sure... */ /* flipmode_x_offset = */ 3, /* pixel_width = */ 128, @@ -978,7 +978,7 @@ static const u8x8_display_info_t u8x8_st7565_erc12864_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 4, /* pixel_width = */ 128, @@ -1210,7 +1210,7 @@ static const u8x8_display_info_t u8x8_st7565_dogm132_display_info = /* data_setup_time_ns = */ 40, /* st7565 datasheet, table 24, tds8 */ /* write_pulse_width_ns = */ 80, /* st7565 datasheet, table 24, tcclw */ /* tile_width = */ 17, /* width of 16*8=136 pixel */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 132, diff --git a/src/clib/u8x8_d_st7567.c b/src/clib/u8x8_d_st7567.c index a6701db5..53522c0c 100644 --- a/src/clib/u8x8_d_st7567.c +++ b/src/clib/u8x8_d_st7567.c @@ -111,7 +111,7 @@ static const u8x8_display_info_t u8x8_st7567_132x64_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 17, /* width of 17*8=136 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 132, @@ -252,7 +252,7 @@ static const u8x8_display_info_t u8x8_st7567_jlx12864_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -412,7 +412,7 @@ static const u8x8_display_info_t u8x8_st7567_122x32_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 122, @@ -555,7 +555,7 @@ static const u8x8_display_info_t u8x8_st7567_enh_dg128064_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 4, /* pixel_width = */ 128, @@ -579,7 +579,7 @@ static const u8x8_display_info_t u8x8_st7567_enh_dg128064i_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -756,7 +756,7 @@ static const u8x8_display_info_t u8x8_st7567_64x32_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 8, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 32, /* flipmode_x_offset = */ 32, /* pixel_width = */ 64, @@ -896,7 +896,7 @@ static const u8x8_display_info_t u8x8_st7567_hem6432_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 8, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 36, /* issue 1159 */ /* flipmode_x_offset = */ 32, /* issue 1159 */ /* pixel_width = */ 64, @@ -1040,7 +1040,7 @@ static const u8x8_display_info_t u8x8_st7567_os12864_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 4, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -1189,7 +1189,7 @@ static const u8x8_display_info_t u8x8_st7567_132x32_display_info = /* data_setup_time_ns = */ 40, /* */ /* write_pulse_width_ns = */ 80, /* */ /* tile_width = */ 17, /* width of 17*8=136 pixel */ - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 132, diff --git a/src/clib/u8x8_d_st7571.c b/src/clib/u8x8_d_st7571.c index 9454be1a..ec373ea6 100644 --- a/src/clib/u8x8_d_st7571.c +++ b/src/clib/u8x8_d_st7571.c @@ -235,7 +235,7 @@ static const u8x8_display_info_t u8x8_st7571_128x128_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 16, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -334,7 +334,7 @@ static const u8x8_display_info_t u8x8_st7571_128x96_display_info = /* data_setup_time_ns = */ 15, /* write_pulse_width_ns = */ 70, /* tile_width = */ 16, - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_st7588.c b/src/clib/u8x8_d_st7588.c index dd1d4df8..ef462510 100644 --- a/src/clib/u8x8_d_st7588.c +++ b/src/clib/u8x8_d_st7588.c @@ -166,7 +166,7 @@ static const u8x8_display_info_t u8x8_st7588_128x64_display_info = /* data_setup_time_ns = */ 80, /* write_pulse_width_ns = */ 50, /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* must be 0, because this is checked also for normal mode */ /* flipmode_x_offset = */ 4, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_st7920.c b/src/clib/u8x8_d_st7920.c index 5f7dc67f..8a1d87ac 100644 --- a/src/clib/u8x8_d_st7920.c +++ b/src/clib/u8x8_d_st7920.c @@ -173,7 +173,7 @@ static const u8x8_display_info_t u8x8_st7920_160x32_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 20, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, @@ -215,7 +215,7 @@ static const u8x8_display_info_t u8x8_st7920_192x32_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 24, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 192, @@ -257,7 +257,7 @@ static const u8x8_display_info_t u8x8_st7920_128x64_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -299,7 +299,7 @@ static const u8x8_display_info_t u8x8_st7920_256x32_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 32, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 256, diff --git a/src/clib/u8x8_d_t6963.c b/src/clib/u8x8_d_t6963.c index 6a45f64d..eda6cddf 100644 --- a/src/clib/u8x8_d_t6963.c +++ b/src/clib/u8x8_d_t6963.c @@ -140,7 +140,7 @@ static const u8x8_display_info_t u8x8_t6963_240x128_display_info = /* data_setup_time_ns = */ 80, /* write_pulse_width_ns = */ 80, /* tile_width = */ 30, - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -224,7 +224,7 @@ static const u8x8_display_info_t u8x8_t6963_240x64_display_info = /* data_setup_time_ns = */ 80, /* write_pulse_width_ns = */ 80, /* tile_width = */ 30, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -311,7 +311,7 @@ static const u8x8_display_info_t u8x8_t6963_256x64_display_info = /* data_setup_time_ns = */ 80, /* write_pulse_width_ns = */ 80, /* tile_width = */ 32, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 256, @@ -394,7 +394,7 @@ static const u8x8_display_info_t u8x8_t6963_128x64_display_info = /* data_setup_time_ns = */ 80, /* write_pulse_width_ns = */ 80, /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, @@ -476,7 +476,7 @@ static const u8x8_display_info_t u8x8_t6963_160x80_display_info = /* data_setup_time_ns = */ 80, /* write_pulse_width_ns = */ 80, /* tile_width = */ 20, - /* tile_hight = */ 10, + /* tile_height = */ 10, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_uc1601.c b/src/clib/u8x8_d_uc1601.c index 3d051bc0..94a03f38 100644 --- a/src/clib/u8x8_d_uc1601.c +++ b/src/clib/u8x8_d_uc1601.c @@ -88,7 +88,7 @@ static const u8x8_display_info_t u8x8_uc1601_128x32_display_info = /* data_setup_time_ns = */ 60, /* uc1601 datasheet, page 43 */ /* write_pulse_width_ns = */ 80, /* uc1601 datasheet, page 43 */ /* tile_width = */ 16, - /* tile_hight = */ 4, + /* tile_height = */ 4, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 4, /* pixel_width = */ 128, @@ -228,7 +228,7 @@ static const u8x8_display_info_t u8x8_uc1601_128x64_display_info = /* data_setup_time_ns = */ 60, /* uc1601 datasheet, page 43 */ /* write_pulse_width_ns = */ 80, /* uc1601 datasheet, page 43 */ /* tile_width = */ 16, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 2, /* flipmode_x_offset = */ 4, /* IS THIS CORRECT? */ /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_uc1604.c b/src/clib/u8x8_d_uc1604.c index e7df8f9e..445331df 100644 --- a/src/clib/u8x8_d_uc1604.c +++ b/src/clib/u8x8_d_uc1604.c @@ -172,7 +172,7 @@ static const u8x8_display_info_t u8x8_uc1604_192x64_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 35, /* tile_width = */ 24, /* width of 24*8=192 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* reused as y page offset */ /* flipmode_x_offset = */ 0, /* reused as y page offset */ /* pixel_width = */ 192, diff --git a/src/clib/u8x8_d_uc1608.c b/src/clib/u8x8_d_uc1608.c index 7482062b..f3c90bfd 100644 --- a/src/clib/u8x8_d_uc1608.c +++ b/src/clib/u8x8_d_uc1608.c @@ -165,7 +165,7 @@ static const u8x8_display_info_t u8x8_uc1608_240x64_display_info = /* data_setup_time_ns = */ 30, /* uc1608 datasheet, page 39 */ /* write_pulse_width_ns = */ 35, /* uc1608 datasheet, page 39 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* reused as y page offset */ /* flipmode_x_offset = */ 4, /* reused as y page offset */ /* pixel_width = */ 240, @@ -246,7 +246,7 @@ static const u8x8_display_info_t u8x8_uc1608_240x128_display_info = /* data_setup_time_ns = */ 30, /* uc1608 datasheet, page 39 */ /* write_pulse_width_ns = */ 35, /* uc1608 datasheet, page 39 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* reused as y page offset */ /* flipmode_x_offset = */ 0, /* reused as y page offset */ /* pixel_width = */ 240, @@ -327,7 +327,7 @@ static const u8x8_display_info_t u8x8_uc1608_erc240120_display_info = /* data_setup_time_ns = */ 30, /* uc1608 datasheet, page 39 */ /* write_pulse_width_ns = */ 35, /* uc1608 datasheet, page 39 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 15, + /* tile_height = */ 15, /* default_x_offset = */ 1, /* reused as y page offset */ /* flipmode_x_offset = */ 0, /* reused as y page offset */ /* pixel_width = */ 240, @@ -411,7 +411,7 @@ static const u8x8_display_info_t u8x8_uc1608_dem240064_display_info = /* data_setup_time_ns = */ 30, /* uc1608 datasheet, page 39 */ /* write_pulse_width_ns = */ 35, /* uc1608 datasheet, page 39 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 1, /* reused as y page offset */ /* flipmode_x_offset = */ 0, /* reused as y page offset */ /* pixel_width = */ 240, diff --git a/src/clib/u8x8_d_uc1609.c b/src/clib/u8x8_d_uc1609.c index 2db1637b..ce89ffda 100644 --- a/src/clib/u8x8_d_uc1609.c +++ b/src/clib/u8x8_d_uc1609.c @@ -131,7 +131,7 @@ static const u8x8_display_info_t u8x8_uc1609_19264_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 24, - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 192, diff --git a/src/clib/u8x8_d_uc1610.c b/src/clib/u8x8_d_uc1610.c index 1ae472ee..e4c5f478 100644 --- a/src/clib/u8x8_d_uc1610.c +++ b/src/clib/u8x8_d_uc1610.c @@ -158,7 +158,7 @@ static const u8x8_display_info_t u8x8_uc1610_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 20, - /* tile_hight = */ 13, /* height of 13*8=104 pixel */ + /* tile_height = */ 13, /* height of 13*8=104 pixel */ /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, diff --git a/src/clib/u8x8_d_uc1611.c b/src/clib/u8x8_d_uc1611.c index 152283c2..e992ec08 100644 --- a/src/clib/u8x8_d_uc1611.c +++ b/src/clib/u8x8_d_uc1611.c @@ -162,7 +162,7 @@ static const u8x8_display_info_t u8x8_uc1611_240x64_display_info = /* data_setup_time_ns = */ 30, /* uc1611 datasheet, page 60 */ /* write_pulse_width_ns = */ 80, /* uc1611 datasheet, page 60 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -280,7 +280,7 @@ static const u8x8_display_info_t u8x8_uc1611_240x128_display_info = /* data_setup_time_ns = */ 30, /* uc1611 datasheet, page 60 */ /* write_pulse_width_ns = */ 80, /* uc1611 datasheet, page 60 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -373,7 +373,7 @@ static const u8x8_display_info_t u8x8_uc1611_ew50850_display_info = /* data_setup_time_ns = */ 30, /* uc1611 datasheet, page 60 */ /* write_pulse_width_ns = */ 80, /* uc1611 datasheet, page 60 */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 20, /* height: 160 pixel */ + /* tile_height = */ 20, /* height: 160 pixel */ /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 240, @@ -530,7 +530,7 @@ static const u8x8_display_info_t u8x8_uc1611_cg160160_display_info = /* data_setup_time_ns = */ 30, /* uc1611 datasheet, page 60 */ /* write_pulse_width_ns = */ 80, /* uc1611 datasheet, page 60 */ /* tile_width = */ 20, /* width of 20*8=160 pixel */ - /* tile_hight = */ 20, + /* tile_height = */ 20, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 160, @@ -680,7 +680,7 @@ static const u8x8_display_info_t u8x8_uc1611_256x128_display_info = /* data_setup_time_ns = */ 30, /* uc1611 datasheet, page 60 */ /* write_pulse_width_ns = */ 80, /* uc1611 datasheet, page 60 */ /* tile_width = */ 32, /* width of 32*8=256 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 256, diff --git a/src/clib/u8x8_d_uc1617.c b/src/clib/u8x8_d_uc1617.c index 7db4f9b1..535ab500 100644 --- a/src/clib/u8x8_d_uc1617.c +++ b/src/clib/u8x8_d_uc1617.c @@ -294,7 +294,7 @@ static const u8x8_display_info_t u8x8_uc1617_128x128_display_info = /* data_setup_time_ns = */ 30, /* uc1617 datasheet, page 52 */ /* write_pulse_width_ns = */ 65, /* uc1617 datasheet, page 52 */ /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 0, /* pixel_width = */ 128, diff --git a/src/clib/u8x8_d_uc1638.c b/src/clib/u8x8_d_uc1638.c index a1bd6a80..41057dcc 100644 --- a/src/clib/u8x8_d_uc1638.c +++ b/src/clib/u8x8_d_uc1638.c @@ -175,7 +175,7 @@ static const u8x8_display_info_t u8x8_uc1638_160x128_display_info = /* data_setup_time_ns = */ 30, /* */ /* write_pulse_width_ns = */ 35, /* */ /* tile_width = */ 20, /* width of 20*8=160 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0, /* lower nibble: x offset, upper nibble: y offset */ /* flipmode_x_offset = */ 0, /* lower nibble: x offset, upper nibble: y offset */ /* pixel_width = */ 160, @@ -252,7 +252,7 @@ static const u8x8_display_info_t u8x8_uc1638_192x96_display_info = /* data_setup_time_ns = */ 30, /* */ /* write_pulse_width_ns = */ 35, /* */ /* tile_width = */ 24, /* width of 24*8=192 pixel */ - /* tile_hight = */ 12, + /* tile_height = */ 12, /* default_x_offset = */ 8*16+0, /* lower nibble: x offset, upper nibble: y offset */ /* flipmode_x_offset = */ 0*16+6, /* lower nibble: x offset, upper nibble: y offset */ /* pixel_width = */ 192, @@ -325,7 +325,7 @@ static const u8x8_display_info_t u8x8_uc1638_240x128_display_info = /* data_setup_time_ns = */ 30, /* */ /* write_pulse_width_ns = */ 35, /* */ /* tile_width = */ 30, /* width of 30*8=240 pixel */ - /* tile_hight = */ 16, + /* tile_height = */ 16, /* default_x_offset = */ 0*16+0, /* lower nibble: x offset, upper nibble: y offset */ /* flipmode_x_offset = */ 4*16+0, /* lower nibble: x offset, upper nibble: y offset */ /* pixel_width = */ 240, diff --git a/src/clib/u8x8_d_uc1701_dogs102.c b/src/clib/u8x8_d_uc1701_dogs102.c index 7d0fc3e4..6151b54f 100644 --- a/src/clib/u8x8_d_uc1701_dogs102.c +++ b/src/clib/u8x8_d_uc1701_dogs102.c @@ -117,7 +117,7 @@ static const u8x8_display_info_t u8x8_uc1701_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 13, /* width of 13*8=104 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 30, /* pixel_width = */ 102, diff --git a/src/clib/u8x8_d_uc1701_mini12864.c b/src/clib/u8x8_d_uc1701_mini12864.c index 2fd53d4d..6fcdd8fa 100644 --- a/src/clib/u8x8_d_uc1701_mini12864.c +++ b/src/clib/u8x8_d_uc1701_mini12864.c @@ -117,7 +117,7 @@ static const u8x8_display_info_t u8x8_uc1701_display_info = /* data_setup_time_ns = */ 30, /* write_pulse_width_ns = */ 40, /* tile_width = */ 16, /* width of 16*8=128 pixel */ - /* tile_hight = */ 8, + /* tile_height = */ 8, /* default_x_offset = */ 0, /* flipmode_x_offset = */ 4, /* pixel_width = */ 128,