aboutsummaryrefslogtreecommitdiff
path: root/keyboards/acheron
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/acheron')
-rw-r--r--keyboards/acheron/apollo/87h/delta/config.h9
-rw-r--r--keyboards/acheron/apollo/87h/delta/delta.c4
-rw-r--r--keyboards/acheron/apollo/87h/delta/keyboard.json (renamed from keyboards/acheron/apollo/87h/delta/info.json)15
-rw-r--r--keyboards/acheron/apollo/87h/delta/rules.mk14
-rw-r--r--keyboards/acheron/apollo/87h/gamma/config.h5
-rw-r--r--keyboards/acheron/apollo/87h/gamma/keyboard.json (renamed from keyboards/acheron/apollo/87h/gamma/info.json)17
-rw-r--r--keyboards/acheron/apollo/87h/gamma/rules.mk15
-rw-r--r--keyboards/acheron/apollo/87htsc/87htsc.c4
-rw-r--r--keyboards/acheron/apollo/87htsc/config.h9
-rw-r--r--keyboards/acheron/apollo/87htsc/keyboard.json (renamed from keyboards/acheron/apollo/87htsc/info.json)15
-rw-r--r--keyboards/acheron/apollo/87htsc/rules.mk14
-rw-r--r--keyboards/acheron/apollo/88htsc/config.h9
-rw-r--r--keyboards/acheron/apollo/88htsc/keyboard.json (renamed from keyboards/acheron/apollo/88htsc/info.json)15
-rw-r--r--keyboards/acheron/apollo/88htsc/rules.mk14
-rw-r--r--keyboards/acheron/arctic/config.h39
-rw-r--r--keyboards/acheron/arctic/keyboard.json (renamed from keyboards/acheron/arctic/info.json)14
-rw-r--r--keyboards/acheron/arctic/rules.mk13
-rw-r--r--keyboards/acheron/athena/alpha/alpha.c8
-rw-r--r--keyboards/acheron/athena/alpha/config.h7
-rw-r--r--keyboards/acheron/athena/alpha/keyboard.json (renamed from keyboards/acheron/athena/alpha/info.json)19
-rw-r--r--keyboards/acheron/athena/alpha/rules.mk15
-rw-r--r--keyboards/acheron/athena/beta/beta.c8
-rw-r--r--keyboards/acheron/athena/beta/config.h7
-rw-r--r--keyboards/acheron/athena/beta/keyboard.json (renamed from keyboards/acheron/athena/beta/info.json)19
-rw-r--r--keyboards/acheron/athena/beta/rules.mk15
-rw-r--r--keyboards/acheron/austin/austin.c12
-rw-r--r--keyboards/acheron/austin/config.h5
-rwxr-xr-xkeyboards/acheron/austin/keyboard.json (renamed from keyboards/acheron/austin/info.json)15
-rw-r--r--keyboards/acheron/austin/rules.mk12
-rw-r--r--keyboards/acheron/elongate/beta/config.h39
-rw-r--r--keyboards/acheron/elongate/beta/keyboard.json (renamed from keyboards/acheron/elongate/beta/info.json)18
-rw-r--r--keyboards/acheron/elongate/beta/rules.mk13
-rwxr-xr-xkeyboards/acheron/elongate/delta/config.h5
-rwxr-xr-xkeyboards/acheron/elongate/delta/delta.c32
-rw-r--r--keyboards/acheron/elongate/delta/keyboard.json (renamed from keyboards/acheron/elongate/delta/info.json)16
-rw-r--r--keyboards/acheron/elongate/delta/rules.mk12
-rw-r--r--keyboards/acheron/keebspcb/config.h39
-rw-r--r--keyboards/acheron/keebspcb/keyboard.json (renamed from keyboards/acheron/keebspcb/info.json)14
-rw-r--r--keyboards/acheron/keebspcb/rules.mk12
-rw-r--r--keyboards/acheron/lasgweloth/config.h39
-rw-r--r--keyboards/acheron/lasgweloth/keyboard.json (renamed from keyboards/acheron/lasgweloth/info.json)14
-rw-r--r--keyboards/acheron/lasgweloth/rules.mk14
-rw-r--r--keyboards/acheron/shark/alpha/config.h5
-rw-r--r--keyboards/acheron/shark/alpha/keyboard.json (renamed from keyboards/acheron/shark/alpha/info.json)14
-rw-r--r--keyboards/acheron/shark/alpha/rules.mk14
-rw-r--r--keyboards/acheron/shark/beta/beta.c4
-rw-r--r--keyboards/acheron/shark/beta/config.h7
-rw-r--r--keyboards/acheron/shark/beta/keyboard.json (renamed from keyboards/acheron/shark/beta/info.json)17
-rw-r--r--keyboards/acheron/shark/beta/rules.mk14
-rw-r--r--keyboards/acheron/themis/87h/config.h7
-rw-r--r--keyboards/acheron/themis/87h/keyboard.json (renamed from keyboards/acheron/themis/87h/info.json)9
-rw-r--r--keyboards/acheron/themis/87h/rules.mk0
-rw-r--r--keyboards/acheron/themis/87htsc/config.h7
-rw-r--r--keyboards/acheron/themis/87htsc/keyboard.json (renamed from keyboards/acheron/themis/87htsc/info.json)9
-rw-r--r--keyboards/acheron/themis/87htsc/rules.mk0
-rw-r--r--keyboards/acheron/themis/88htsc/config.h7
-rw-r--r--keyboards/acheron/themis/88htsc/keyboard.json (renamed from keyboards/acheron/themis/88htsc/info.json)9
-rw-r--r--keyboards/acheron/themis/88htsc/rules.mk0
58 files changed, 293 insertions, 464 deletions
diff --git a/keyboards/acheron/apollo/87h/delta/config.h b/keyboards/acheron/apollo/87h/delta/config.h
index 578a443e88..cda883bd63 100644
--- a/keyboards/acheron/apollo/87h/delta/config.h
+++ b/keyboards/acheron/apollo/87h/delta/config.h
@@ -17,16 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/apollo/87h/delta/delta.c b/keyboards/acheron/apollo/87h/delta/delta.c
index 1e79584a9c..b17fce5c3a 100644
--- a/keyboards/acheron/apollo/87h/delta/delta.c
+++ b/keyboards/acheron/apollo/87h/delta/delta.c
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
void board_init(void) {
- setPinInput(B9);
- setPinInput(B10);
+ gpio_set_pin_input(B9);
+ gpio_set_pin_input(B10);
}
led_config_t g_led_config = { {
diff --git a/keyboards/acheron/apollo/87h/delta/info.json b/keyboards/acheron/apollo/87h/delta/keyboard.json
index 729512839f..5d01c1b8f7 100644
--- a/keyboards/acheron/apollo/87h/delta/info.json
+++ b/keyboards/acheron/apollo/87h/delta/keyboard.json
@@ -59,6 +59,21 @@
"driver": "ws2812",
"sleep": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
"rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/87h/delta/rules.mk b/keyboards/acheron/apollo/87h/delta/rules.mk
deleted file mode 100644
index 723724b7aa..0000000000
--- a/keyboards/acheron/apollo/87h/delta/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-
diff --git a/keyboards/acheron/apollo/87h/gamma/config.h b/keyboards/acheron/apollo/87h/gamma/config.h
index 42b27d55ba..8870c3c9c9 100644
--- a/keyboards/acheron/apollo/87h/gamma/config.h
+++ b/keyboards/acheron/apollo/87h/gamma/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
// RGB Matrix defines
diff --git a/keyboards/acheron/apollo/87h/gamma/info.json b/keyboards/acheron/apollo/87h/gamma/keyboard.json
index 150f838c89..5c2087c968 100644
--- a/keyboards/acheron/apollo/87h/gamma/info.json
+++ b/keyboards/acheron/apollo/87h/gamma/keyboard.json
@@ -2,7 +2,10 @@
"keyboard_name": "Apollo87H rev. Gamma",
"usb": {
"pid": "0x8774",
- "device_version": "0.0.3"
+ "device_version": "0.0.3",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"rgb_matrix": {
"animations": {
@@ -57,6 +60,18 @@
"driver": "is31fl3741",
"sleep": true
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B3", "A15", "A10", "A8", "B14", "B12", "B10", "B1", "B0", "A7", "A4", "A5", "A6", "C15", "A0", "A1"],
"rows": ["C14", "C13", "B9", "B4", "A3", "A2"]
diff --git a/keyboards/acheron/apollo/87h/gamma/rules.mk b/keyboards/acheron/apollo/87h/gamma/rules.mk
deleted file mode 100644
index 4af646ec02..0000000000
--- a/keyboards/acheron/apollo/87h/gamma/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-
diff --git a/keyboards/acheron/apollo/87htsc/87htsc.c b/keyboards/acheron/apollo/87htsc/87htsc.c
index de66897f72..4225c34971 100644
--- a/keyboards/acheron/apollo/87htsc/87htsc.c
+++ b/keyboards/acheron/apollo/87htsc/87htsc.c
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "quantum.h"
void board_init(void) {
- setPinInput(B9);
- setPinInput(B10);
+ gpio_set_pin_input(B9);
+ gpio_set_pin_input(B10);
}
led_config_t g_led_config = { {
diff --git a/keyboards/acheron/apollo/87htsc/config.h b/keyboards/acheron/apollo/87htsc/config.h
index 578a443e88..cda883bd63 100644
--- a/keyboards/acheron/apollo/87htsc/config.h
+++ b/keyboards/acheron/apollo/87htsc/config.h
@@ -17,16 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/apollo/87htsc/info.json b/keyboards/acheron/apollo/87htsc/keyboard.json
index 91e2cb320e..55229706b1 100644
--- a/keyboards/acheron/apollo/87htsc/info.json
+++ b/keyboards/acheron/apollo/87htsc/keyboard.json
@@ -63,6 +63,21 @@
"driver": "ws2812",
"sleep": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
"rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/87htsc/rules.mk b/keyboards/acheron/apollo/87htsc/rules.mk
deleted file mode 100644
index 723724b7aa..0000000000
--- a/keyboards/acheron/apollo/87htsc/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-
diff --git a/keyboards/acheron/apollo/88htsc/config.h b/keyboards/acheron/apollo/88htsc/config.h
index 578a443e88..cda883bd63 100644
--- a/keyboards/acheron/apollo/88htsc/config.h
+++ b/keyboards/acheron/apollo/88htsc/config.h
@@ -17,16 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/apollo/88htsc/info.json b/keyboards/acheron/apollo/88htsc/keyboard.json
index 17c12b3beb..9b9482874f 100644
--- a/keyboards/acheron/apollo/88htsc/info.json
+++ b/keyboards/acheron/apollo/88htsc/keyboard.json
@@ -63,6 +63,21 @@
"driver": "ws2812",
"sleep": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgb_matrix": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C8", "C9", "A8", "A10", "C7", "C6", "B14", "B12", "B10", "B1", "C5", "C4", "A7", "B0", "C11", "A3", "B4"],
"rows": ["B3", "D2", "C12", "A6", "A5", "A4"]
diff --git a/keyboards/acheron/apollo/88htsc/rules.mk b/keyboards/acheron/apollo/88htsc/rules.mk
deleted file mode 100644
index 723724b7aa..0000000000
--- a/keyboards/acheron/apollo/88htsc/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
-
diff --git a/keyboards/acheron/arctic/config.h b/keyboards/acheron/arctic/config.h
deleted file mode 100644
index f608132b5a..0000000000
--- a/keyboards/acheron/arctic/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato <[email protected]>
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/arctic/info.json b/keyboards/acheron/arctic/keyboard.json
index 22eb5763bb..cc686be5fa 100644
--- a/keyboards/acheron/arctic/info.json
+++ b/keyboards/acheron/arctic/keyboard.json
@@ -8,6 +8,20 @@
"pid": "0x4152",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B0", "A5", "A4", "A3", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8"],
"rows": ["B7", "B6", "A6", "A7", "B1"]
diff --git a/keyboards/acheron/arctic/rules.mk b/keyboards/acheron/arctic/rules.mk
deleted file mode 100644
index 7f4f202a1b..0000000000
--- a/keyboards/acheron/arctic/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
diff --git a/keyboards/acheron/athena/alpha/alpha.c b/keyboards/acheron/athena/alpha/alpha.c
index 9e4f82f7ad..8fe47eff82 100644
--- a/keyboards/acheron/athena/alpha/alpha.c
+++ b/keyboards/acheron/athena/alpha/alpha.c
@@ -17,8 +17,8 @@
#include "quantum.h"
void board_init(void) {
- setPinInput(B6);
- setPinInput(B7);
+ gpio_set_pin_input(B6);
+ gpio_set_pin_input(B7);
}
void keyboard_post_init_kb(void){
@@ -34,10 +34,10 @@ bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
#ifdef CAPSLOCK_INDICATOR
if(res) {
- writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
+ gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
}
#else
- writePin(LED_CAPS_LOCK_PIN, 0);
+ gpio_write_pin(LED_CAPS_LOCK_PIN, 0);
#endif
return res;
}
diff --git a/keyboards/acheron/athena/alpha/config.h b/keyboards/acheron/athena/alpha/config.h
index ba5c2dedf2..b1264c3fa5 100644
--- a/keyboards/acheron/athena/alpha/config.h
+++ b/keyboards/acheron/athena/alpha/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
@@ -27,8 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
// If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
#define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/alpha/info.json b/keyboards/acheron/athena/alpha/keyboard.json
index 229fd7a8c8..7e29cdc037 100644
--- a/keyboards/acheron/athena/alpha/info.json
+++ b/keyboards/acheron/athena/alpha/keyboard.json
@@ -4,6 +4,25 @@
"pid": "0x6584",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A8", "B14", "B12", "B10", "B1", "B0", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "A7", "B4", "B3", "A15"],
"rows": ["B9", "C13", "B8", "B5", "A14", "C14"]
diff --git a/keyboards/acheron/athena/alpha/rules.mk b/keyboards/acheron/athena/alpha/rules.mk
deleted file mode 100644
index 086e2474ba..0000000000
--- a/keyboards/acheron/athena/alpha/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-ENCODER_ENABLE = no
-
diff --git a/keyboards/acheron/athena/beta/beta.c b/keyboards/acheron/athena/beta/beta.c
index 9ad9c71cc8..fe22128437 100644
--- a/keyboards/acheron/athena/beta/beta.c
+++ b/keyboards/acheron/athena/beta/beta.c
@@ -17,18 +17,18 @@
#include "quantum.h"
void board_init(void) {
- setPinInput(B6);
- setPinInput(B7);
+ gpio_set_pin_input(B6);
+ gpio_set_pin_input(B7);
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
#ifdef CAPSLOCK_INDICATOR
if(res) {
- writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+ gpio_write_pin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
}
#else
- writePin(LED_CAPS_LOCK_PIN, 0);
+ gpio_write_pin(LED_CAPS_LOCK_PIN, 0);
#endif
return res;
}
diff --git a/keyboards/acheron/athena/beta/config.h b/keyboards/acheron/athena/beta/config.h
index 30c29fa686..79add9aedc 100644
--- a/keyboards/acheron/athena/beta/config.h
+++ b/keyboards/acheron/athena/beta/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL+5
@@ -28,8 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
// If this is defined, the caps lock LED will turn on and off according to the state of caps lock. If not, the LED will shine like all other LEDs despite the caps lock state.
#define CAPSLOCK_INDICATOR
diff --git a/keyboards/acheron/athena/beta/info.json b/keyboards/acheron/athena/beta/keyboard.json
index 0730833b9b..ba96b20151 100644
--- a/keyboards/acheron/athena/beta/info.json
+++ b/keyboards/acheron/athena/beta/keyboard.json
@@ -4,6 +4,25 @@
"pid": "0x6585",
"device_version": "0.0.2"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C7", "C6", "B14", "B12", "B10", "B1", "C4", "A7", "A6", "A5", "A4", "A3", "A2", "C5", "A10", "A8", "C9"],
"rows": ["C11", "C12", "C10", "A15", "C0", "A1"]
diff --git a/keyboards/acheron/athena/beta/rules.mk b/keyboards/acheron/athena/beta/rules.mk
deleted file mode 100644
index 086e2474ba..0000000000
--- a/keyboards/acheron/athena/beta/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-ENCODER_ENABLE = no
-
diff --git a/keyboards/acheron/austin/austin.c b/keyboards/acheron/austin/austin.c
index 5c0a4f642d..9a69d1c086 100644
--- a/keyboards/acheron/austin/austin.c
+++ b/keyboards/acheron/austin/austin.c
@@ -1,18 +1,18 @@
#include "quantum.h"
void keyboard_pre_init_kb(void) {
- setPinOutput(A0);
- setPinOutput(A1);
- setPinOutput(A2);
+ gpio_set_pin_output(A0);
+ gpio_set_pin_output(A1);
+ gpio_set_pin_output(A2);
keyboard_pre_init_user();
}
bool led_update_kb(led_t led_state) {
if (led_update_user(led_state)) {
- writePin(A2, led_state.num_lock);
- writePin(A0, led_state.caps_lock);
- writePin(A1, led_state.scroll_lock);
+ gpio_write_pin(A2, led_state.num_lock);
+ gpio_write_pin(A0, led_state.caps_lock);
+ gpio_write_pin(A1, led_state.scroll_lock);
}
return true;
}
diff --git a/keyboards/acheron/austin/config.h b/keyboards/acheron/austin/config.h
index a47b76953a..974ecf1c6c 100644
--- a/keyboards/acheron/austin/config.h
+++ b/keyboards/acheron/austin/config.h
@@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/acheron/austin/info.json b/keyboards/acheron/austin/keyboard.json
index d36258fb92..bee675472c 100755
--- a/keyboards/acheron/austin/info.json
+++ b/keyboards/acheron/austin/keyboard.json
@@ -8,6 +8,21 @@
"pid": "0x4175",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B10", "B11", "B12", "B13", "B14", "B15", "A8", "A9", "A10", "A5", "A15", "B3", "B4", "B5", "B8", "A3", "C15", "C14", "F1"],
"rows": ["C13", "A4", "A7", "B0", "B1", "B2"]
diff --git a/keyboards/acheron/austin/rules.mk b/keyboards/acheron/austin/rules.mk
deleted file mode 100644
index a5089d51a5..0000000000
--- a/keyboards/acheron/austin/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/acheron/elongate/beta/config.h b/keyboards/acheron/elongate/beta/config.h
deleted file mode 100644
index 62093e37b2..0000000000
--- a/keyboards/acheron/elongate/beta/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2020 Gondolindrim
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/keyboard.json
index 2bbb214bd0..d15f178991 100644
--- a/keyboards/acheron/elongate/beta/info.json
+++ b/keyboards/acheron/elongate/beta/keyboard.json
@@ -29,6 +29,24 @@
"ws2812": {
"pin": "D7"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F4", "F1", "F0", "B2", "B1", "C6", "B0", "B3", "E6", "D4", "B4"],
"rows": ["D3", "B7", "D5", "B5", "D6"]
diff --git a/keyboards/acheron/elongate/beta/rules.mk b/keyboards/acheron/elongate/beta/rules.mk
deleted file mode 100644
index 2aff52b20a..0000000000
--- a/keyboards/acheron/elongate/beta/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # 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
-LTO_ENABLE = yes
diff --git a/keyboards/acheron/elongate/delta/config.h b/keyboards/acheron/elongate/delta/config.h
index 81342ef26d..09ccd74164 100755
--- a/keyboards/acheron/elongate/delta/config.h
+++ b/keyboards/acheron/elongate/delta/config.h
@@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 5)
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
// Elongate has six indicator LEDs. These def's are the indicator pin defs. The LEDs are distributed in two clusters: one next to the numpad and another between spacebars; LEDs are numbered top-to-bottom.
#define LED1_PIN A2
diff --git a/keyboards/acheron/elongate/delta/delta.c b/keyboards/acheron/elongate/delta/delta.c
index e621b4495b..98b60bae61 100755
--- a/keyboards/acheron/elongate/delta/delta.c
+++ b/keyboards/acheron/elongate/delta/delta.c
@@ -30,18 +30,18 @@ void led_init_ports(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(LED1_PIN, !led_state.num_lock);
- writePin(LED2_PIN, !led_state.caps_lock);
- writePin(LED3_PIN, !led_state.scroll_lock);
+ gpio_write_pin(LED1_PIN, !led_state.num_lock);
+ gpio_write_pin(LED2_PIN, !led_state.caps_lock);
+ gpio_write_pin(LED3_PIN, !led_state.scroll_lock);
}
return res;
}
// Turns off all bottom LEDs
void turn_off_bottom_leds(void){
- writePin(LED4_PIN, 1);
- writePin(LED5_PIN, 1);
- writePin(LED6_PIN, 1);
+ gpio_write_pin(LED4_PIN, 1);
+ gpio_write_pin(LED5_PIN, 1);
+ gpio_write_pin(LED6_PIN, 1);
}
/*
@@ -53,19 +53,19 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
switch (get_highest_layer(state)) {
// The base layer, or layer zero, will be handled by the default case.
case 1:
- writePin(LED4_PIN, 1);
- writePin(LED5_PIN, 0);
- writePin(LED6_PIN, 1);
+ gpio_write_pin(LED4_PIN, 1);
+ gpio_write_pin(LED5_PIN, 0);
+ gpio_write_pin(LED6_PIN, 1);
break;
case 2:
- writePin(LED4_PIN, 1);
- writePin(LED5_PIN, 1);
- writePin(LED6_PIN, 0);
+ gpio_write_pin(LED4_PIN, 1);
+ gpio_write_pin(LED5_PIN, 1);
+ gpio_write_pin(LED6_PIN, 0);
break;
default:
- writePin(LED4_PIN, 0);
- writePin(LED5_PIN, 1);
- writePin(LED6_PIN, 1);
+ gpio_write_pin(LED4_PIN, 0);
+ gpio_write_pin(LED5_PIN, 1);
+ gpio_write_pin(LED6_PIN, 1);
break;
}
return state;
@@ -73,5 +73,5 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
// Since the keyboard starts at layer 0, the init function starts LED4 as lit up.
void keyboard_post_init_kb(void){
- writePin(LED4_PIN, 0);
+ gpio_write_pin(LED4_PIN, 0);
}
diff --git a/keyboards/acheron/elongate/delta/info.json b/keyboards/acheron/elongate/delta/keyboard.json
index 19991ecb86..1c6d0927d6 100644
--- a/keyboards/acheron/elongate/delta/info.json
+++ b/keyboards/acheron/elongate/delta/keyboard.json
@@ -8,6 +8,22 @@
"pid": "0x454D",
"device_version": "0.0.2"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A10", "A9", "A8", "B14", "B12", "B11", "B10", "B2", "B1", "A7", "A5", "B9", "B8", "B7", "B6"],
"rows": ["B3", "A15", "B0", "B4", "B5"]
diff --git a/keyboards/acheron/elongate/delta/rules.mk b/keyboards/acheron/elongate/delta/rules.mk
deleted file mode 100644
index 3d5cb57ad5..0000000000
--- a/keyboards/acheron/elongate/delta/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/acheron/keebspcb/config.h b/keyboards/acheron/keebspcb/config.h
deleted file mode 100644
index 4b007cf387..0000000000
--- a/keyboards/acheron/keebspcb/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Jun Wako <[email protected]>
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/keebspcb/info.json b/keyboards/acheron/keebspcb/keyboard.json
index 9609611059..a4815e1014 100644
--- a/keyboards/acheron/keebspcb/info.json
+++ b/keyboards/acheron/keebspcb/keyboard.json
@@ -8,6 +8,20 @@
"pid": "0x4B45",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B12", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "B8", "B7", "B6", "B5"],
"rows": ["B4", "B3", "A2", "A3", "A4"]
diff --git a/keyboards/acheron/keebspcb/rules.mk b/keyboards/acheron/keebspcb/rules.mk
deleted file mode 100644
index 5356b24d77..0000000000
--- a/keyboards/acheron/keebspcb/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/acheron/lasgweloth/config.h b/keyboards/acheron/lasgweloth/config.h
deleted file mode 100644
index f608132b5a..0000000000
--- a/keyboards/acheron/lasgweloth/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2015 Álvaro "Gondolindrim" Volpato <[email protected]>
-
-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
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/acheron/lasgweloth/info.json b/keyboards/acheron/lasgweloth/keyboard.json
index 653af34452..35d30e89b2 100644
--- a/keyboards/acheron/lasgweloth/info.json
+++ b/keyboards/acheron/lasgweloth/keyboard.json
@@ -8,6 +8,20 @@
"pid": "0x7641",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B12", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5", "A4", "B7"],
"rows": ["B9", "B8", "A3", "B0", "B1"]
diff --git a/keyboards/acheron/lasgweloth/rules.mk b/keyboards/acheron/lasgweloth/rules.mk
deleted file mode 100644
index 5b6b0c9299..0000000000
--- a/keyboards/acheron/lasgweloth/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no
-
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index a34ea41cff..0786a3ac0e 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/keyboards/acheron/shark/alpha/config.h
@@ -19,11 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_PWM_DRIVER PWMD3
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/acheron/shark/alpha/info.json b/keyboards/acheron/shark/alpha/keyboard.json
index 5250da4727..f88c312a25 100644
--- a/keyboards/acheron/shark/alpha/info.json
+++ b/keyboards/acheron/shark/alpha/keyboard.json
@@ -6,6 +6,20 @@
"pid": "0x5368",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "encoder": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["B1", "B12", "A1", "A7", "A5", "A4", "A3", "A2", "A0", "C15", "C14", "C13"],
"rows": ["B4", "A15", "B10", "B2"]
diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk
index 27db06a044..1605120646 100644
--- a/keyboards/acheron/shark/alpha/rules.mk
+++ b/keyboards/acheron/shark/alpha/rules.mk
@@ -1,17 +1,3 @@
-# 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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-
# Disable unsupported hardware
RGBLIGHT_SUPPORTED = no
AUDIO_SUPPORTED = no
diff --git a/keyboards/acheron/shark/beta/beta.c b/keyboards/acheron/shark/beta/beta.c
index 5592353ad7..647dac60b7 100644
--- a/keyboards/acheron/shark/beta/beta.c
+++ b/keyboards/acheron/shark/beta/beta.c
@@ -17,6 +17,6 @@
#include "quantum.h"
void board_init(void) {
- setPinInput(B6);
- setPinInput(B7);
+ gpio_set_pin_input(B6);
+ gpio_set_pin_input(B7);
}
diff --git a/keyboards/acheron/shark/beta/config.h b/keyboards/acheron/shark/beta/config.h
index d862fd016d..4e1b46d085 100644
--- a/keyboards/acheron/shark/beta/config.h
+++ b/keyboards/acheron/shark/beta/config.h
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
@@ -27,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
#define EEPROM_I2C_24LC256
diff --git a/keyboards/acheron/shark/beta/info.json b/keyboards/acheron/shark/beta/keyboard.json
index 7daab0a2c0..2433f61fec 100644
--- a/keyboards/acheron/shark/beta/info.json
+++ b/keyboards/acheron/shark/beta/keyboard.json
@@ -4,6 +4,23 @@
"pid": "0x5369",
"device_version": "0.0.2"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["A5", "A10", "C13", "B9", "B8", "B5", "B4", "B3", "A15", "A0", "A1", "A2"],
"rows": ["A8", "B14", "A4", "A3"]
diff --git a/keyboards/acheron/shark/beta/rules.mk b/keyboards/acheron/shark/beta/rules.mk
deleted file mode 100644
index 94335efa29..0000000000
--- a/keyboards/acheron/shark/beta/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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 = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = no
-ENCODER_ENABLE = yes
diff --git a/keyboards/acheron/themis/87h/config.h b/keyboards/acheron/themis/87h/config.h
index ed1229c779..ebe7e5398a 100644
--- a/keyboards/acheron/themis/87h/config.h
+++ b/keyboards/acheron/themis/87h/config.h
@@ -17,12 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/themis/87h/info.json b/keyboards/acheron/themis/87h/keyboard.json
index a7bfb89997..488cb324c1 100644
--- a/keyboards/acheron/themis/87h/info.json
+++ b/keyboards/acheron/themis/87h/keyboard.json
@@ -16,12 +16,15 @@
"mousekey": true,
"extrakey": true,
"console": false,
- "backlight": false,
"rgblight": true,
- "audio": false,
- "encoder": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"eeprom": {
"wear_leveling": {
diff --git a/keyboards/acheron/themis/87h/rules.mk b/keyboards/acheron/themis/87h/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/acheron/themis/87h/rules.mk
+++ /dev/null
diff --git a/keyboards/acheron/themis/87htsc/config.h b/keyboards/acheron/themis/87htsc/config.h
index ed1229c779..ebe7e5398a 100644
--- a/keyboards/acheron/themis/87htsc/config.h
+++ b/keyboards/acheron/themis/87htsc/config.h
@@ -17,12 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/themis/87htsc/info.json b/keyboards/acheron/themis/87htsc/keyboard.json
index 5f38814789..46cdb09247 100644
--- a/keyboards/acheron/themis/87htsc/info.json
+++ b/keyboards/acheron/themis/87htsc/keyboard.json
@@ -16,12 +16,15 @@
"mousekey": true,
"extrakey": true,
"console": false,
- "backlight": false,
"rgblight": true,
- "audio": false,
- "encoder": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"eeprom": {
"wear_leveling": {
diff --git a/keyboards/acheron/themis/87htsc/rules.mk b/keyboards/acheron/themis/87htsc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/acheron/themis/87htsc/rules.mk
+++ /dev/null
diff --git a/keyboards/acheron/themis/88htsc/config.h b/keyboards/acheron/themis/88htsc/config.h
index ed1229c779..ebe7e5398a 100644
--- a/keyboards/acheron/themis/88htsc/config.h
+++ b/keyboards/acheron/themis/88htsc/config.h
@@ -17,12 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define WS2812_PWM_COMPLEMENTARY_OUTPUT
#define WS2812_PWM_DRIVER PWMD1
#define WS2812_PWM_CHANNEL 3
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA2_STREAM5
-#define WS2812_DMA_CHANNEL 6
+#define WS2812_PWM_DMA_STREAM STM32_DMA2_STREAM5
+#define WS2812_PWM_DMA_CHANNEL 6
diff --git a/keyboards/acheron/themis/88htsc/info.json b/keyboards/acheron/themis/88htsc/keyboard.json
index 20b3d38828..1e193d2661 100644
--- a/keyboards/acheron/themis/88htsc/info.json
+++ b/keyboards/acheron/themis/88htsc/keyboard.json
@@ -16,12 +16,15 @@
"mousekey": true,
"extrakey": true,
"console": false,
- "backlight": false,
"rgblight": true,
- "audio": false,
- "encoder": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"diode_direction": "COL2ROW",
"eeprom": {
"wear_leveling": {
diff --git a/keyboards/acheron/themis/88htsc/rules.mk b/keyboards/acheron/themis/88htsc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/acheron/themis/88htsc/rules.mk
+++ /dev/null