refactor: unify keyboards with upstream

vial-kb · Sep 9, 2023 · 4b79e18 · 4b79e18
1 parent 32252e3
commit 4b79e18
Show file tree

Hide file tree

Showing 21 changed files with 47 additions and 608 deletions.
diff --git a/keyboards/argo_works/ishi/80/mk0_avr/config.h b/keyboards/argo_works/ishi/80/mk0_avr/config.h
diff --git a/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h b/keyboards/argo_works/ishi/80/mk0_avr_extra/config.h
diff --git a/keyboards/cantor/cantor.c b/keyboards/cantor/cantor.c
diff --git a/keyboards/cantor/cantor.h b/keyboards/cantor/cantor.h
diff --git a/keyboards/dotmod/dymium65/config.h b/keyboards/dotmod/dymium65/config.h
@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:keyboards/keychron/q7/ansi/keymaps/vial/config.h
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
-========
 /* Copyright 2023 Finalkey
  * Copyright 2023 LiWenLiu <https://github.com/LiuLiuQMK>
->>>>>>>> qmk/master:keyboards/dotmod/dymium65/config.h
  *
  * 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
@@ -21,15 +17,6 @@
 
 #pragma once
 
-<<<<<<<< HEAD:keyboards/keychron/q7/ansi/keymaps/vial/config.h
-#define VIAL_KEYBOARD_UID {0xF4, 0xB4, 0xCC, 0xD0, 0xA0, 0x27, 0xA9, 0xB3}
-
-#define VIAL_UNLOCK_COMBO_ROWS {0, 2}
-#define VIAL_UNLOCK_COMBO_COLS {0, 13}
-
-/* Set dynamic keymap layer counts to 5 */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-========
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
@@ -43,4 +30,3 @@
 #define RGB_DISABLE_AFTER_TIMEOUT 0
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
->>>>>>>> qmk/master:keyboards/dotmod/dymium65/config.h
diff --git a/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk b/keyboards/durgod/boards/DURGOD_STM32_F070/board.mk
@@ -5,7 +5,7 @@ BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB/board.c
 BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB
 
 # Include mcu configuration
-EXTRAINCDIRS += $(BOARD_PATH)/boards/DURGOD_STM32_F070
+EXTRAINCDIRS = $(BOARD_PATH)/boards/DURGOD_STM32_F070
 
 # Shared variables
 ALLCSRC += $(BOARDSRC)

diff --git a/keyboards/feker/ik75/keymaps/vial/rules.mk b/keyboards/feker/ik75/keymaps/vial/rules.mk
@@ -1,6 +1,7 @@
 VIA_ENABLE = yes
 VIAL_ENABLE = yes
 VIALRGB_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
 
 # Firmware Optimization
 QMK_SETTINGS = no

diff --git a/keyboards/feker/ik75/rules.mk b/keyboards/feker/ik75/rules.mk
@@ -20,4 +20,3 @@ RGB_MATRIX_ENABLE = yes
 
 # Encoder enabled
 ENCODER_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/geekboards/macropad_v2/readme.md b/keyboards/geekboards/macropad_v2/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: https://geekboards.ru
 
 Compile instruction for this keyboard (after setting up your build environment):
 
-    make geekboards/macropad_v2:vial
+    make geekboards/macropad_v2:via
 
 ## Update firmware
 ### Enter bootloader
@@ -27,6 +27,6 @@ Alternatively:
 
 ### Flash
 
-    make geekboards/macropad_v2:vial:flash
+    make geekboards/macropad_v2:via:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/handwired/phantagom/varan/keymaps/via/rules.mk b/keyboards/handwired/phantagom/varan/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-VIAL_ENABLE = yes
diff --git a/keyboards/kb_elmo/sesame/readme.md b/keyboards/kb_elmo/sesame/readme.md
@@ -21,4 +21,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 ## Bootloader
 
 * **Bootmagic reset**: Hold down the top left key and plug in the keyboard
-* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB
+* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB
diff --git a/keyboards/keebwerk/nano_slider/keymaps/via/via.json b/keyboards/keebwerk/nano_slider/keymaps/via/via.json
diff --git a/keyboards/pancake/rev2/config.h b/keyboards/pancake/rev2/config.h
diff --git a/keyboards/planck/rev6_drop/config.h b/keyboards/planck/rev6_drop/config.h
@@ -54,33 +54,4 @@
 #define WS2812_DMA_STREAM STM32_DMA1_STREAM2
 #define WS2812_DMA_CHANNEL 2
 
-// RGB matrix effects
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_BAND_SAT
-#define ENABLE_RGB_MATRIX_BAND_VAL
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#define ENABLE_RGB_MATRIX_CYCLE_ALL
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#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_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_RAINDROPS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#define ENABLE_RGB_MATRIX_HUE_BREATHING
-#define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#define ENABLE_RGB_MATRIX_HUE_WAVE
-#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/planck/rev6_drop/keymaps/vial/config.h b/keyboards/planck/rev6_drop/keymaps/vial/config.h
@@ -2,6 +2,34 @@
 
 #pragma once
 
+#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+#define ENABLE_RGB_MATRIX_BAND_SAT
+#define ENABLE_RGB_MATRIX_BAND_VAL
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#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_RAINBOW_PINWHEELS
+#define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define ENABLE_RGB_MATRIX_HUE_BREATHING
+#define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+
 #define VIAL_KEYBOARD_UID {0x69, 0xAE, 0x4D, 0xB7, 0x4A, 0x77, 0x5C, 0x95}
 #define VIAL_UNLOCK_COMBO_ROWS {0, 4}
 #define VIAL_UNLOCK_COMBO_COLS {0, 5}
diff --git a/keyboards/tw40/config.h b/keyboards/tw40/config.h
@@ -18,4 +18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define LOCKING_SUPPORT_ENABLE
+
 #define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/tw40/rules.mk b/keyboards/tw40/rules.mk
@@ -1 +1,12 @@
-# This file intentionally left blank
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/tweetydabird/lbs4/config.h b/keyboards/tweetydabird/lbs4/config.h
diff --git a/keyboards/tweetydabird/lbs6/config.h b/keyboards/tweetydabird/lbs6/config.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ RGB_MATRIX_ENABLE = yes

		# Encoder enabled
		ENCODER_ENABLE = yes
		ENCODER_MAP_ENABLE = yes
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,4 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
		#pragma once

		#define LOCKING_SUPPORT_ENABLE

		#define LOCKING_RESYNC_ENABLE