Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-09-25 12:05:24 +00:00
commit ad586293eb

View file

@ -70,7 +70,7 @@ void keyboard_post_init_kb(void) {
wait_ms(150); wait_ms(150);
// Initialise the LCD // Initialise the LCD
lcd = qp_ili9341_make_spi_device(320, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0); lcd = qp_ili9341_make_spi_device(240, 320, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, 4, 0);
qp_init(lcd, QP_ROTATION_0); qp_init(lcd, QP_ROTATION_0);
// Turn on the LCD and clear the display // Turn on the LCD and clear the display
@ -230,4 +230,4 @@ void housekeeping_task_kb(void) {
if (last_input_activity_elapsed() > 250) { if (last_input_activity_elapsed() > 250) {
matrix_wait_for_interrupt(); matrix_wait_for_interrupt();
} }
} }