Move VIA config to keymap level (#23754)

keyboards/atlantis/ak81_ve/ak81_ve.c

@@ -46,7 +46,7 @@ led_config_t g_led_config = { {
 } };
 #endif
 
-#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
         return false;
@@ -79,4 +79,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
     }
     return true;
 }
-#endif
+#endif

keyboards/bandominedoni/config.h

@@ -75,30 +75,27 @@
 //  RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color().
 // #define ENABLE_RGB_MATRIX_RAINDROPS
 // #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-//  Recommended not to use these.
-#       ifndef VIA_ENABLE
-#           define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#           define ENABLE_RGB_MATRIX_BAND_VAL
-#           define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#           define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#           define ENABLE_RGB_MATRIX_CYCLE_ALL
-#           define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#           define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#           define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#           define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#           define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#           define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#           define ENABLE_RGB_MATRIX_DUAL_BEACON
-#           define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#           define ENABLE_RGB_MATRIX_HUE_BREATHING
-#           define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#           define ENABLE_RGB_MATRIX_HUE_WAVE
-#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#           define ENABLE_RGB_MATRIX_MULTISPLASH
-#           define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#           define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#       endif
+#       define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#       define ENABLE_RGB_MATRIX_BAND_VAL
+#       define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#       define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#       define ENABLE_RGB_MATRIX_CYCLE_ALL
+#       define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#       define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#       define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#       define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#       define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#       define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#       define ENABLE_RGB_MATRIX_DUAL_BEACON
+#       define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#       define ENABLE_RGB_MATRIX_HUE_BREATHING
+#       define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#       define ENABLE_RGB_MATRIX_HUE_WAVE
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#       define ENABLE_RGB_MATRIX_MULTISPLASH
+#       define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
 #   endif  // CONSOLE_ENABLE
 #endif  // RGB_MATRIX_ENABLE
 

keyboards/bandominedoni/keymaps/via/config.h

@@ -13,6 +13,26 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- #pragma once
+#pragma once
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+#undef ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#undef ENABLE_RGB_MATRIX_BAND_VAL
+#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#undef ENABLE_RGB_MATRIX_CYCLE_ALL
+#undef ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#undef ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#undef ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#undef ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#undef ENABLE_RGB_MATRIX_DUAL_BEACON
+#undef ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#undef ENABLE_RGB_MATRIX_HUE_BREATHING
+#undef ENABLE_RGB_MATRIX_HUE_PENDULUM
+#undef ENABLE_RGB_MATRIX_HUE_WAVE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#undef ENABLE_RGB_MATRIX_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS

keyboards/bioi/g60/config.h

@@ -20,6 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 3
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1

keyboards/bioi/g60/keymaps/via/config.h

@@ -0,0 +1,21 @@
+/*
+Copyright 2019 Basic I/O Instruments(Scott Wei) <scot.wei@gmail.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 3
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1

keyboards/bioi/morgan65/config.h

@@ -20,5 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* key combination for magic key command */
 #define KEYBOARD_LOCK_ENABLE
 #define MAGIC_KEY_LOCK L
-
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1

keyboards/bioi/morgan65/keymaps/via/config.h

@@ -0,0 +1,20 @@
+/*
+Copyright 2019 Basic I/O Instruments(Scott Wei) <scot.wei@gmail.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 1

keyboards/cannonkeys/malicious_ergo/config.h

@@ -1,5 +1,3 @@
-#pragma once
-
 /*
 Copyright 2022 Andrew Kannan
 
@@ -28,9 +26,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define WS2812_SPI_SCK_PAL_MODE 0
 #define WS2812_SPI_SCK_PIN B13
 
-// 2 bits for 4 layout options
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
-
 #define SLEEP_LED_GPT_DRIVER GPTD1
 
 /*
@@ -48,6 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-
-
-

keyboards/cannonkeys/malicious_ergo/keymaps/via/config.h

@@ -0,0 +1,21 @@
+/*
+Copyright 2022 Andrew Kannan
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// 2 bits for 4 layout options
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/chlx/str_merro60/config.h

@@ -17,7 +17,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#   define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5
-
-/* VIA related config */
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5

keyboards/chlx/str_merro60/keymaps/via/config.h

@@ -0,0 +1,21 @@
+/*
+Copyright 2022 Alexander Lee <chlx.bsmt@gmail.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/dztech/duo_s/config.h

@@ -17,5 +17,3 @@
 #pragma once
 
 #define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_EFFECT_RAINBOW_MOOD + 6) 
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/dztech/duo_s/keymaps/via/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/dztech/dz64rgb/config.h

@@ -19,5 +19,3 @@
 #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/dztech/dz64rgb/keymaps/via/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2021 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/era/linx3/n8x/config.h

@@ -10,5 +10,3 @@
 /* BACKLIGHT PWM */
 #define BACKLIGHT_PWM_DRIVER PWMD1
 #define BACKLIGHT_PWM_CHANNEL RP2040_PWM_CHANNEL_B
-
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4

keyboards/era/linx3/n8x/keymaps/via/config.h

@@ -0,0 +1,6 @@
+// Copyright 2024 Hyojin Bak (@eerraa)
+// SPDX-License-Identifier: GPL-2.0-or-later
+ 
+#pragma once
+
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 4

keyboards/ilumkb/primus75/config.h

@@ -20,5 +20,3 @@
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/ilumkb/primus75/keymaps/via/config.h

@@ -0,0 +1,18 @@
+/* Copyright 2021 dztech
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/ilumkb/volcano660/config.h

@@ -19,6 +19,3 @@
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
-
-/* VIA related config */
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 4

keyboards/ilumkb/volcano660/keymaps/via/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2020 dztech
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 4

keyboards/kbdfans/baguette66/rgb/config.h

@@ -17,5 +17,3 @@
 #pragma once
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/baguette66/rgb/keymaps/via/config.h

@@ -0,0 +1,19 @@
+/* Copyright 2022 DZTECH <moyi4681@Live.cn>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2

keyboards/kbdfans/baguette66/soldered/config.h

@@ -17,4 +17,3 @@
 #pragma once
 
 #define USB_SUSPEND_WAKEUP_DELAY 5000
-#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2