From d9c9ab72bd393148320780c861061f61313b04d5 Mon Sep 17 00:00:00 2001 From: Sadek Baroudi Date: Fri, 7 Jun 2024 15:33:06 -0700 Subject: [PATCH] vik ili9341 display support --- keyboards/fingerpunch/ffkb/rp/v1/config.h | 4 +-- .../personal/le_chiffre_democratique/config.h | 6 ++-- .../le_chiffre_democratique/fp_build.json | 3 +- .../fingerpunch/personal/testamatta/config.h | 6 ++-- .../personal/testamatta/fp_build.json | 3 +- .../fingerpunch/src/display/fp_display.c | 9 ++++-- keyboards/fingerpunch/src/display/gc9a01.h | 8 ++++-- keyboards/fingerpunch/src/display/ili9341.c | 28 +++++++++++++++++++ keyboards/fingerpunch/src/display/ili9341.h | 22 +++++++++++++++ keyboards/fingerpunch/src/display/st7735.h | 8 ++++-- .../fingerpunch/src/display/waveshare_22224.h | 8 ++++-- keyboards/fingerpunch/src/vik/config.h | 22 +++++++++++---- keyboards/fingerpunch/src/vik/rules.mk | 15 +++++++++- keyboards/fingerpunch/svlinky/config.h | 6 ++-- keyboards/fingerpunch/svlinky/fp_build.json | 3 +- keyboards/fingerpunch/svlinky/readme.md | 1 + .../fingerpunch/vulpes_majora/v1/config.h | 6 ++-- .../vulpes_majora/v1/fp_build.json | 3 +- .../fingerpunch/vulpes_minora/byomcu/config.h | 5 ++-- .../vulpes_minora/byomcu/fp_build.json | 3 +- .../vulpes_minora/rp2040zero/config.h | 5 ++-- .../vulpes_minora/rp2040zero/fp_build.json | 3 +- .../fingerpunch/vulpes_minora/xivik/config.h | 6 ++-- .../vulpes_minora/xivik/fp_build.json | 3 +- keyboards/fingerpunch/ximi/v2/config.h | 4 +-- keyboards/fingerpunch/xivik/config.h | 6 ++-- keyboards/fingerpunch/xivik/fp_build.json | 3 +- keyboards/fingerpunch/xivik/readme.md | 1 + 28 files changed, 152 insertions(+), 48 deletions(-) create mode 100644 keyboards/fingerpunch/src/display/ili9341.c create mode 100644 keyboards/fingerpunch/src/display/ili9341.h diff --git a/keyboards/fingerpunch/ffkb/rp/v1/config.h b/keyboards/fingerpunch/ffkb/rp/v1/config.h index 2ba00e89f7..ea53a5c48b 100644 --- a/keyboards/fingerpunch/ffkb/rp/v1/config.h +++ b/keyboards/fingerpunch/ffkb/rp/v1/config.h @@ -62,8 +62,8 @@ along with this program. If not, see . #define VIK_GPIO_2 GP26 #define VIK_WS2812_DI_PIN GP25 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP15 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP15 #define FP_QP_ROTATION QP_ROTATION_270 /** add this back into fp_build.json and configure the stuff below diff --git a/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h b/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h index 6e2903111e..81eabf7686 100644 --- a/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h +++ b/keyboards/fingerpunch/personal/le_chiffre_democratique/config.h @@ -74,8 +74,8 @@ along with this program. If not, see . #define VIK_GPIO_2 F4 #define VIK_WS2812_DI_PIN D4 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN F6 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN F6 /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW @@ -157,4 +157,4 @@ along with this program. If not, see . #define POINTING_DEVICE_INVERT_Y #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json b/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json index 9189189c0d..c16887a1ea 100644 --- a/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json +++ b/keyboards/fingerpunch/personal/le_chiffre_democratique/fp_build.json @@ -3,6 +3,7 @@ "type" : "one-of", "names" : [ "VIK_HAPTIC", + "VIK_ILI9341", "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", @@ -11,7 +12,7 @@ "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224" ], - "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" + "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" }, { "type" : "single", diff --git a/keyboards/fingerpunch/personal/testamatta/config.h b/keyboards/fingerpunch/personal/testamatta/config.h index 535f99ab70..93096535aa 100644 --- a/keyboards/fingerpunch/personal/testamatta/config.h +++ b/keyboards/fingerpunch/personal/testamatta/config.h @@ -48,7 +48,7 @@ #define VIK_GPIO_2 GP10 #define VIK_WS2812_DI_PIN GP16 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP11 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP11 -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/personal/testamatta/fp_build.json b/keyboards/fingerpunch/personal/testamatta/fp_build.json index f481d3f04a..95255c19f8 100644 --- a/keyboards/fingerpunch/personal/testamatta/fp_build.json +++ b/keyboards/fingerpunch/personal/testamatta/fp_build.json @@ -3,6 +3,7 @@ "type" : "one-of", "names" : [ "VIK_HAPTIC", + "VIK_ILI9341", "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", @@ -11,6 +12,6 @@ "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224" ], - "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" + "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" } ] diff --git a/keyboards/fingerpunch/src/display/fp_display.c b/keyboards/fingerpunch/src/display/fp_display.c index 83b609c1fd..5b2c895d0f 100644 --- a/keyboards/fingerpunch/src/display/fp_display.c +++ b/keyboards/fingerpunch/src/display/fp_display.c @@ -19,6 +19,11 @@ #ifdef QUANTUM_PAINTER_ENABLE #include "qp.h" + +#ifdef VIK_ILI9341 +#include "keyboards/fingerpunch/src/display/ili9341.h" +#endif + #ifdef VIK_WEACT_ST7735 #include "keyboards/fingerpunch/src/display/st7735.h" #endif @@ -51,7 +56,7 @@ void fp_post_init_qp(void) { /** * Display text on the screen in a specified location. - * + * * @param text The text to display * @param location The location to display the text, must use one of the FP_QP_* constants */ @@ -100,7 +105,7 @@ void fp_qp_display_text(char* text, int location) { // lv_arc_set_value(obj, v); // } -/** +/** * Create an arc which acts as a loader. */ void fp_qp_load_initial_screen(void) { diff --git a/keyboards/fingerpunch/src/display/gc9a01.h b/keyboards/fingerpunch/src/display/gc9a01.h index 352369b148..f6ad9626e1 100644 --- a/keyboards/fingerpunch/src/display/gc9a01.h +++ b/keyboards/fingerpunch/src/display/gc9a01.h @@ -18,5 +18,9 @@ #include QMK_KEYBOARD_H #include "keyboards/fingerpunch/src/fp.h" -#define FP_QP_DISPLAY_WIDTH 240 -#define FP_QP_DISPLAY_HEIGHT 240 +#ifndef FP_QP_DISPLAY_WIDTH + #define FP_QP_DISPLAY_WIDTH 240 +#endif +#ifndef FP_QP_DISPLAY_HEIGHT + #define FP_QP_DISPLAY_HEIGHT 240 +#endif diff --git a/keyboards/fingerpunch/src/display/ili9341.c b/keyboards/fingerpunch/src/display/ili9341.c new file mode 100644 index 0000000000..9b334ab172 --- /dev/null +++ b/keyboards/fingerpunch/src/display/ili9341.c @@ -0,0 +1,28 @@ +/* Copyright 2023 Sadek Baroudi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "keyboards/fingerpunch/src/display/fp_display.h" +#include "keyboards/fingerpunch/src/display/ili9341.h" + +#ifdef QUANTUM_PAINTER_ENABLE +#include "qp.h" + +painter_device_t fp_qp_disp_device; + +void fp_qp_init_display(void) { + fp_qp_disp_device = qp_ili9341_make_spi_device(FP_QP_DISPLAY_WIDTH, FP_QP_DISPLAY_HEIGHT, DISPLAY_CS_PIN, DISPLAY_DC_PIN, DISPLAY_RST_PIN, 8, 0); +} +#endif diff --git a/keyboards/fingerpunch/src/display/ili9341.h b/keyboards/fingerpunch/src/display/ili9341.h new file mode 100644 index 0000000000..715694ae41 --- /dev/null +++ b/keyboards/fingerpunch/src/display/ili9341.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Sadek Baroudi + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef FP_QP_DISPLAY_WIDTH + #define FP_QP_DISPLAY_WIDTH 320 +#endif +#ifndef FP_QP_DISPLAY_HEIGHT + #define FP_QP_DISPLAY_HEIGHT 480 +#endif diff --git a/keyboards/fingerpunch/src/display/st7735.h b/keyboards/fingerpunch/src/display/st7735.h index 76d17247cf..175fe1d793 100644 --- a/keyboards/fingerpunch/src/display/st7735.h +++ b/keyboards/fingerpunch/src/display/st7735.h @@ -14,5 +14,9 @@ * along with this program. If not, see . */ -#define FP_QP_DISPLAY_WIDTH 128 -#define FP_QP_DISPLAY_HEIGHT 160 +#ifndef FP_QP_DISPLAY_WIDTH + #define FP_QP_DISPLAY_WIDTH 128 +#endif +#ifndef FP_QP_DISPLAY_HEIGHT + #define FP_QP_DISPLAY_HEIGHT 160 +#endif diff --git a/keyboards/fingerpunch/src/display/waveshare_22224.h b/keyboards/fingerpunch/src/display/waveshare_22224.h index efcd66f07b..9145bdae8e 100644 --- a/keyboards/fingerpunch/src/display/waveshare_22224.h +++ b/keyboards/fingerpunch/src/display/waveshare_22224.h @@ -14,5 +14,9 @@ * along with this program. If not, see . */ -#define FP_QP_DISPLAY_WIDTH 200 -#define FP_QP_DISPLAY_HEIGHT 320 +#ifndef FP_QP_DISPLAY_WIDTH + #define FP_QP_DISPLAY_WIDTH 200 +#endif +#ifndef FP_QP_DISPLAY_HEIGHT + #define FP_QP_DISPLAY_HEIGHT 320 +#endif diff --git a/keyboards/fingerpunch/src/vik/config.h b/keyboards/fingerpunch/src/vik/config.h index 68354d9534..f602c0509d 100644 --- a/keyboards/fingerpunch/src/vik/config.h +++ b/keyboards/fingerpunch/src/vik/config.h @@ -3,6 +3,7 @@ /** * Modules: * VIK_HAPTIC + * VIK_ILI9341 * VIK_PER56_CIRQUE_LEDS * VIK_PER56_PMW3360_LEDS * VIK_PMW3360 @@ -12,7 +13,7 @@ * VIK_AZOTEQ * VIK_EC11_EVQWGD001 * VIK_TRACKPOINT - * + * * Pin config: * VIK_SPI_DRIVER * VIK_SPI_SCK_PIN @@ -25,7 +26,7 @@ * VIK_GPIO_1 * VIK_GPIO_2 * VIK_WS2812_DI_PIN - * + * * Options: * VIK_RGB_ONLY * VIK_RETAIN_KB_WS2812_DI_PIN @@ -84,6 +85,17 @@ #define FP_HAPTIC_SAVE #endif +#ifdef VIK_ILI9341 + #define DISPLAY_CS_PIN VIK_SPI_CS + #define DISPLAY_DC_PIN VIK_GPIO_1 + + // To dynamically control the backlight with BL_TOGG keycode + #define BACKLIGHT_PIN VIK_GPIO_2 + + // Must be defined by the keyboard itself, needs a free unused pin for reset + #define DISPLAY_RST_PIN VIK_DISPLAY_RST_UNUSED_PIN +#endif + #ifdef VIK_PER56_CIRQUE_LEDS #ifdef RGBLIGHT_LED_COUNT #undef RGBLIGHT_LED_COUNT @@ -131,7 +143,7 @@ #define BACKLIGHT_PIN VIK_GPIO_2 // Must be defined by the keyboard itself, needs a free unused pin for reset - #define DISPLAY_RST_PIN VIK_ST7735_UNUSED_PIN + #define DISPLAY_RST_PIN VIK_DISPLAY_RST_UNUSED_PIN #endif #ifdef VIK_GC9A01 @@ -152,7 +164,7 @@ #define BACKLIGHT_PIN VIK_GPIO_2 // Must be defined by the keyboard itself, needs a free unused pin for reset - #define DISPLAY_RST_PIN VIK_ST7735_UNUSED_PIN + #define DISPLAY_RST_PIN VIK_DISPLAY_RST_UNUSED_PIN #endif #ifdef VIK_AZOTEQ @@ -194,4 +206,4 @@ #ifdef CIRQUE_ENABLE #define CIRQUE_PINNACLE_SPI_CS_PIN VIK_SPI_CS -#endif \ No newline at end of file +#endif diff --git a/keyboards/fingerpunch/src/vik/rules.mk b/keyboards/fingerpunch/src/vik/rules.mk index 045a2927b8..fe6a039e88 100644 --- a/keyboards/fingerpunch/src/vik/rules.mk +++ b/keyboards/fingerpunch/src/vik/rules.mk @@ -3,6 +3,7 @@ # rules.mk options # VIK_ENABLE # VIK_HAPTIC +# VIK_ILI9341 # VIK_PER56_CIRQUE_LEDS # VIK_PER56_PMW3360_LEDS # VIK_PMW3360 @@ -19,6 +20,18 @@ ifeq ($(strip $(VIK_HAPTIC)), yes) OPT_DEFS += -DVIK_HAPTIC endif +ifeq ($(strip $(VIK_ILI9341)), yes) + # For LCD backlight toggling + BACKLIGHT_ENABLE = yes + BACKLIGHT_DRIVER = software + + QUANTUM_PAINTER_ENABLE = yes + QUANTUM_PAINTER_DRIVERS += ili9341_spi + QUANTUM_PAINTER_LVGL_INTEGRATION = yes + SRC += keyboards/fingerpunch/src/display/ili9341.c + OPT_DEFS += -DVIK_ILI9341 +endif + ifeq ($(strip $(VIK_PER56_CIRQUE_LEDS)), yes) CIRQUE_ENABLE = yes ENCODER_ENABLE = yes @@ -140,4 +153,4 @@ endif ifeq ($(strip $(QUANTUM_PAINTER_ENABLE)), yes) SRC += keyboards/fingerpunch/src/display/fp_display.c -endif \ No newline at end of file +endif diff --git a/keyboards/fingerpunch/svlinky/config.h b/keyboards/fingerpunch/svlinky/config.h index f856d4635c..746552649c 100644 --- a/keyboards/fingerpunch/svlinky/config.h +++ b/keyboards/fingerpunch/svlinky/config.h @@ -56,8 +56,8 @@ along with this program. If not, see . #endif #define VIK_WS2812_DI_PIN GP16 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP13 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP13 // All the through hole pins from the controller #ifdef FP_SVLINKY_V01 @@ -116,4 +116,4 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/svlinky/fp_build.json b/keyboards/fingerpunch/svlinky/fp_build.json index 290f8a1905..a678931461 100644 --- a/keyboards/fingerpunch/svlinky/fp_build.json +++ b/keyboards/fingerpunch/svlinky/fp_build.json @@ -8,6 +8,7 @@ "type" : "one-of", "names" : [ "VIK_HAPTIC", + "VIK_ILI9341", "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", @@ -19,7 +20,7 @@ "VIK_EC11_EVQWGD001", "VIK_TRACKPOINT" ], - "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_TRACKPOINT" + "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_ILI9341, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_AZOTEQ, VIK_EC11_EVQWGD001, VIK_TRACKPOINT" }, { "type" : "single", diff --git a/keyboards/fingerpunch/svlinky/readme.md b/keyboards/fingerpunch/svlinky/readme.md index 4a89dc1114..fc6b4c3665 100644 --- a/keyboards/fingerpunch/svlinky/readme.md +++ b/keyboards/fingerpunch/svlinky/readme.md @@ -23,6 +23,7 @@ Options are: RGBLIGHT_ENABLE=yes HAPTIC_FEEDBACK=yes // for the options below, select only one, or none, used for testing [VIK modules](https://github.com/sadekbaroudi/vik#known-list-of-vik-certifications) + VIK_ILI9341=yes VIK_PER56_CIRQUE_LEDS=yes VIK_PER56_PMW3360_LEDS=yes VIK_PMW3360=yes diff --git a/keyboards/fingerpunch/vulpes_majora/v1/config.h b/keyboards/fingerpunch/vulpes_majora/v1/config.h index 44bd843a8d..f3e9319f71 100644 --- a/keyboards/fingerpunch/vulpes_majora/v1/config.h +++ b/keyboards/fingerpunch/vulpes_majora/v1/config.h @@ -43,8 +43,8 @@ along with this program. If not, see . #define VIK_GPIO_2 GP26 #define VIK_WS2812_DI_PIN GP25 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP13 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP13 #define FP_QP_ROTATION QP_ROTATION_270 /* COL2ROW, ROW2COL*/ @@ -116,4 +116,4 @@ along with this program. If not, see . #define FP_HAPTIC_SAVE #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json b/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json index 97ace9e7ce..d5087767b7 100644 --- a/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json +++ b/keyboards/fingerpunch/vulpes_majora/v1/fp_build.json @@ -5,12 +5,13 @@ "CIRQUE_ENABLE", "VIK_AZOTEQ", "FP_TRACKBALL_ENABLE", + "VIK_ILI9341", "VIK_WEACT_ST7735", "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224" ], "name" : "CIRQUE_ENABLE", - "user_input": "Which of the following VIK features do you have? NONE, Cirque, Azoteq, Trackball, WeAct ST7735, GC9A01, Waveshare 22224" + "user_input": "Which of the following VIK features do you have? NONE, Cirque, Azoteq, Trackball, ILI9341, WeAct ST7735, GC9A01, Waveshare 22224" }, { "type" : "single", diff --git a/keyboards/fingerpunch/vulpes_minora/byomcu/config.h b/keyboards/fingerpunch/vulpes_minora/byomcu/config.h index f6ca0ab2b7..3d9604fef7 100644 --- a/keyboards/fingerpunch/vulpes_minora/byomcu/config.h +++ b/keyboards/fingerpunch/vulpes_minora/byomcu/config.h @@ -45,7 +45,8 @@ along with this program. If not, see . #define WS2812_DI_PIN GP0 -#define VIK_ST7735_UNUSED_PIN GP11 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP11 // https://github.com/sadekbaroudi/vik/tree/master/pcb/pers60-cirque-leds or https://github.com/sadekbaroudi/vik/tree/master/pcb/pers60-pmw3360-leds #ifdef FP_VIK_PERS60_MODULE @@ -91,4 +92,4 @@ along with this program. If not, see . #define POINTING_DEVICE_LEFT #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json b/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json index 24ec31506e..cee4b12e66 100644 --- a/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json +++ b/keyboards/fingerpunch/vulpes_minora/byomcu/fp_build.json @@ -7,11 +7,12 @@ "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", "VIK_PMW3360", + "VIK_ILI9341", "VIK_WEACT_ST7735", "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224" ], - "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" + "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" }, { "type" : "single", diff --git a/keyboards/fingerpunch/vulpes_minora/rp2040zero/config.h b/keyboards/fingerpunch/vulpes_minora/rp2040zero/config.h index c9c62e2b19..6436458e81 100644 --- a/keyboards/fingerpunch/vulpes_minora/rp2040zero/config.h +++ b/keyboards/fingerpunch/vulpes_minora/rp2040zero/config.h @@ -40,7 +40,8 @@ along with this program. If not, see . #define VIK_WS2812_DI_PIN GP0 // Note that this is the top pad on the back of the RP2040-Zero, change this if you end up using that pad -#define VIK_ST7735_UNUSED_PIN GP25 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP25 // Split config #define SERIAL_PIO_USE_PIO1 @@ -79,4 +80,4 @@ along with this program. If not, see . #define POINTING_DEVICE_LEFT #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json b/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json index b857d93c02..62787714a4 100644 --- a/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json +++ b/keyboards/fingerpunch/vulpes_minora/rp2040zero/fp_build.json @@ -7,11 +7,12 @@ "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", "VIK_PMW3360", + "VIK_ILI9341", "VIK_WEACT_ST7735", "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224" ], - "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" + "user_input": "Are you using a VIK module? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224" }, { "type" : "single", diff --git a/keyboards/fingerpunch/vulpes_minora/xivik/config.h b/keyboards/fingerpunch/vulpes_minora/xivik/config.h index 1132ffc43a..7b2f08b629 100644 --- a/keyboards/fingerpunch/vulpes_minora/xivik/config.h +++ b/keyboards/fingerpunch/vulpes_minora/xivik/config.h @@ -57,8 +57,8 @@ along with this program. If not, see . #endif #define VIK_WS2812_DI_PIN GP16 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP11 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP11 // Split config #define SERIAL_PIO_USE_PIO1 @@ -91,4 +91,4 @@ along with this program. If not, see . #define POINTING_DEVICE_LEFT #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json b/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json index 18fef2666c..8f697374ca 100644 --- a/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json +++ b/keyboards/fingerpunch/vulpes_minora/xivik/fp_build.json @@ -15,11 +15,12 @@ "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", "VIK_PMW3360", + "VIK_ILI9341", "VIK_WEACT_ST7735", "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224", "VIK_EC11_EVQWGD001" ], - "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001" + "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001" } ] diff --git a/keyboards/fingerpunch/ximi/v2/config.h b/keyboards/fingerpunch/ximi/v2/config.h index 143d7f21f6..5ad259e56d 100644 --- a/keyboards/fingerpunch/ximi/v2/config.h +++ b/keyboards/fingerpunch/ximi/v2/config.h @@ -34,6 +34,6 @@ along with this program. If not, see . #define VIK_GPIO_2 GP26 #define VIK_WS2812_DI_PIN GP25 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP15 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP15 #define FP_QP_ROTATION QP_ROTATION_270 diff --git a/keyboards/fingerpunch/xivik/config.h b/keyboards/fingerpunch/xivik/config.h index cf1e8ab076..fabb974a88 100644 --- a/keyboards/fingerpunch/xivik/config.h +++ b/keyboards/fingerpunch/xivik/config.h @@ -61,8 +61,8 @@ along with this program. If not, see . #endif #define VIK_WS2812_DI_PIN GP16 -// Used only if you have a weact st7735 display, set to unused pin -#define VIK_ST7735_UNUSED_PIN GP11 +// Used only if you have a display with RESET unconnected, set to unused pin +#define VIK_DISPLAY_RST_UNUSED_PIN GP11 // All the through hole pins from the controller #ifdef FP_XIVIK_V01 @@ -125,4 +125,4 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_TWINKLE #endif -#include "keyboards/fingerpunch/src/config_post.h" \ No newline at end of file +#include "keyboards/fingerpunch/src/config_post.h" diff --git a/keyboards/fingerpunch/xivik/fp_build.json b/keyboards/fingerpunch/xivik/fp_build.json index ff1f6f2063..ba58665b4f 100644 --- a/keyboards/fingerpunch/xivik/fp_build.json +++ b/keyboards/fingerpunch/xivik/fp_build.json @@ -15,12 +15,13 @@ "VIK_PER56_CIRQUE_LEDS", "VIK_PER56_PMW3360_LEDS", "VIK_PMW3360", + "VIK_ILI9341", "VIK_WEACT_ST7735", "VIK_VIK_GC9A01", "VIK_WAVESHARE_22224", "VIK_EC11_EVQWGD001" ], - "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001" + "user_input": "Which VIK module are you testing? NONE, VIK_HAPTIC, VIK_PER56_CIRQUE_LEDS, VIK_PER56_CIRQUE_LEDS, VIK_PER56_PMW3360_LEDS, VIK_PMW3360, VIK_ILI9341, VIK_WEACT_ST7735, VIK_VIK_GC9A01, VIK_WAVESHARE_22224, VIK_EC11_EVQWGD001" }, { "type" : "single", diff --git a/keyboards/fingerpunch/xivik/readme.md b/keyboards/fingerpunch/xivik/readme.md index 12e1f420f4..9c7d22cb9c 100644 --- a/keyboards/fingerpunch/xivik/readme.md +++ b/keyboards/fingerpunch/xivik/readme.md @@ -21,6 +21,7 @@ Options are: RGBLIGHT_ENABLE=yes HAPTIC_FEEDBACK=yes // for the options below, select only one, or none, used for testing [VIK modules](https://github.com/sadekbaroudi/vik#known-list-of-vik-certifications) + VIK_ILI9341=yes VIK_PER56_CIRQUE_LEDS=yes VIK_PER56_PMW3360_LEDS=yes VIK_PMW3360=yes