Delay U8glib init using U8glib-HAL 0.4.4 (#21496)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
parent
ecd5ae890f
commit
7124326808
|
@ -30,12 +30,15 @@ extern u8g_dev_t u8g_dev_st7565_64128n_HAL_2x_hw_spi;
|
||||||
|
|
||||||
class U8GLIB_64128N_2X_HAL : public U8GLIB {
|
class U8GLIB_64128N_2X_HAL : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_64128N_2X_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
|
U8GLIB_64128N_2X_HAL() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_st7565_64128n_HAL_2x_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset)
|
U8GLIB_64128N_2X_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) { init(sck, mosi, cs, a0, reset); }
|
||||||
{ }
|
U8GLIB_64128N_2X_HAL(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) { init(cs, a0, reset); }
|
||||||
U8GLIB_64128N_2X_HAL(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
|
void init(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) {
|
||||||
: U8GLIB(&u8g_dev_st7565_64128n_HAL_2x_hw_spi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset)
|
U8GLIB::init(&u8g_dev_st7565_64128n_HAL_2x_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset);
|
||||||
{ }
|
}
|
||||||
|
void init(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) {
|
||||||
|
U8GLIB::init(&u8g_dev_st7565_64128n_HAL_2x_hw_spi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
extern u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_sw_spi;
|
extern u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_sw_spi;
|
||||||
|
@ -43,12 +46,15 @@ extern u8g_dev_t u8g_dev_st7920_128x64_HAL_4x_hw_spi;
|
||||||
|
|
||||||
class U8GLIB_ST7920_128X64_4X_HAL : public U8GLIB {
|
class U8GLIB_ST7920_128X64_4X_HAL : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_ST7920_128X64_4X_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE)
|
U8GLIB_ST7920_128X64_4X_HAL() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_st7920_128x64_HAL_4x_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, U8G_PIN_NONE, (uint8_t)reset) // a0 = U8G_PIN_NONE
|
U8GLIB_ST7920_128X64_4X_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE) { init(sck, mosi, cs, reset); }
|
||||||
{ }
|
U8GLIB_ST7920_128X64_4X_HAL(pin_t cs, pin_t reset = U8G_PIN_NONE) { init(cs, reset); }
|
||||||
U8GLIB_ST7920_128X64_4X_HAL(pin_t cs, pin_t reset = U8G_PIN_NONE)
|
void init(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE) {
|
||||||
: U8GLIB(&u8g_dev_st7920_128x64_HAL_4x_hw_spi, (uint8_t)cs, U8G_PIN_NONE, (uint8_t)reset) // a0 = U8G_PIN_NONE
|
U8GLIB::init(&u8g_dev_st7920_128x64_HAL_4x_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, U8G_PIN_NONE, (uint8_t)reset); // a0 = U8G_PIN_NONE
|
||||||
{ }
|
}
|
||||||
|
void init(pin_t cs, pin_t reset = U8G_PIN_NONE) {
|
||||||
|
U8GLIB::init(&u8g_dev_st7920_128x64_HAL_4x_hw_spi, (uint8_t)cs, U8G_PIN_NONE, (uint8_t)reset); // a0 = U8G_PIN_NONE
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -59,27 +65,29 @@ extern u8g_dev_t u8g_dev_st7920_128x64_rrd_sw_spi;
|
||||||
|
|
||||||
class U8GLIB_ST7920_128X64_RRD : public U8GLIB {
|
class U8GLIB_ST7920_128X64_RRD : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_ST7920_128X64_RRD(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE)
|
U8GLIB_ST7920_128X64_RRD() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, U8G_PIN_NONE, (uint8_t)reset) // a0 = U8G_PIN_NONE
|
U8GLIB_ST7920_128X64_RRD(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE) { init(sck, mosi, cs, reset); }
|
||||||
{ }
|
void init(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE) {
|
||||||
|
U8GLIB::init(&u8g_dev_st7920_128x64_rrd_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, U8G_PIN_NONE, (uint8_t)reset); // a0 = U8G_PIN_NONE
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
extern u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire;
|
extern u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire;
|
||||||
|
|
||||||
class U8GLIB_SH1106_128X64_2X_I2C_2_WIRE : public U8GLIB {
|
class U8GLIB_SH1106_128X64_2X_I2C_2_WIRE : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_SH1106_128X64_2X_I2C_2_WIRE(uint8_t options = U8G_I2C_OPT_NONE)
|
U8GLIB_SH1106_128X64_2X_I2C_2_WIRE() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_sh1106_128x64_2x_i2c_2_wire, options)
|
U8GLIB_SH1106_128X64_2X_I2C_2_WIRE(uint8_t options) { init(options); }
|
||||||
{ }
|
void init(uint8_t options = U8G_I2C_OPT_NONE) { U8GLIB::init(&u8g_dev_sh1106_128x64_2x_i2c_2_wire, options); }
|
||||||
};
|
};
|
||||||
|
|
||||||
extern u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire;
|
extern u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire;
|
||||||
|
|
||||||
class U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE : public U8GLIB {
|
class U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE(uint8_t options = U8G_I2C_OPT_NONE)
|
U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_ssd1306_128x64_2x_i2c_2_wire, options)
|
U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE(uint8_t options) { init(options); }
|
||||||
{ }
|
void init(uint8_t options = U8G_I2C_OPT_NONE) { U8GLIB::init(&u8g_dev_ssd1306_128x64_2x_i2c_2_wire, options); }
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -90,9 +98,9 @@ extern u8g_dev_t u8g_dev_tft_320x240_upscale_from_128x64;
|
||||||
|
|
||||||
class U8GLIB_TFT_320X240_UPSCALE_FROM_128X64 : public U8GLIB {
|
class U8GLIB_TFT_320X240_UPSCALE_FROM_128X64 : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_TFT_320X240_UPSCALE_FROM_128X64(uint8_t cs, uint8_t rs, uint8_t reset = U8G_PIN_NONE)
|
U8GLIB_TFT_320X240_UPSCALE_FROM_128X64() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_tft_320x240_upscale_from_128x64, cs, rs, reset)
|
U8GLIB_TFT_320X240_UPSCALE_FROM_128X64(uint8_t cs, uint8_t rs, uint8_t reset = U8G_PIN_NONE) { init(cs, rs, reset); }
|
||||||
{ }
|
void init(uint8_t cs, uint8_t rs, uint8_t reset = U8G_PIN_NONE) { U8GLIB::init(&u8g_dev_tft_320x240_upscale_from_128x64, cs, rs, reset); }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -100,12 +108,15 @@ extern u8g_dev_t u8g_dev_uc1701_mini12864_HAL_2x_sw_spi, u8g_dev_uc1701_mini1286
|
||||||
|
|
||||||
class U8GLIB_MINI12864_2X_HAL : public U8GLIB {
|
class U8GLIB_MINI12864_2X_HAL : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_MINI12864_2X_HAL(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE)
|
U8GLIB_MINI12864_2X_HAL() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_uc1701_mini12864_HAL_2x_sw_spi, sck, mosi, cs, a0, reset)
|
U8GLIB_MINI12864_2X_HAL(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) { init(sck, mosi, cs, a0, reset); }
|
||||||
{ }
|
U8GLIB_MINI12864_2X_HAL(uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) { init(cs, a0, reset); }
|
||||||
U8GLIB_MINI12864_2X_HAL(uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE)
|
void init(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) {
|
||||||
: U8GLIB(&u8g_dev_uc1701_mini12864_HAL_2x_hw_spi, cs, a0, reset)
|
U8GLIB::init(&u8g_dev_uc1701_mini12864_HAL_2x_sw_spi, sck, mosi, cs, a0, reset);
|
||||||
{ }
|
}
|
||||||
|
void init(uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE) {
|
||||||
|
U8GLIB::init(&u8g_dev_uc1701_mini12864_HAL_2x_hw_spi, cs, a0, reset);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
extern u8g_dev_t u8g_dev_ssd1309_sw_spi;
|
extern u8g_dev_t u8g_dev_ssd1309_sw_spi;
|
||||||
|
@ -113,10 +124,13 @@ extern u8g_dev_t u8g_dev_ssd1309_hw_spi;
|
||||||
|
|
||||||
class U8GLIB_SSD1309_128X64_HAL : public U8GLIB {
|
class U8GLIB_SSD1309_128X64_HAL : public U8GLIB {
|
||||||
public:
|
public:
|
||||||
U8GLIB_SSD1309_128X64_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
|
U8GLIB_SSD1309_128X64_HAL() : U8GLIB() { }
|
||||||
: U8GLIB(&u8g_dev_ssd1309_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset)
|
U8GLIB_SSD1309_128X64_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) { init(sck, mosi, cs, a0, reset); }
|
||||||
{ }
|
U8GLIB_SSD1309_128X64_HAL(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) { init(cs, a0, reset); }
|
||||||
U8GLIB_SSD1309_128X64_HAL(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
|
void init(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) {
|
||||||
: U8GLIB(&u8g_dev_ssd1309_hw_spi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset)
|
U8GLIB::init(&u8g_dev_ssd1309_sw_spi, (uint8_t)sck, (uint8_t)mosi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset);
|
||||||
{ }
|
}
|
||||||
|
void init(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE) {
|
||||||
|
U8GLIB::init(&u8g_dev_ssd1309_hw_spi, (uint8_t)cs, (uint8_t)a0, (uint8_t)reset);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
#define FONT_STATUSMENU_NAME MENU_FONT_NAME
|
#define FONT_STATUSMENU_NAME MENU_FONT_NAME
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
U8G_CLASS u8g(U8G_PARAM);
|
U8G_CLASS u8g;
|
||||||
|
|
||||||
#include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
|
#include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
|
||||||
|
|
||||||
|
@ -252,6 +252,13 @@ bool MarlinUI::detected() { return true; }
|
||||||
|
|
||||||
// Initialize or re-initialize the LCD
|
// Initialize or re-initialize the LCD
|
||||||
void MarlinUI::init_lcd() {
|
void MarlinUI::init_lcd() {
|
||||||
|
|
||||||
|
static bool did_init_u8g = false;
|
||||||
|
if (!did_init_u8g) {
|
||||||
|
u8g.init(U8G_PARAM);
|
||||||
|
did_init_u8g = true;
|
||||||
|
}
|
||||||
|
|
||||||
#if PIN_EXISTS(LCD_BACKLIGHT)
|
#if PIN_EXISTS(LCD_BACKLIGHT)
|
||||||
OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
|
OUT_WRITE(LCD_BACKLIGHT_PIN, DISABLED(DELAYED_BACKLIGHT_INIT)); // Illuminate after reset or right away
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -35,7 +35,7 @@ USES_LIQUIDCRYSTAL_I2C = marcoschwartz/LiquidCrystal_I2C@1.1.4
|
||||||
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
|
USES_LIQUIDTWI2 = LiquidTWI2@1.2.7
|
||||||
HAS_WIRED_LCD = src_filter=+<src/lcd/lcdprint.cpp>
|
HAS_WIRED_LCD = src_filter=+<src/lcd/lcdprint.cpp>
|
||||||
HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780>
|
HAS_MARLINUI_HD44780 = src_filter=+<src/lcd/HD44780>
|
||||||
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.4.1
|
HAS_MARLINUI_U8GLIB = U8glib-HAL@~0.4.4
|
||||||
src_filter=+<src/lcd/dogm>
|
src_filter=+<src/lcd/dogm>
|
||||||
HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
|
HAS_(FSMC|SPI|LTDC)_TFT = src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
|
||||||
HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
|
HAS_FSMC_TFT = src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
|
||||||
|
|
Loading…
Reference in a new issue