From 64089e678228214a7ab367d3c207e8d4ccc506d1 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Wed, 3 Jan 2024 19:40:28 -0600 Subject: [PATCH] fix failing keyboards --- .../aidansmithdotdev/fine40/keymaps/vial/rules.mk | 1 + keyboards/kbdfans/kbd67/rev2/keymaps/vial/rules.mk | 1 + .../keycapsss/kimiko/rev1/keymaps/vial/rules.mk | 2 +- keyboards/kprepublic/bm16a/keymaps/vial/rules.mk | 1 + keyboards/kprepublic/bm40hsrgb/keymaps/vial/rules.mk | 1 + keyboards/sofle_choc/keymaps/vial/rules.mk | 1 + .../thevankeyboards/minivan/keymaps/vial/keymap.c | 12 ++++++------ quantum/quantum.c | 4 ---- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/vial/rules.mk b/keyboards/aidansmithdotdev/fine40/keymaps/vial/rules.mk index d6aa8769e4..bd827d8117 100644 --- a/keyboards/aidansmithdotdev/fine40/keymaps/vial/rules.mk +++ b/keyboards/aidansmithdotdev/fine40/keymaps/vial/rules.mk @@ -5,3 +5,4 @@ ENCODER_MAP_ENABLE = yes # Options to reduce firmware size: LTO_ENABLE = yes # make the compiler work harder QMK_SETTINGS = no # enables the tab to change QMK settings from the GUI +TAP_DANCE_ENABLE = no diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/vial/rules.mk b/keyboards/kbdfans/kbd67/rev2/keymaps/vial/rules.mk index 68303d8bae..83ede406c7 100644 --- a/keyboards/kbdfans/kbd67/rev2/keymaps/vial/rules.mk +++ b/keyboards/kbdfans/kbd67/rev2/keymaps/vial/rules.mk @@ -3,3 +3,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes QMK_SETTINGS = no TAP_DANCE_ENABLE = no +COMBO_ENABLE = no diff --git a/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk index 2a3a41e91e..be7fdace31 100644 --- a/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk +++ b/keyboards/keycapsss/kimiko/rev1/keymaps/vial/rules.mk @@ -4,7 +4,7 @@ ENCODER_MAP_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes -RGBLIGHT_ENABLE = yes # Enable keyboard 'old' RGB lightning +RGBLIGHT_ENABLE = no # Enable keyboard 'old' RGB lightning MOUSEKEY_ENABLE = yes # Disabled, because firmware size is to big for Pro Micros diff --git a/keyboards/kprepublic/bm16a/keymaps/vial/rules.mk b/keyboards/kprepublic/bm16a/keymaps/vial/rules.mk index 3ac00ba36a..2e3f1b92d5 100644 --- a/keyboards/kprepublic/bm16a/keymaps/vial/rules.mk +++ b/keyboards/kprepublic/bm16a/keymaps/vial/rules.mk @@ -5,3 +5,4 @@ VIAL_ENABLE = yes LTO_ENABLE = yes MAGIC_ENABLE = no QMK_SETTINGS = no +TAP_DANCE_ENABLE = no diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/vial/rules.mk b/keyboards/kprepublic/bm40hsrgb/keymaps/vial/rules.mk index fc3c2620a6..f17332dacc 100644 --- a/keyboards/kprepublic/bm40hsrgb/keymaps/vial/rules.mk +++ b/keyboards/kprepublic/bm40hsrgb/keymaps/vial/rules.mk @@ -5,3 +5,4 @@ QMK_SETTINGS = no COMBO_ENABLE = no TAP_DANCE_ENABLE = no KEY_OVERRIDE_ENABLE = no +RGB_MATRIX_ENABLE = no diff --git a/keyboards/sofle_choc/keymaps/vial/rules.mk b/keyboards/sofle_choc/keymaps/vial/rules.mk index 2c238a884a..6afc8c7258 100644 --- a/keyboards/sofle_choc/keymaps/vial/rules.mk +++ b/keyboards/sofle_choc/keymaps/vial/rules.mk @@ -13,3 +13,4 @@ QMK_SETTINGS = no MOUSEKEY_ENABLE = no COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no +RGB_MATRIX_ENABLE = no diff --git a/keyboards/thevankeyboards/minivan/keymaps/vial/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/vial/keymap.c index 0297edeb2a..9771ea19c9 100644 --- a/keyboards/thevankeyboards/minivan/keymaps/vial/keymap.c +++ b/keyboards/thevankeyboards/minivan/keymaps/vial/keymap.c @@ -44,26 +44,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { void process_indicator_update(layer_state_t state, led_t led_state) { for (int i = 0; i < 3; i++) { - setrgb(0, 0, 0, (LED_TYPE *)&led[i]); + setrgb(0, 0, 0, (rgb_led_t *)&led[i]); } if (led_state.caps_lock) { - setrgb(255, 0, 0, (LED_TYPE *)&led[0]); + setrgb(255, 0, 0, (rgb_led_t *)&led[0]); } if (state & (1<<1)) { - setrgb(255, 0, 255, (LED_TYPE *)&led[0]); + setrgb(255, 0, 255, (rgb_led_t *)&led[0]); } if (state & (1<<2)) { - setrgb(0, 0, 255, (LED_TYPE *)&led[1]); + setrgb(0, 0, 255, (rgb_led_t *)&led[1]); } if (state & (1<<3)) { - setrgb(255, 255, 0, (LED_TYPE *)&led[1]); + setrgb(255, 255, 0, (rgb_led_t *)&led[1]); } if (state & (1<<1)) { - setrgb(10, 255, 125, (LED_TYPE *)&led[2]); + setrgb(10, 255, 125, (rgb_led_t *)&led[2]); } diff --git a/quantum/quantum.c b/quantum/quantum.c index 86c12d935e..8ae91a1847 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -70,10 +70,6 @@ # include "process_unicode_common.h" #endif -#ifdef VELOCIKEY_ENABLE -# include "velocikey.h" -#endif - #ifdef VIAL_ENABLE # include "vial.h" #endif