From 69a67328615892e8e4ce46799676acfda91f40da Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Sat, 6 Jul 2024 11:43:10 -0600 Subject: [PATCH] fix failing boards --- keyboards/annepro2/keymaps/vial/rules.mk | 3 ++- keyboards/doio/kb12/keymaps/vial/rules.mk | 2 ++ keyboards/doio/kb30/keymaps/vial/rules.mk | 2 ++ keyboards/durgod/k320/keymaps/vial/keymap.c | 2 +- keyboards/ekow/akira/keymaps/vial/rules.mk | 3 +++ keyboards/feker/ik75/keymaps/vial/keymap.c | 2 +- .../jlw/vault35_wkl_universal/keymaps/vial/rules.mk | 1 + keyboards/reviung/reviung39/keymaps/vial/config.h | 9 +-------- .../thevankeyboards/minivan/keymaps/vial/keymap.c | 12 ++++++------ keyboards/vertex/angler2/keyboard.json | 1 - keyboards/vertex/arc60/keymaps/vial/rules.mk | 3 +-- keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk | 2 ++ 12 files changed, 22 insertions(+), 20 deletions(-) diff --git a/keyboards/annepro2/keymaps/vial/rules.mk b/keyboards/annepro2/keymaps/vial/rules.mk index dfca0d3d2b..0011a02c81 100644 --- a/keyboards/annepro2/keymaps/vial/rules.mk +++ b/keyboards/annepro2/keymaps/vial/rules.mk @@ -1,9 +1,10 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIALRGB_ENABLE = yes LTO_ENABLE = yes QMK_SETTINGS = no TAP_DANCE_ENABLE = yes COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = yes + +RGB_MATRIX_ENABLE = no diff --git a/keyboards/doio/kb12/keymaps/vial/rules.mk b/keyboards/doio/kb12/keymaps/vial/rules.mk index 6846963222..5a9219bb5c 100644 --- a/keyboards/doio/kb12/keymaps/vial/rules.mk +++ b/keyboards/doio/kb12/keymaps/vial/rules.mk @@ -4,3 +4,5 @@ VIAL_ENABLE = yes # Enable VIAL VIALRGB_ENABLE = yes # Enable VIALRGB ENCODER_MAP_ENABLE = yes # Enable knob + +QMK_SETTINGS = no diff --git a/keyboards/doio/kb30/keymaps/vial/rules.mk b/keyboards/doio/kb30/keymaps/vial/rules.mk index 51e77e59d2..1bd8d7659e 100644 --- a/keyboards/doio/kb30/keymaps/vial/rules.mk +++ b/keyboards/doio/kb30/keymaps/vial/rules.mk @@ -7,3 +7,5 @@ ENCODER_ENABLE = yes ENCODER_MAP_ENABLE = yes VIALRGB_ENABLE = yes + +QMK_SETTINGS = no diff --git a/keyboards/durgod/k320/keymaps/vial/keymap.c b/keyboards/durgod/k320/keymaps/vial/keymap.c index 74c4c2e5f5..6645dc7c2f 100644 --- a/keyboards/durgod/k320/keymaps/vial/keymap.c +++ b/keyboards/durgod/k320/keymaps/vial/keymap.c @@ -37,6 +37,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/ekow/akira/keymaps/vial/rules.mk b/keyboards/ekow/akira/keymaps/vial/rules.mk index 1c3757c373..731eec9a47 100644 --- a/keyboards/ekow/akira/keymaps/vial/rules.mk +++ b/keyboards/ekow/akira/keymaps/vial/rules.mk @@ -4,3 +4,6 @@ LTO_ENABLE = yes QMK_SETTINGS = no CONSOLE_ENABLE = no COMMAND_ENABLE = no +TAP_DANCE_ENABLE = no +KEY_OVERRIDE_ENABLE = no +COMBO_ENABLE = no diff --git a/keyboards/feker/ik75/keymaps/vial/keymap.c b/keyboards/feker/ik75/keymaps/vial/keymap.c index 707f884fb8..8bae6bafee 100644 --- a/keyboards/feker/ik75/keymaps/vial/keymap.c +++ b/keyboards/feker/ik75/keymaps/vial/keymap.c @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, QK_RBT, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, RGB_HUI, _______, _______, KC_SCRL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAI, _______, _______, _______, _______, _______, _______, KC_NUM, _______, _______, _______, _______, _______, RGB_VAI, RGB_SAD, - _______, GUI_TOG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ + _______, GU_TOGG, _______, _______, _______, _______, _______, _______, RGB_VAD, _______ ), }; diff --git a/keyboards/jlw/vault35_wkl_universal/keymaps/vial/rules.mk b/keyboards/jlw/vault35_wkl_universal/keymaps/vial/rules.mk index 6dc6b266cb..b9087724d5 100644 --- a/keyboards/jlw/vault35_wkl_universal/keymaps/vial/rules.mk +++ b/keyboards/jlw/vault35_wkl_universal/keymaps/vial/rules.mk @@ -2,3 +2,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes VIALRGB_ENABLE = yes ENCODER_MAP_ENABLE = yes +COMBO_ENABLE = no diff --git a/keyboards/reviung/reviung39/keymaps/vial/config.h b/keyboards/reviung/reviung39/keymaps/vial/config.h index 9fb05bb49b..8335cb22a2 100644 --- a/keyboards/reviung/reviung39/keymaps/vial/config.h +++ b/keyboards/reviung/reviung39/keymaps/vial/config.h @@ -15,17 +15,10 @@ */ #pragma once -#ifndef CONFIG_USER_H -#define CONFIG_USER_H + #define VIAL_KEYBOARD_UID {0xC0, 0xED, 0x8D, 0x24, 0x88, 0x5F, 0xD0, 0x9F} #define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } #define VIAL_UNLOCK_COMBO_COLS { 0, 5 } -#include "../../config.h" - #define TAPPING_TERM 175 #define TAPPING_TOGGLE 3 - -#endif - -// place overrides here \ No newline at end of file diff --git a/keyboards/thevankeyboards/minivan/keymaps/vial/keymap.c b/keyboards/thevankeyboards/minivan/keymaps/vial/keymap.c index 9771ea19c9..e9e8b6fae6 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, (rgb_led_t *)&led[i]); + rgblight_setrgb_at(0, 0, 0, i); } if (led_state.caps_lock) { - setrgb(255, 0, 0, (rgb_led_t *)&led[0]); + rgblight_setrgb_at(255, 0, 0, 0); } if (state & (1<<1)) { - setrgb(255, 0, 255, (rgb_led_t *)&led[0]); + rgblight_setrgb_at(255, 0, 255, 0); } if (state & (1<<2)) { - setrgb(0, 0, 255, (rgb_led_t *)&led[1]); + rgblight_setrgb_at(0, 0, 255, 1); } if (state & (1<<3)) { - setrgb(255, 255, 0, (rgb_led_t *)&led[1]); + rgblight_setrgb_at(255, 255, 0, 1); } if (state & (1<<1)) { - setrgb(10, 255, 125, (rgb_led_t *)&led[2]); + rgblight_setrgb_at(10, 255, 125, 2); } diff --git a/keyboards/vertex/angler2/keyboard.json b/keyboards/vertex/angler2/keyboard.json index 9b9d226614..574eb1af67 100644 --- a/keyboards/vertex/angler2/keyboard.json +++ b/keyboards/vertex/angler2/keyboard.json @@ -42,7 +42,6 @@ "knight": true, "christmas": true, "static_gradient": true, - "rgb_test": true, "alternating": true, "twinkle": true } diff --git a/keyboards/vertex/arc60/keymaps/vial/rules.mk b/keyboards/vertex/arc60/keymaps/vial/rules.mk index 3a820d70cd..3ed0d216fb 100644 --- a/keyboards/vertex/arc60/keymaps/vial/rules.mk +++ b/keyboards/vertex/arc60/keymaps/vial/rules.mk @@ -1,4 +1,3 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -QMK_SETTINGS = yes -TAP_DANCE_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk index 497ff51381..90835d4e72 100644 --- a/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk +++ b/keyboards/ymdk/ymd75/rev4/iso/keymaps/vial/rules.mk @@ -6,3 +6,5 @@ KEY_LOCK_ENABLE = no LTO_ENABLE = yes COMBO_ENABLE = no KEY_OVERRIDE_ENABLE = no + +QMK_SETTINGS = no