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

3 years ago · ad586293eb
parent c7a65558ee 1bdf4cdc22
commit ad586293eb
1 changed files with 2 additions and 2 deletions
--- a/keyboards/tzarc/djinn/djinn.c
+++ b/keyboards/tzarc/djinn/djinn.c
@ -70,7 +70,7 @@ void keyboard_post_init_kb(void) {
    wait_ms(150);

    // 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);

    // Turn on the LCD and clear the display
@ -230,4 +230,4 @@ void housekeeping_task_kb(void) {
    if (last_input_activity_elapsed() > 250) {
        matrix_wait_for_interrupt();
    }
-}
+}