From 2fc27b48b6aa0638914ae3762576cb694ea4d580 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Sat, 11 Dec 2021 21:11:31 -0500 Subject: [PATCH] Fix keyboards failing to build --- keyboards/adalyn/rules.mk | 2 +- keyboards/alpha/keymaps/vial/rules.mk | 1 + keyboards/bongopad/keymaps/default/keymap.c | 3 ++- keyboards/bongopad/keymaps/vial/keymap.c | 3 ++- keyboards/eyeohdesigns/babyv/keymaps/vial/rules.mk | 3 +-- keyboards/getawayvan/rules.mk | 2 +- keyboards/grezeh/larva/larva2/rules.mk | 2 +- keyboards/kbdfans/kbd67/mkii_soldered/keymaps/vial/rules.mk | 1 + keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c | 3 ++- keyboards/minisub/rules.mk | 2 +- keyboards/misterdeck/keymaps/default/keymap.c | 1 - keyboards/misterdeck/keymaps/via/keymap.c | 1 - keyboards/misterdeck/rules.mk | 2 +- keyboards/montex/keymaps/vial/rules.mk | 1 + keyboards/murcielago/rev1/keymaps/vial/rules.mk | 1 + keyboards/pancake/rev2/rules.mk | 2 +- keyboards/password/keymaps/vial/rules.mk | 3 ++- keyboards/pteron36/keymaps/via/rules.mk | 4 ++++ keyboards/reviung34/keymaps/vial/rules.mk | 1 + keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk | 1 + keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk | 1 + keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk | 1 + keyboards/sofle/keymaps/vial/rules.mk | 1 + keyboards/vial_example/vial_atmega32u4/keymaps/vial/rules.mk | 1 + keyboards/vial_example/vial_atmega32u4/rules.mk | 2 +- keyboards/vial_example/vial_stm32f072/rules.mk | 2 +- keyboards/vial_example/vial_stm32f103_vibl/rules.mk | 2 +- keyboards/vial_example/vial_stm32f401/rules.mk | 2 +- 28 files changed, 33 insertions(+), 18 deletions(-) diff --git a/keyboards/adalyn/rules.mk b/keyboards/adalyn/rules.mk index 35a59af934..55134dbe24 100644 --- a/keyboards/adalyn/rules.mk +++ b/keyboards/adalyn/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/alpha/keymaps/vial/rules.mk b/keyboards/alpha/keymaps/vial/rules.mk index 46f9f1360f..043b69911e 100644 --- a/keyboards/alpha/keymaps/vial/rules.mk +++ b/keyboards/alpha/keymaps/vial/rules.mk @@ -1,3 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/bongopad/keymaps/default/keymap.c b/keyboards/bongopad/keymaps/default/keymap.c index c52e5c4239..e017f6f161 100644 --- a/keyboards/bongopad/keymaps/default/keymap.c +++ b/keyboards/bongopad/keymaps/default/keymap.c @@ -165,11 +165,12 @@ static void render_anim(void) { } } -void oled_task_user(void) { +bool oled_task_user(void) { render_anim(); oled_set_cursor(0,0); sprintf(wpm_str, "WPM:%03d", get_current_wpm()); oled_write(wpm_str, false); + return false; } oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }; diff --git a/keyboards/bongopad/keymaps/vial/keymap.c b/keyboards/bongopad/keymaps/vial/keymap.c index c52e5c4239..e017f6f161 100644 --- a/keyboards/bongopad/keymaps/vial/keymap.c +++ b/keyboards/bongopad/keymaps/vial/keymap.c @@ -165,11 +165,12 @@ static void render_anim(void) { } } -void oled_task_user(void) { +bool oled_task_user(void) { render_anim(); oled_set_cursor(0,0); sprintf(wpm_str, "WPM:%03d", get_current_wpm()); oled_write(wpm_str, false); + return false; } oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }; diff --git a/keyboards/eyeohdesigns/babyv/keymaps/vial/rules.mk b/keyboards/eyeohdesigns/babyv/keymaps/vial/rules.mk index 0597afbce8..043b69911e 100644 --- a/keyboards/eyeohdesigns/babyv/keymaps/vial/rules.mk +++ b/keyboards/eyeohdesigns/babyv/keymaps/vial/rules.mk @@ -1,5 +1,4 @@ -BOOTMAGIC_ENABLE = lite - VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/getawayvan/rules.mk b/keyboards/getawayvan/rules.mk index 815580c6c4..96d14c0045 100644 --- a/keyboards/getawayvan/rules.mk +++ b/keyboards/getawayvan/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = stm32-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/grezeh/larva/larva2/rules.mk b/keyboards/grezeh/larva/larva2/rules.mk index cbe7ad77c9..842026d6c3 100644 --- a/keyboards/grezeh/larva/larva2/rules.mk +++ b/keyboards/grezeh/larva/larva2/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/vial/rules.mk b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/vial/rules.mk index 46f9f1360f..043b69911e 100644 --- a/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/vial/rules.mk +++ b/keyboards/kbdfans/kbd67/mkii_soldered/keymaps/vial/rules.mk @@ -1,3 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c index b90fac1abf..c4c6c05ecd 100644 --- a/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c +++ b/keyboards/keycapsss/plaid_pad/keymaps/vial/keymap.c @@ -64,8 +64,9 @@ void keyboard_post_init_user(void) { // Rev3 and above only #ifdef OLED_ENABLE -void oled_task_user(void) { +bool oled_task_user(void) { oled_write_ln_P(PSTR("Plaid-Pad ///////////"), false); + return false; } #endif diff --git a/keyboards/minisub/rules.mk b/keyboards/minisub/rules.mk index c45a99d401..7449e0e579 100644 --- a/keyboards/minisub/rules.mk +++ b/keyboards/minisub/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/misterdeck/keymaps/default/keymap.c b/keyboards/misterdeck/keymaps/default/keymap.c index 100afc3935..bd500c6a89 100644 --- a/keyboards/misterdeck/keymaps/default/keymap.c +++ b/keyboards/misterdeck/keymaps/default/keymap.c @@ -1,7 +1,6 @@ #include QMK_KEYBOARD_H #include "quantum.h" -#define _______ KC_TRNS #define NUMPAD TO(_NUMPAD) enum layers { _NUMPAD = 0, diff --git a/keyboards/misterdeck/keymaps/via/keymap.c b/keyboards/misterdeck/keymaps/via/keymap.c index 100afc3935..bd500c6a89 100644 --- a/keyboards/misterdeck/keymaps/via/keymap.c +++ b/keyboards/misterdeck/keymaps/via/keymap.c @@ -1,7 +1,6 @@ #include QMK_KEYBOARD_H #include "quantum.h" -#define _______ KC_TRNS #define NUMPAD TO(_NUMPAD) enum layers { _NUMPAD = 0, diff --git a/keyboards/misterdeck/rules.mk b/keyboards/misterdeck/rules.mk index 7a0120fddf..e701c3a0fb 100644 --- a/keyboards/misterdeck/rules.mk +++ b/keyboards/misterdeck/rules.mk @@ -16,7 +16,7 @@ BOOTLOADER = caterina # LTO_ENABLE = yes -BOOTMAGIC_ENABLE = lite +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/montex/keymaps/vial/rules.mk b/keyboards/montex/keymaps/vial/rules.mk index ed090f3261..e3ea82b9c3 100644 --- a/keyboards/montex/keymaps/vial/rules.mk +++ b/keyboards/montex/keymaps/vial/rules.mk @@ -2,3 +2,4 @@ LTO_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes TAP_DANCE_ENABLE = no +QMK_SETTINGS = no diff --git a/keyboards/murcielago/rev1/keymaps/vial/rules.mk b/keyboards/murcielago/rev1/keymaps/vial/rules.mk index 46f9f1360f..043b69911e 100644 --- a/keyboards/murcielago/rev1/keymaps/vial/rules.mk +++ b/keyboards/murcielago/rev1/keymaps/vial/rules.mk @@ -1,3 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes LTO_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/pancake/rev2/rules.mk b/keyboards/pancake/rev2/rules.mk index f59570c3ef..5b231a4e34 100644 --- a/keyboards/pancake/rev2/rules.mk +++ b/keyboards/pancake/rev2/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/password/keymaps/vial/rules.mk b/keyboards/password/keymaps/vial/rules.mk index 6bc7063adc..3ed0d216fb 100644 --- a/keyboards/password/keymaps/vial/rules.mk +++ b/keyboards/password/keymaps/vial/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes \ No newline at end of file +VIAL_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/pteron36/keymaps/via/rules.mk b/keyboards/pteron36/keymaps/via/rules.mk index e17516d5cf..be508f92a6 100644 --- a/keyboards/pteron36/keymaps/via/rules.mk +++ b/keyboards/pteron36/keymaps/via/rules.mk @@ -2,3 +2,7 @@ LTO_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes VIAL_ENCODERS_ENABLE = yes +QMK_SETTINGS = no +COMBO_ENABLE = no +TAP_DANCE_ENABLE = no +OLED_ENABLE = no diff --git a/keyboards/reviung34/keymaps/vial/rules.mk b/keyboards/reviung34/keymaps/vial/rules.mk index 6c1f0e3e1b..a028b58459 100644 --- a/keyboards/reviung34/keymaps/vial/rules.mk +++ b/keyboards/reviung34/keymaps/vial/rules.mk @@ -11,3 +11,4 @@ RGBLIGHT_ENABLE = yes VIA_ENABLE = yes VIAL_ENABLE = yes QMK_SETTINGS = no +COMBO_ENABLE = no diff --git a/keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk b/keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk index adb928f9bc..bc8e7aad3b 100644 --- a/keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk +++ b/keyboards/runner3680/5x6_5x8/keymaps/vial/rules.mk @@ -4,3 +4,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes QMK_SETTINGS = no TAP_DANCE_ENABLE = no +COMBO_ENABLE = no diff --git a/keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk b/keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk index 8c0cda1b2a..b971612c01 100644 --- a/keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk +++ b/keyboards/sergiopoverony/creator_lite/keymaps/via/rules.mk @@ -2,3 +2,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes VIAL_INSECURE = yes VIAL_ENCODERS_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk b/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk index 8c0cda1b2a..b971612c01 100644 --- a/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk +++ b/keyboards/sergiopoverony/creator_pro/keymaps/via/rules.mk @@ -2,3 +2,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes VIAL_INSECURE = yes VIAL_ENCODERS_ENABLE = yes +QMK_SETTINGS = no diff --git a/keyboards/sofle/keymaps/vial/rules.mk b/keyboards/sofle/keymaps/vial/rules.mk index 743332d609..7a7b730b12 100644 --- a/keyboards/sofle/keymaps/vial/rules.mk +++ b/keyboards/sofle/keymaps/vial/rules.mk @@ -9,3 +9,4 @@ LTO_ENABLE = yes RGBLIGHT_ENABLE = no QMK_SETTINGS = no MOUSEKEY_ENABLE = yes +COMBO_ENABLE = no diff --git a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/rules.mk b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/rules.mk index 4f7618e9b2..46f9f1360f 100644 --- a/keyboards/vial_example/vial_atmega32u4/keymaps/vial/rules.mk +++ b/keyboards/vial_example/vial_atmega32u4/keymaps/vial/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes VIAL_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/vial_example/vial_atmega32u4/rules.mk b/keyboards/vial_example/vial_atmega32u4/rules.mk index 32981133b2..0592d11fd1 100644 --- a/keyboards/vial_example/vial_atmega32u4/rules.mk +++ b/keyboards/vial_example/vial_atmega32u4/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/vial_example/vial_stm32f072/rules.mk b/keyboards/vial_example/vial_stm32f072/rules.mk index 9d7193c3bb..7ddbd0d323 100644 --- a/keyboards/vial_example/vial_stm32f072/rules.mk +++ b/keyboards/vial_example/vial_stm32f072/rules.mk @@ -4,7 +4,7 @@ MCU = STM32F072 # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/vial_example/vial_stm32f103_vibl/rules.mk b/keyboards/vial_example/vial_stm32f103_vibl/rules.mk index f4fbac0913..fb6dfdc883 100644 --- a/keyboards/vial_example/vial_stm32f103_vibl/rules.mk +++ b/keyboards/vial_example/vial_stm32f103_vibl/rules.mk @@ -5,7 +5,7 @@ BOOTLOADER = vibl # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/vial_example/vial_stm32f401/rules.mk b/keyboards/vial_example/vial_stm32f401/rules.mk index 18899be9d3..70e1d1b846 100644 --- a/keyboards/vial_example/vial_stm32f401/rules.mk +++ b/keyboards/vial_example/vial_stm32f401/rules.mk @@ -4,7 +4,7 @@ MCU = STM32F401 # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +BOOTMAGIC_ENABLE = yes MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug