From b127da81c8e717fb09d4fbd9ec298479f2cf082e Mon Sep 17 00:00:00 2001 From: kraus Date: Thu, 14 Mar 2024 22:03:42 +0100 Subject: [PATCH] 2.35.13 --- cppsrc/U8g2lib.h | 180 ++++++++++++++++----------------- cppsrc/U8x8lib.h | 60 +++++------ csrc/u8g2.h | 18 ++-- csrc/u8g2_d_memory.c | 12 +-- csrc/u8g2_d_setup.c | 36 +++---- csrc/u8x8_d_s1d15300.c | 12 ++- tools/release/print_release.sh | 2 +- 7 files changed, 163 insertions(+), 157 deletions(-) diff --git a/cppsrc/U8g2lib.h b/cppsrc/U8g2lib.h index 8e66dd8d..5004cfc7 100644 --- a/cppsrc/U8g2lib.h +++ b/cppsrc/U8g2lib.h @@ -25422,183 +25422,183 @@ class U8G2_S1D15300_LM6023_F_8080 : public U8G2 { u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33_1_4W_SW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_1(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_1_4W_SW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_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_S1D15300_100X33_1_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_1_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { - u8g2_Setup_s1d15300_100x33_1(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_1_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_1_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_s1d15300_100x32_1(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8G2_S1D15300_100X33_1_2ND_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_1(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_1_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_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_S1D15300_100X33_1_6800 : public U8G2 { - public: U8G2_S1D15300_100X33_1_6800(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_s1d15300_100x33_1(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_1_6800 : public U8G2 { + public: U8G2_S1D15300_100X32_1_6800(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_s1d15300_100x32_1(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33_1_8080 : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_1(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_1_8080 : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_1(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_1_4W_SW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_1(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_1_4W_SW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_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_S1D15300_100X33I_1_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_1_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { - u8g2_Setup_s1d15300_100x33i_1(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_1_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_1_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_s1d15300_100x32i_1(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_1_2ND_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_1(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_1_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_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_S1D15300_100X33I_1_6800 : public U8G2 { - public: U8G2_S1D15300_100X33I_1_6800(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_s1d15300_100x33i_1(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_1_6800 : public U8G2 { + public: U8G2_S1D15300_100X32I_1_6800(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_s1d15300_100x32i_1(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_1_8080 : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_1(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_1_8080 : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_1(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33_2_4W_SW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_2(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_2_4W_SW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_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_S1D15300_100X33_2_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_2_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { - u8g2_Setup_s1d15300_100x33_2(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_2_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_2_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_s1d15300_100x32_2(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8G2_S1D15300_100X33_2_2ND_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_2(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_2_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_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_S1D15300_100X33_2_6800 : public U8G2 { - public: U8G2_S1D15300_100X33_2_6800(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_s1d15300_100x33_2(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_2_6800 : public U8G2 { + public: U8G2_S1D15300_100X32_2_6800(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_s1d15300_100x32_2(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33_2_8080 : public U8G2 { - public: U8G2_S1D15300_100X33_2_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_s1d15300_100x33_2(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_2_8080 : public U8G2 { + public: U8G2_S1D15300_100X32_2_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_s1d15300_100x32_2(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_2_4W_SW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_2(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_2_4W_SW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_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_S1D15300_100X33I_2_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_2_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { - u8g2_Setup_s1d15300_100x33i_2(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_2_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_2_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_s1d15300_100x32i_2(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_2_2ND_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_2(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_2_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_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_S1D15300_100X33I_2_6800 : public U8G2 { - public: U8G2_S1D15300_100X33I_2_6800(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_s1d15300_100x33i_2(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_2_6800 : public U8G2 { + public: U8G2_S1D15300_100X32I_2_6800(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_s1d15300_100x32i_2(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_2_8080 : public U8G2 { - public: U8G2_S1D15300_100X33I_2_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_s1d15300_100x33i_2(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_2_8080 : public U8G2 { + public: U8G2_S1D15300_100X32I_2_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_s1d15300_100x32i_2(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33_F_4W_SW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_f(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_F_4W_SW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_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_S1D15300_100X33_F_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_F_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { - u8g2_Setup_s1d15300_100x33_f(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_F_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_F_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_s1d15300_100x32_f(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8G2_S1D15300_100X33_F_2ND_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33_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_s1d15300_100x33_f(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_F_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32_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_s1d15300_100x32_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_S1D15300_100X33_F_6800 : public U8G2 { - public: U8G2_S1D15300_100X33_F_6800(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_s1d15300_100x33_f(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_F_6800 : public U8G2 { + public: U8G2_S1D15300_100X32_F_6800(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_s1d15300_100x32_f(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33_F_8080 : public U8G2 { - public: U8G2_S1D15300_100X33_F_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_s1d15300_100x33_f(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32_F_8080 : public U8G2 { + public: U8G2_S1D15300_100X32_F_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_s1d15300_100x32_f(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_F_4W_SW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_f(&u8g2, rotation, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_F_4W_SW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_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_S1D15300_100X33I_F_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_F_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { - u8g2_Setup_s1d15300_100x33i_f(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_F_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_F_4W_HW_SPI(const u8g2_cb_t *rotation, uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8G2() { + u8g2_Setup_s1d15300_100x32i_f(&u8g2, rotation, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_F_2ND_4W_HW_SPI : public U8G2 { - public: U8G2_S1D15300_100X33I_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_s1d15300_100x33i_f(&u8g2, rotation, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_F_2ND_4W_HW_SPI : public U8G2 { + public: U8G2_S1D15300_100X32I_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_s1d15300_100x32i_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_S1D15300_100X33I_F_6800 : public U8G2 { - public: U8G2_S1D15300_100X33I_F_6800(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_s1d15300_100x33i_f(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_F_6800 : public U8G2 { + public: U8G2_S1D15300_100X32I_F_6800(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_s1d15300_100x32i_f(&u8g2, rotation, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8G2_S1D15300_100X33I_F_8080 : public U8G2 { - public: U8G2_S1D15300_100X33I_F_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_s1d15300_100x33i_f(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8G2_S1D15300_100X32I_F_8080 : public U8G2 { + public: U8G2_S1D15300_100X32I_F_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_s1d15300_100x32i_f(&u8g2, rotation, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; diff --git a/cppsrc/U8x8lib.h b/cppsrc/U8x8lib.h index 162ff654..2189dd9a 100644 --- a/cppsrc/U8x8lib.h +++ b/cppsrc/U8x8lib.h @@ -8745,63 +8745,63 @@ class U8X8_S1D15300_LM6023_8080 : public U8X8 { u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8X8_S1D15300_100X33_4W_SW_SPI : public U8X8 { - public: U8X8_S1D15300_100X33_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_s1d15300_100x33, u8x8_cad_011, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32_4W_SW_SPI : public U8X8 { + public: U8X8_S1D15300_100X32_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_s1d15300_100x32, 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_S1D15300_100X33_4W_HW_SPI : public U8X8 { - public: U8X8_S1D15300_100X33_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { - u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x33, u8x8_cad_011, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32_4W_HW_SPI : public U8X8 { + public: U8X8_S1D15300_100X32_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x32, u8x8_cad_011, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8X8_S1D15300_100X33_2ND_4W_HW_SPI : public U8X8 { - public: U8X8_S1D15300_100X33_2ND_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { - u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x33, u8x8_cad_011, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32_2ND_4W_HW_SPI : public U8X8 { + public: U8X8_S1D15300_100X32_2ND_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x32, 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_S1D15300_100X33_6800 : public U8X8 { - public: U8X8_S1D15300_100X33_6800(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_s1d15300_100x33, u8x8_cad_011, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32_6800 : public U8X8 { + public: U8X8_S1D15300_100X32_6800(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_s1d15300_100x32, u8x8_cad_011, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8X8_S1D15300_100X33_8080 : public U8X8 { - public: U8X8_S1D15300_100X33_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_s1d15300_100x33, u8x8_cad_011, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32_8080 : public U8X8 { + public: U8X8_S1D15300_100X32_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_s1d15300_100x32, u8x8_cad_011, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8X8_S1D15300_100X33I_4W_SW_SPI : public U8X8 { - public: U8X8_S1D15300_100X33I_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_s1d15300_100x33i, u8x8_cad_011, u8x8_byte_arduino_4wire_sw_spi, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32I_4W_SW_SPI : public U8X8 { + public: U8X8_S1D15300_100X32I_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_s1d15300_100x32i, 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_S1D15300_100X33I_4W_HW_SPI : public U8X8 { - public: U8X8_S1D15300_100X33I_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { - u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x33i, u8x8_cad_011, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32I_4W_HW_SPI : public U8X8 { + public: U8X8_S1D15300_100X32I_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x32i, u8x8_cad_011, u8x8_byte_arduino_hw_spi, u8x8_gpio_and_delay_arduino); u8x8_SetPin_4Wire_HW_SPI(getU8x8(), cs, dc, reset); } }; -class U8X8_S1D15300_100X33I_2ND_4W_HW_SPI : public U8X8 { - public: U8X8_S1D15300_100X33I_2ND_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { - u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x33i, u8x8_cad_011, u8x8_byte_arduino_2nd_hw_spi, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32I_2ND_4W_HW_SPI : public U8X8 { + public: U8X8_S1D15300_100X32I_2ND_4W_HW_SPI(uint8_t cs, uint8_t dc, uint8_t reset = U8X8_PIN_NONE) : U8X8() { + u8x8_Setup(getU8x8(), u8x8_d_s1d15300_100x32i, 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_S1D15300_100X33I_6800 : public U8X8 { - public: U8X8_S1D15300_100X33I_6800(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_s1d15300_100x33i, u8x8_cad_011, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32I_6800 : public U8X8 { + public: U8X8_S1D15300_100X32I_6800(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_s1d15300_100x32i, u8x8_cad_011, u8x8_byte_8bit_6800mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_6800(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; -class U8X8_S1D15300_100X33I_8080 : public U8X8 { - public: U8X8_S1D15300_100X33I_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_s1d15300_100x33i, u8x8_cad_011, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); +class U8X8_S1D15300_100X32I_8080 : public U8X8 { + public: U8X8_S1D15300_100X32I_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_s1d15300_100x32i, u8x8_cad_011, u8x8_byte_arduino_8bit_8080mode, u8x8_gpio_and_delay_arduino); u8x8_SetPin_8Bit_8080(getU8x8(), d0, d1, d2, d3, d4, d5, d6, d7, enable, cs, dc, reset); } }; diff --git a/csrc/u8g2.h b/csrc/u8g2.h index 1c1199cd..a12c189a 100644 --- a/csrc/u8g2.h +++ b/csrc/u8g2.h @@ -648,9 +648,9 @@ uint8_t *u8g2_m_4_1_f(uint8_t *page_cnt); uint8_t *u8g2_m_1_1_1(uint8_t *page_cnt); uint8_t *u8g2_m_1_1_2(uint8_t *page_cnt); uint8_t *u8g2_m_1_1_f(uint8_t *page_cnt); -uint8_t *u8g2_m_13_5_1(uint8_t *page_cnt); -uint8_t *u8g2_m_13_5_2(uint8_t *page_cnt); -uint8_t *u8g2_m_13_5_f(uint8_t *page_cnt); +uint8_t *u8g2_m_13_4_1(uint8_t *page_cnt); +uint8_t *u8g2_m_13_4_2(uint8_t *page_cnt); +uint8_t *u8g2_m_13_4_f(uint8_t *page_cnt); uint8_t *u8g2_m_20_2_1(uint8_t *page_cnt); uint8_t *u8g2_m_20_2_2(uint8_t *page_cnt); uint8_t *u8g2_m_20_2_f(uint8_t *page_cnt); @@ -1592,12 +1592,12 @@ void u8g2_Setup_max7219_8x8_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_ void u8g2_Setup_s1d15300_lm6023_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_s1d15300_lm6023_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_s1d15300_lm6023_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); -void u8g2_Setup_s1d15300_100x33_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); -void u8g2_Setup_s1d15300_100x33i_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); -void u8g2_Setup_s1d15300_100x33_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); -void u8g2_Setup_s1d15300_100x33i_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); -void u8g2_Setup_s1d15300_100x33_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); -void u8g2_Setup_s1d15300_100x33i_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_s1d15300_100x32_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_s1d15300_100x32i_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_s1d15300_100x32_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_s1d15300_100x32i_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_s1d15300_100x32_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); +void u8g2_Setup_s1d15300_100x32i_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_s1d15e06_160100_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_s1d15e06_160100_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); void u8g2_Setup_s1d15e06_160100_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb); diff --git a/csrc/u8g2_d_memory.c b/csrc/u8g2_d_memory.c index 8bfad7b8..f197bf8e 100644 --- a/csrc/u8g2_d_memory.c +++ b/csrc/u8g2_d_memory.c @@ -1983,7 +1983,7 @@ uint8_t *u8g2_m_1_1_f(uint8_t *page_cnt) return buf; #endif } -uint8_t *u8g2_m_13_5_1(uint8_t *page_cnt) +uint8_t *u8g2_m_13_4_1(uint8_t *page_cnt) { #ifdef U8G2_USE_DYNAMIC_ALLOC *page_cnt = 1; @@ -1994,7 +1994,7 @@ uint8_t *u8g2_m_13_5_1(uint8_t *page_cnt) return buf; #endif } -uint8_t *u8g2_m_13_5_2(uint8_t *page_cnt) +uint8_t *u8g2_m_13_4_2(uint8_t *page_cnt) { #ifdef U8G2_USE_DYNAMIC_ALLOC *page_cnt = 2; @@ -2005,14 +2005,14 @@ uint8_t *u8g2_m_13_5_2(uint8_t *page_cnt) return buf; #endif } -uint8_t *u8g2_m_13_5_f(uint8_t *page_cnt) +uint8_t *u8g2_m_13_4_f(uint8_t *page_cnt) { #ifdef U8G2_USE_DYNAMIC_ALLOC - *page_cnt = 5; + *page_cnt = 4; return 0; #else - static uint8_t buf[520]; - *page_cnt = 5; + static uint8_t buf[416]; + *page_cnt = 4; return buf; #endif } diff --git a/csrc/u8g2_d_setup.c b/csrc/u8g2_d_setup.c index 6b311c6f..7c185543 100644 --- a/csrc/u8g2_d_setup.c +++ b/csrc/u8g2_d_setup.c @@ -8357,54 +8357,54 @@ void u8g2_Setup_s1d15300_lm6023_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_ } /* s1d15300 */ /* s1d15300 1 */ -void u8g2_Setup_s1d15300_100x33_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +void u8g2_Setup_s1d15300_100x32_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_s1d15300_100x33, u8x8_cad_011, byte_cb, gpio_and_delay_cb); - buf = u8g2_m_13_5_1(&tile_buf_height); + u8g2_SetupDisplay(u8g2, u8x8_d_s1d15300_100x32, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_13_4_1(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation); } -void u8g2_Setup_s1d15300_100x33i_1(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +void u8g2_Setup_s1d15300_100x32i_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_s1d15300_100x33i, u8x8_cad_011, byte_cb, gpio_and_delay_cb); - buf = u8g2_m_13_5_1(&tile_buf_height); + u8g2_SetupDisplay(u8g2, u8x8_d_s1d15300_100x32i, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_13_4_1(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation); } /* s1d15300 2 */ -void u8g2_Setup_s1d15300_100x33_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +void u8g2_Setup_s1d15300_100x32_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_s1d15300_100x33, u8x8_cad_011, byte_cb, gpio_and_delay_cb); - buf = u8g2_m_13_5_2(&tile_buf_height); + u8g2_SetupDisplay(u8g2, u8x8_d_s1d15300_100x32, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_13_4_2(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation); } -void u8g2_Setup_s1d15300_100x33i_2(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +void u8g2_Setup_s1d15300_100x32i_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_s1d15300_100x33i, u8x8_cad_011, byte_cb, gpio_and_delay_cb); - buf = u8g2_m_13_5_2(&tile_buf_height); + u8g2_SetupDisplay(u8g2, u8x8_d_s1d15300_100x32i, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_13_4_2(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation); } /* s1d15300 f */ -void u8g2_Setup_s1d15300_100x33_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +void u8g2_Setup_s1d15300_100x32_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_s1d15300_100x33, u8x8_cad_011, byte_cb, gpio_and_delay_cb); - buf = u8g2_m_13_5_f(&tile_buf_height); + u8g2_SetupDisplay(u8g2, u8x8_d_s1d15300_100x32, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_13_4_f(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation); } -void u8g2_Setup_s1d15300_100x33i_f(u8g2_t *u8g2, const u8g2_cb_t *rotation, u8x8_msg_cb byte_cb, u8x8_msg_cb gpio_and_delay_cb) +void u8g2_Setup_s1d15300_100x32i_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_s1d15300_100x33i, u8x8_cad_011, byte_cb, gpio_and_delay_cb); - buf = u8g2_m_13_5_f(&tile_buf_height); + u8g2_SetupDisplay(u8g2, u8x8_d_s1d15300_100x32i, u8x8_cad_011, byte_cb, gpio_and_delay_cb); + buf = u8g2_m_13_4_f(&tile_buf_height); u8g2_SetupBuffer(u8g2, buf, tile_buf_height, u8g2_ll_hvline_vertical_top_lsb, rotation); } /* s1d15e06 */ diff --git a/csrc/u8x8_d_s1d15300.c b/csrc/u8x8_d_s1d15300.c index 9bf58872..b932943f 100644 --- a/csrc/u8x8_d_s1d15300.c +++ b/csrc/u8x8_d_s1d15300.c @@ -346,7 +346,9 @@ uint8_t u8x8_d_s1d15300_100x32(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void u8x8_d_helper_display_init(u8x8); u8x8_cad_SendSequence(u8x8, u8x8_d_s1d15300_100x32_init_seq); break; - case U8X8_MSG_DISPLAY_SET_FLIP_MODE: + case U8X8_MSG_DISPLAY_SET_FLIP_MODE: + /* needs to be fixed regarding a0/c0 */ + /* if ( arg_int == 0 ) { u8x8_cad_SendSequence(u8x8, u8x8_d_s1d15300_flip0_seq); @@ -356,7 +358,8 @@ uint8_t u8x8_d_s1d15300_100x32(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void { u8x8_cad_SendSequence(u8x8, u8x8_d_s1d15300_flip1_seq); u8x8->x_offset = u8x8->display_info->flipmode_x_offset; - } + } + */ break; default: return 0; /* msg unknown */ @@ -381,6 +384,8 @@ uint8_t u8x8_d_s1d15300_100x32i(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void u8x8_cad_SendSequence(u8x8, u8x8_d_s1d15300_100x32_init_seq); break; case U8X8_MSG_DISPLAY_SET_FLIP_MODE: + /* needs to be fixed regarding a0/c0 */ + /* if ( arg_int == 0 ) { u8x8_cad_SendSequence(u8x8, u8x8_d_s1d15300_flip0_seq); @@ -390,7 +395,8 @@ uint8_t u8x8_d_s1d15300_100x32i(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void { u8x8_cad_SendSequence(u8x8, u8x8_d_s1d15300_flip1_seq); u8x8->x_offset = u8x8->display_info->flipmode_x_offset; - } + } + */ break; default: return 0; /* msg unknown */ diff --git a/tools/release/print_release.sh b/tools/release/print_release.sh index 1a929e47..715c74ac 100755 --- a/tools/release/print_release.sh +++ b/tools/release/print_release.sh @@ -1,2 +1,2 @@ # without 'v' prefix -echo -n "2.35.12" +echo -n "2.35.13"