From bef6b29781bc40ce83dfa4300dbe91303cd27e0b Mon Sep 17 00:00:00 2001 From: Shmokebud Date: Thu, 19 Jun 2025 16:56:57 -0400 Subject: [PATCH] it actually compiled --- keyboards/zodiarkpi/keymaps/vial/keymap.c | 2 +- keyboards/zodiarkpi/zodiarkpi.c | 41 ++--------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/keyboards/zodiarkpi/keymaps/vial/keymap.c b/keyboards/zodiarkpi/keymaps/vial/keymap.c index 16ba465978..768fc9ec7f 100644 --- a/keyboards/zodiarkpi/keymaps/vial/keymap.c +++ b/keyboards/zodiarkpi/keymaps/vial/keymap.c @@ -16,7 +16,7 @@ along with this program. If not, see . #include "nyanners.qgf.h" #include "mouse.qgf.h" -#define display qp_st7789_make_spi_device(320, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, LCD_SPI_DIVISOR, 3) +extern painter_device_t display; #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/zodiarkpi/zodiarkpi.c b/keyboards/zodiarkpi/zodiarkpi.c index a2eaeea858..6511fc72cb 100644 --- a/keyboards/zodiarkpi/zodiarkpi.c +++ b/keyboards/zodiarkpi/zodiarkpi.c @@ -178,13 +178,11 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { #include "numi.qgf.c" #include "mouse.qgf.c" -static painter_device_t display; +painter_device_t display; static painter_image_handle_t image; // st7789 enable, comment out the following line if not using a st7789 painter_device_t qp_st7789_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode); -// gc9a01 enable, comment out the following line if not using a gc9a01 -// painter_device_t qp_gc9a01_make_spi_device(uint16_t panel_width, uint16_t panel_height, pin_t chip_select_pin, pin_t dc_pin, pin_t reset_pin, uint16_t spi_divisor, int spi_mode); void keyboard_post_init_user(void) { // Customise these values to desired behaviour @@ -209,50 +207,15 @@ uint32_t deferred_init(uint32_t trigger_time, void *cb_arg) { if (is_keyboard_left()) { qp_init(display, QP_ROTATION_270); } -// If using pointing device on right side, comment out following 3 lines - // else { - // qp_init(display, QP_ROTATION_0); - // } + if (is_keyboard_left()) { - image = qp_load_image_mem(gfx_bao); - image = qp_load_image_mem(gfx_nyanners); - image = qp_load_image_mem(gfx_mouse); image = qp_load_image_mem(gfx_numi); } -// If using pointing device on right side, comment out following 3 lines - // else { - // image = qp_load_image_mem(gfx_ZodiarkPiLogoSTpink); - // } - //S ##end st7789 screen support - - // ##gc9a01 screeen support, comment out this section if not using a gc9a01 screen - // display = qp_gc9a01_make_spi_device(240, 240, LCD_CS_PIN, LCD_DC_PIN, LCD_RST_PIN, LCD_SPI_DIVISOR, 0); - // qp_power(display, true); - // if (is_keyboard_left()) { - // qp_init(display, QP_ROTATION_0); - // } - // If using pointing device on right side, comment out following 3 lines - // else { - // qp_init(display, QP_ROTATION_0); - // } - - // if (is_keyboard_left()) { - // image = qp_load_image_mem(gfx_ZodiarkPiLogoGC); - // } - // If using pointing device on right side, comment out following 3 lines - // else { - // image = qp_load_image_mem(gfx_ZodiarkPiLogoGC); - // } - // ##end GC9A01 screeen support if (image != NULL) { print("image was not null\n"); if (is_keyboard_left()) {qp_drawimage(display, 0, 0, image); } - // If using pointing device on right side, comment out following 3 lines - // else { - // qp_drawimage(display, 0, 0, image); - // } }