aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json (renamed from keyboards/mechlovin/adelais/rgb_led/rev1/info.json)9
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json (renamed from keyboards/mechlovin/adelais/rgb_led/rev2/info.json)11
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk3
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json (renamed from keyboards/mechlovin/adelais/rgb_led/rev3/info.json)11
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk8
-rw-r--r--keyboards/mechlovin/adelais/rgb_led/rules.mk4
-rw-r--r--keyboards/mechlovin/adelais/rules.mk11
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json)10
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json)11
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk1
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json15
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json5
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json16
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json)10
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c271
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk4
-rw-r--r--keyboards/mechlovin/adelais/standard_led/rules.mk4
-rw-r--r--keyboards/mechlovin/delphine/mono_led/keyboard.json (renamed from keyboards/mechlovin/delphine/mono_led/info.json)8
-rw-r--r--keyboards/mechlovin/delphine/mono_led/rules.mk2
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/keyboard.json (renamed from keyboards/mechlovin/delphine/rgb_led/info.json)7
-rw-r--r--keyboards/mechlovin/delphine/rgb_led/rules.mk2
-rw-r--r--keyboards/mechlovin/delphine/rules.mk13
-rw-r--r--keyboards/mechlovin/foundation/keyboard.json (renamed from keyboards/mechlovin/foundation/info.json)10
-rw-r--r--keyboards/mechlovin/foundation/rules.mk13
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/keyboard.json (renamed from keyboards/mechlovin/hannah60rgb/rev1/info.json)9
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/keyboard.json (renamed from keyboards/mechlovin/hannah60rgb/rev2/info.json)10
-rw-r--r--keyboards/mechlovin/hannah60rgb/rev2/rules.mk2
-rw-r--r--keyboards/mechlovin/hannah60rgb/rules.mk12
-rw-r--r--keyboards/mechlovin/hannah65/rev1/haus/keyboard.json (renamed from keyboards/mechlovin/hannah65/rev1/haus/info.json)9
-rw-r--r--keyboards/mechlovin/hannah65/rev1/haus/rules.mk0
-rw-r--r--keyboards/mechlovin/hannah65/rules.mk13
-rw-r--r--keyboards/mechlovin/hannah910/hannah910.c22
-rw-r--r--keyboards/mechlovin/hannah910/rev1/keyboard.json (renamed from keyboards/mechlovin/hannah910/rev1/info.json)7
-rw-r--r--keyboards/mechlovin/hannah910/rev1/rules.mk12
-rw-r--r--keyboards/mechlovin/hannah910/rev2/keyboard.json (renamed from keyboards/mechlovin/hannah910/rev2/info.json)7
-rw-r--r--keyboards/mechlovin/hannah910/rev2/rules.mk12
-rw-r--r--keyboards/mechlovin/hannah910/rev3/keyboard.json (renamed from keyboards/mechlovin/hannah910/rev3/info.json)7
-rw-r--r--keyboards/mechlovin/hannah910/rev3/rules.mk12
-rw-r--r--keyboards/mechlovin/hex4b/rev1/keyboard.json (renamed from keyboards/mechlovin/hex4b/rev1/info.json)6
-rw-r--r--keyboards/mechlovin/hex4b/rev1/rules.mk13
-rw-r--r--keyboards/mechlovin/hex4b/rev2/keyboard.json (renamed from keyboards/mechlovin/hex4b/rev2/info.json)9
-rw-r--r--keyboards/mechlovin/hex4b/rev2/rules.mk12
-rw-r--r--keyboards/mechlovin/hex6c/keyboard.json (renamed from keyboards/mechlovin/hex6c/info.json)9
-rw-r--r--keyboards/mechlovin/hex6c/rules.mk11
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json (renamed from keyboards/mechlovin/infinity87/rev1/rogue87/info.json)6
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk1
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json (renamed from keyboards/mechlovin/infinity87/rev1/rouge87/info.json)6
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk1
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rules.mk2
-rw-r--r--keyboards/mechlovin/infinity87/rev1/standard/keyboard.json (renamed from keyboards/mechlovin/infinity87/rev1/standard/info.json)10
-rw-r--r--keyboards/mechlovin/infinity87/rev1/standard/rules.mk1
-rw-r--r--keyboards/mechlovin/infinity87/rev2/keyboard.json (renamed from keyboards/mechlovin/infinity87/rev2/info.json)8
-rw-r--r--keyboards/mechlovin/infinity87/rev2/matrix.c295
-rw-r--r--keyboards/mechlovin/infinity87/rev2/rules.mk8
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json (renamed from keyboards/mechlovin/infinity87/rgb_rev1/info.json)9
-rw-r--r--keyboards/mechlovin/infinity87/rgb_rev1/rules.mk1
-rw-r--r--keyboards/mechlovin/infinity87/rules.mk14
-rw-r--r--keyboards/mechlovin/infinity875/keyboard.json (renamed from keyboards/mechlovin/infinity875/info.json)6
-rw-r--r--keyboards/mechlovin/infinity875/matrix.c295
-rw-r--r--keyboards/mechlovin/infinity875/rules.mk13
-rw-r--r--keyboards/mechlovin/infinity88/keyboard.json (renamed from keyboards/mechlovin/infinity88/info.json)10
-rw-r--r--keyboards/mechlovin/infinity88/rules.mk11
-rw-r--r--keyboards/mechlovin/infinityce/infinityce.c4
-rw-r--r--keyboards/mechlovin/infinityce/keyboard.json (renamed from keyboards/mechlovin/infinityce/info.json)10
-rw-r--r--keyboards/mechlovin/infinityce/rules.mk12
-rw-r--r--keyboards/mechlovin/jay60/keyboard.json (renamed from keyboards/mechlovin/jay60/info.json)5
-rw-r--r--keyboards/mechlovin/jay60/rules.mk13
-rw-r--r--keyboards/mechlovin/kanu/kanu.c16
-rw-r--r--keyboards/mechlovin/kanu/keyboard.json (renamed from keyboards/mechlovin/kanu/info.json)10
-rw-r--r--keyboards/mechlovin/kanu/rules.mk12
-rw-r--r--keyboards/mechlovin/kay60/keyboard.json (renamed from keyboards/mechlovin/kay60/info.json)9
-rw-r--r--keyboards/mechlovin/kay60/rules.mk12
-rw-r--r--keyboards/mechlovin/kay65/kay65.c2
-rw-r--r--keyboards/mechlovin/kay65/keyboard.json (renamed from keyboards/mechlovin/kay65/info.json)9
-rw-r--r--keyboards/mechlovin/kay65/rules.mk12
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/keyboard.json (renamed from keyboards/mechlovin/mechlovin9/rev1/info.json)12
-rw-r--r--keyboards/mechlovin/mechlovin9/rev1/rules.mk6
-rw-r--r--keyboards/mechlovin/mechlovin9/rev2/keyboard.json (renamed from keyboards/mechlovin/mechlovin9/rev2/info.json)3
-rw-r--r--keyboards/mechlovin/mechlovin9/rev3/keyboard.json (renamed from keyboards/mechlovin/mechlovin9/rev3/info.json)4
-rw-r--r--keyboards/mechlovin/mechlovin9/rev3/rules.mk0
-rw-r--r--keyboards/mechlovin/mechlovin9/rules.mk14
-rw-r--r--keyboards/mechlovin/olly/bb/bb.c20
-rw-r--r--keyboards/mechlovin/olly/bb/keyboard.json (renamed from keyboards/mechlovin/olly/bb/info.json)7
-rw-r--r--keyboards/mechlovin/olly/bb/matrix.c304
-rw-r--r--keyboards/mechlovin/olly/bb/rules.mk13
-rw-r--r--keyboards/mechlovin/olly/jf/info.json9
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/keyboard.json (renamed from keyboards/mechlovin/olly/jf/rev1/info.json)6
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/matrix.c323
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/rev1.c26
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/keyboard.json (renamed from keyboards/mechlovin/olly/jf/rev2/info.json)10
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/rules.mk1
-rw-r--r--keyboards/mechlovin/olly/octagon/halconf.h2
-rw-r--r--keyboards/mechlovin/olly/octagon/keyboard.json (renamed from keyboards/mechlovin/olly/octagon/info.json)17
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c9
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/default/readme.md1
-rw-r--r--keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c33
-rw-r--r--keyboards/mechlovin/olly/octagon/mcuconf.h1
-rw-r--r--keyboards/mechlovin/olly/octagon/octagon.c53
-rw-r--r--keyboards/mechlovin/olly/octagon/readme.md4
-rw-r--r--keyboards/mechlovin/olly/octagon/rules.mk14
-rw-r--r--keyboards/mechlovin/olly/orion/keyboard.json (renamed from keyboards/mechlovin/olly/orion/info.json)9
-rw-r--r--keyboards/mechlovin/olly/orion/orion.c20
-rw-r--r--keyboards/mechlovin/olly/orion/rules.mk13
-rw-r--r--keyboards/mechlovin/pisces/keyboard.json (renamed from keyboards/mechlovin/pisces/info.json)10
-rw-r--r--keyboards/mechlovin/pisces/rules.mk12
-rw-r--r--keyboards/mechlovin/serratus/keyboard.json (renamed from keyboards/mechlovin/serratus/info.json)8
-rw-r--r--keyboards/mechlovin/serratus/matrix.c295
-rw-r--r--keyboards/mechlovin/serratus/rules.mk12
-rw-r--r--keyboards/mechlovin/th1800/keyboard.json (renamed from keyboards/mechlovin/th1800/info.json)5
-rw-r--r--keyboards/mechlovin/th1800/rules.mk13
-rw-r--r--keyboards/mechlovin/tmkl/keyboard.json (renamed from keyboards/mechlovin/tmkl/info.json)9
-rw-r--r--keyboards/mechlovin/tmkl/rules.mk11
-rw-r--r--keyboards/mechlovin/zed1800/info.json9
-rw-r--r--keyboards/mechlovin/zed1800/oreum/keyboard.json (renamed from keyboards/mechlovin/zed1800/oreum/info.json)8
-rw-r--r--keyboards/mechlovin/zed1800/oreum/rules.mk0
-rw-r--r--keyboards/mechlovin/zed1800/rules.mk2
-rw-r--r--keyboards/mechlovin/zed1800/saber/keyboard.json (renamed from keyboards/mechlovin/zed1800/saber/info.json)8
-rw-r--r--keyboards/mechlovin/zed1800/saber/rules.mk0
-rw-r--r--keyboards/mechlovin/zed1800/zepsody/keyboard.json (renamed from keyboards/mechlovin/zed1800/zepsody/info.json)8
-rw-r--r--keyboards/mechlovin/zed1800/zepsody/rules.mk0
-rw-r--r--keyboards/mechlovin/zed60/keyboard.json (renamed from keyboards/mechlovin/zed60/info.json)9
-rw-r--r--keyboards/mechlovin/zed60/rules.mk12
-rw-r--r--keyboards/mechlovin/zed65/910/keyboard.json (renamed from keyboards/mechlovin/zed65/910/info.json)6
-rw-r--r--keyboards/mechlovin/zed65/910/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/info.json9
-rw-r--r--keyboards/mechlovin/zed65/mono_led/keyboard.json (renamed from keyboards/mechlovin/zed65/mono_led/info.json)10
-rw-r--r--keyboards/mechlovin/zed65/mono_led/rules.mk4
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json (renamed from keyboards/mechlovin/zed65/no_backlight/cor65/info.json)0
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk0
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json (renamed from keyboards/mechlovin/zed65/no_backlight/retro66/info.json)8
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/rules.mk2
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json (renamed from keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json)8
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk1
-rw-r--r--keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c2
-rw-r--r--keyboards/mechlovin/zed65/rev1/keyboard.json (renamed from keyboards/mechlovin/zed65/rev1/info.json)5
-rw-r--r--keyboards/mechlovin/zed65/rev1/rules.mk1
144 files changed, 1419 insertions, 1488 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
index af68bb8457..01232b07e8 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev1/keyboard.json
@@ -3,6 +3,15 @@
"usb": {
"pid": "0xAEC1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
deleted file mode 100644
index aad92997d0..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
index fb88cb359d..a8633af5da 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev2/keyboard.json
@@ -3,6 +3,17 @@
"usb": {
"pid": "0xAEC2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true,
+ "encoder": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
deleted file mode 100644
index e79b2862e6..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
index 62acf349c0..628eb404a5 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/keyboard.json
@@ -3,6 +3,17 @@
"usb": {
"pid": "0xAEC3"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true,
+ "encoder": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
deleted file mode 100644
index e144301381..0000000000
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
diff --git a/keyboards/mechlovin/adelais/rgb_led/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rules.mk
index 8a9bdd433d..18047f12c7 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rules.mk
+++ b/keyboards/mechlovin/adelais/rgb_led/rules.mk
@@ -1,3 +1 @@
-
-
-DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1 \ No newline at end of file
+DEFAULT_FOLDER = mechlovin/adelais/rgb_led/rev1
diff --git a/keyboards/mechlovin/adelais/rules.mk b/keyboards/mechlovin/adelais/rules.mk
index 264ea93322..a1d2ba038d 100644
--- a/keyboards/mechlovin/adelais/rules.mk
+++ b/keyboards/mechlovin/adelais/rules.mk
@@ -1,12 +1 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
index 9a2a280c10..53005dfa33 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
@@ -2,6 +2,16 @@
"usb": {
"pid": "0xAD01"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"processor": "STM32F303",
"board": "QMK_PROTON_C",
"bootloader": "stm32-dfu",
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
index 46907dc7a9..1129500790 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/keyboard.json
@@ -2,6 +2,17 @@
"usb": {
"pid": "0xAD02"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ },
"encoder": {
"rotary": [
{"pin_a": "A6", "pin_b": "A5"},
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
deleted file mode 100644
index cf993be247..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "processor": "STM32F103",
- "bootloader": "stm32duino"
-}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
new file mode 100644
index 0000000000..f6b79e35d0
--- /dev/null
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
@@ -0,0 +1,15 @@
+{
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ }
+}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
index 257dd3bf57..d348ae660f 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
@@ -1,3 +1 @@
-ENCODER_ENABLE = yes
-
DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
deleted file mode 100644
index 774c3dcf31..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "processor": "STM32F303",
- "board": "QMK_PROTON_C",
- "bootloader": "stm32-dfu"
-}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
new file mode 100644
index 0000000000..9e9748fa93
--- /dev/null
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
@@ -0,0 +1,16 @@
+{
+ "processor": "STM32F303",
+ "board": "QMK_PROTON_C",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true,
+ "encoder": true
+ }
+}
diff --git a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
index 95aac7b0d4..3758a8f085 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/keyboard.json
@@ -3,6 +3,16 @@
"usb": {
"pid": "0xAD04"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": false,
+ "command": false,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2"},
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
index 37046790fe..c7807bbc90 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifdef DIRECT_PINS
static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
@@ -40,7 +37,7 @@ static void init_pins(void) {
for (int col = 0; col < MATRIX_COLS; col++) {
pin_t pin = direct_pins[row][col];
if (pin != NO_PIN) {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
}
@@ -53,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
pin_t pin = direct_pins[current_row][col_index];
if (pin != NO_PIN) {
- current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
}
@@ -100,94 +97,94 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinHigh(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F5);
break;
case 1:
- writePinLow(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinHigh(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F5);
break;
case 2:
- writePinLow(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinHigh(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F5);
break;
case 3:
- writePinHigh(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinHigh(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F5);
break;
case 4:
- writePinHigh(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinHigh(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F5);
break;
case 5:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinHigh(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F5);
break;
case 6:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinHigh(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F6);
break;
case 7:
- writePinLow(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinHigh(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F6);
break;
case 8:
- writePinLow(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinHigh(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F6);
break;
case 9:
- writePinLow(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinHigh(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F6);
break;
case 10:
- writePinLow(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinHigh(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F6);
break;
case 11:
- writePinHigh(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinHigh(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F6);
break;
case 12:
- writePinHigh(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinHigh(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F6);
break;
case 13:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinHigh(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F6);
break;
case 14:
- writePinLow(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinHigh(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F5);
break;
}
}
@@ -195,94 +192,94 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinLow(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F5);
break;
case 1:
- writePinHigh(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinLow(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F5);
break;
case 2:
- writePinHigh(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinLow(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F5);
break;
case 3:
- writePinLow(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinLow(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F5);
break;
case 4:
- writePinLow(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinLow(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F5);
break;
case 5:
- writePinLow(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinLow(F5);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F5);
break;
case 6:
- writePinLow(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinLow(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F6);
break;
case 7:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinLow(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F6);
break;
case 8:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinLow(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F6);
break;
case 9:
- writePinHigh(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinLow(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F6);
break;
case 10:
- writePinHigh(F4);
- writePinLow(F1);
- writePinLow(F0);
- writePinLow(F6);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F6);
break;
case 11:
- writePinLow(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinLow(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F6);
break;
case 12:
- writePinLow(F4);
- writePinHigh(F1);
- writePinLow(F0);
- writePinLow(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F6);
break;
case 13:
- writePinLow(F4);
- writePinLow(F1);
- writePinHigh(F0);
- writePinLow(F6);
+ gpio_write_pin_low(F4);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F6);
break;
case 14:
- writePinHigh(F4);
- writePinHigh(F1);
- writePinHigh(F0);
- writePinLow(F5);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F5);
break;
}
}
@@ -290,23 +287,23 @@ static void unselect_col(uint8_t col) {
static void unselect_cols(void) {
//Demultiplexer
- writePinHigh(F0);
- writePinHigh(F1);
- writePinHigh(F4);
- writePinLow(F5);
- writePinLow(F6);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
+ gpio_write_pin_high(F4);
+ gpio_write_pin_low(F5);
+ gpio_write_pin_low(F6);
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
- setPinOutput(F0);
- setPinOutput(F1);
- setPinOutput(F4);
- setPinOutput(F5);
- setPinOutput(F6);
+ gpio_set_pin_output(F0);
+ gpio_set_pin_output(F1);
+ gpio_set_pin_output(F4);
+ gpio_set_pin_output(F5);
+ gpio_set_pin_output(F6);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -322,7 +319,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
index c807f2ad09..179d02c3c6 100644
--- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/rules.mk
@@ -1,7 +1,3 @@
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/mechlovin/adelais/standard_led/rules.mk b/keyboards/mechlovin/adelais/standard_led/rules.mk
index 271c6a9179..a1d2ba038d 100644
--- a/keyboards/mechlovin/adelais/standard_led/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/rules.mk
@@ -1,5 +1 @@
-
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev2
diff --git a/keyboards/mechlovin/delphine/mono_led/info.json b/keyboards/mechlovin/delphine/mono_led/keyboard.json
index e1b90d1191..06fa071159 100644
--- a/keyboards/mechlovin/delphine/mono_led/info.json
+++ b/keyboards/mechlovin/delphine/mono_led/keyboard.json
@@ -3,6 +3,14 @@
"pid": "0xDEF1",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/mechlovin/delphine/mono_led/rules.mk b/keyboards/mechlovin/delphine/mono_led/rules.mk
deleted file mode 100644
index ed572b0bbf..0000000000
--- a/keyboards/mechlovin/delphine/mono_led/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow \ No newline at end of file
diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
index 6a0b8df2cf..35a163c05f 100644
--- a/keyboards/mechlovin/delphine/rgb_led/info.json
+++ b/keyboards/mechlovin/delphine/rgb_led/keyboard.json
@@ -3,6 +3,13 @@
"pid": "0xDEF2",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk
deleted file mode 100644
index 5c624bc68f..0000000000
--- a/keyboards/mechlovin/delphine/rgb_led/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/mechlovin/delphine/rules.mk b/keyboards/mechlovin/delphine/rules.mk
index ef29542a93..819bce1cd3 100644
--- a/keyboards/mechlovin/delphine/rules.mk
+++ b/keyboards/mechlovin/delphine/rules.mk
@@ -1,14 +1 @@
-# 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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = mechlovin/delphine/mono_led
diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/keyboard.json
index bec0c883c5..3bd05add2f 100644
--- a/keyboards/mechlovin/foundation/info.json
+++ b/keyboards/mechlovin/foundation/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x0180",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A15", "B9", "B8", "B7", "B6", "B5", "B4", "B3"],
"rows": ["B12", "B13", "B14", "A8", "A2"]
diff --git a/keyboards/mechlovin/foundation/rules.mk b/keyboards/mechlovin/foundation/rules.mk
deleted file mode 100644
index c0fdd8a2ce..0000000000
--- a/keyboards/mechlovin/foundation/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 = yes # Enable keyboard RGB underglow
-ENCODER_ENABLE = yes
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
index 6a3510c7df..4fb4dc2eef 100644
--- a/keyboards/mechlovin/hannah60rgb/rev1/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev1/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"ws2812": {
"pin": "A15"
},
diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
deleted file mode 100644
index aad92997d0..0000000000
--- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
index e6be250311..06bb71a348 100644
--- a/keyboards/mechlovin/hannah60rgb/rev2/info.json
+++ b/keyboards/mechlovin/hannah60rgb/rev2/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6002",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgblight": true,
+ "rgb_matrix": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
deleted file mode 100644
index e1f93c7525..0000000000
--- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/mechlovin/hannah60rgb/rules.mk b/keyboards/mechlovin/hannah60rgb/rules.mk
index 65e5f070fb..e876a56afb 100644
--- a/keyboards/mechlovin/hannah60rgb/rules.mk
+++ b/keyboards/mechlovin/hannah60rgb/rules.mk
@@ -1,13 +1 @@
-# 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
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = mechlovin/hannah60rgb/rev1
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
index ac97de5f18..7a935fc1a5 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/info.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6500",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/rules.mk b/keyboards/mechlovin/hannah65/rev1/haus/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/hannah65/rev1/haus/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/hannah65/rules.mk b/keyboards/mechlovin/hannah65/rules.mk
index e01e6c73da..ae9bc176a4 100644
--- a/keyboards/mechlovin/hannah65/rules.mk
+++ b/keyboards/mechlovin/hannah65/rules.mk
@@ -1,14 +1 @@
-# 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
-
DEFAULT_FOLDER = mechlovin/hannah65/rev1/haus
diff --git a/keyboards/mechlovin/hannah910/hannah910.c b/keyboards/mechlovin/hannah910/hannah910.c
index 0208e16348..c372c98ce0 100644
--- a/keyboards/mechlovin/hannah910/hannah910.c
+++ b/keyboards/mechlovin/hannah910/hannah910.c
@@ -16,17 +16,17 @@
#include "quantum.h"
void led_init_ports(void) {
- setPinOutput(B2);
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(D2);
+ gpio_set_pin_output(B2);
+ gpio_set_pin_output(D0);
+ gpio_set_pin_output(D1);
+ gpio_set_pin_output(D2);
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(B2, led_state.caps_lock);
+ gpio_write_pin(B2, led_state.caps_lock);
}
return res;
}
@@ -35,22 +35,22 @@ layer_state_t layer_state_set_user(layer_state_t state)
{
// if on layer 1, turn on D2 LED, otherwise off.
if (get_highest_layer(state) == 1) {
- writePinHigh(D2);
+ gpio_write_pin_high(D2);
} else {
- writePinLow(D2);
+ gpio_write_pin_low(D2);
}
// if on layer 2, turn on D1 LED, otherwise off.
if (get_highest_layer(state) == 2) {
- writePinHigh(D1);
+ gpio_write_pin_high(D1);
} else {
- writePinLow(D1);
+ gpio_write_pin_low(D1);
}
// if on layer 3, turn on D0 LED, otherwise off.
if (get_highest_layer(state) == 3) {
- writePinHigh(D0);
+ gpio_write_pin_high(D0);
} else {
- writePinLow(D0);
+ gpio_write_pin_low(D0);
}
return state;
diff --git a/keyboards/mechlovin/hannah910/rev1/info.json b/keyboards/mechlovin/hannah910/rev1/keyboard.json
index af20cffd4f..8f01f6f39b 100644
--- a/keyboards/mechlovin/hannah910/rev1/info.json
+++ b/keyboards/mechlovin/hannah910/rev1/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x9101",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
"rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/hannah910/rev1/rules.mk b/keyboards/mechlovin/hannah910/rev1/rules.mk
deleted file mode 100644
index 8a6e2c7b71..0000000000
--- a/keyboards/mechlovin/hannah910/rev1/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/hannah910/rev2/info.json b/keyboards/mechlovin/hannah910/rev2/keyboard.json
index a9cfe5f66b..c6fe19c34d 100644
--- a/keyboards/mechlovin/hannah910/rev2/info.json
+++ b/keyboards/mechlovin/hannah910/rev2/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x9102",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
"rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/hannah910/rev2/rules.mk b/keyboards/mechlovin/hannah910/rev2/rules.mk
deleted file mode 100644
index 8a6e2c7b71..0000000000
--- a/keyboards/mechlovin/hannah910/rev2/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/hannah910/rev3/info.json b/keyboards/mechlovin/hannah910/rev3/keyboard.json
index abeaa1e182..8a6ea4d123 100644
--- a/keyboards/mechlovin/hannah910/rev3/info.json
+++ b/keyboards/mechlovin/hannah910/rev3/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0x9103",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
"rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/hannah910/rev3/rules.mk b/keyboards/mechlovin/hannah910/rev3/rules.mk
deleted file mode 100644
index 8a6e2c7b71..0000000000
--- a/keyboards/mechlovin/hannah910/rev3/rules.mk
+++ /dev/null
@@ -1,12 +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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/keyboard.json
index 1e9a7d5776..d3251f5808 100644
--- a/keyboards/mechlovin/hex4b/rev1/info.json
+++ b/keyboards/mechlovin/hex4b/rev1/keyboard.json
@@ -3,6 +3,12 @@
"usb": {
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "D1", "D0"],
"rows": ["B7", "A2", "A1", "A3", "A4", "A5"]
diff --git a/keyboards/mechlovin/hex4b/rev1/rules.mk b/keyboards/mechlovin/hex4b/rev1/rules.mk
index 15d473397d..c2ee0bc86f 100644
--- a/keyboards/mechlovin/hex4b/rev1/rules.mk
+++ b/keyboards/mechlovin/hex4b/rev1/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/keyboard.json
index 8609be01c3..1bdda81c5a 100644
--- a/keyboards/mechlovin/hex4b/rev2/info.json
+++ b/keyboards/mechlovin/hex4b/rev2/keyboard.json
@@ -3,6 +3,15 @@
"usb": {
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A3", "C13", "B7", "B6", "B5", "B4", "B3"],
"rows": ["A4", "B12", "B13", "B14", "B15", "A1"]
diff --git a/keyboards/mechlovin/hex4b/rev2/rules.mk b/keyboards/mechlovin/hex4b/rev2/rules.mk
deleted file mode 100644
index a5089d51a5..0000000000
--- a/keyboards/mechlovin/hex4b/rev2/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/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/keyboard.json
index 483566e7f4..e068420b81 100644
--- a/keyboards/mechlovin/hex6c/info.json
+++ b/keyboards/mechlovin/hex6c/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6C01",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A13", "A14", "A1", "A0", "C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
"rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
diff --git a/keyboards/mechlovin/hex6c/rules.mk b/keyboards/mechlovin/hex6c/rules.mk
deleted file mode 100644
index 61776ab892..0000000000
--- a/keyboards/mechlovin/hex6c/rules.mk
+++ /dev/null
@@ -1,11 +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
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
index 6fdc9d6e5d..2ac0510dbf 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x8704",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "backlight": true
+ },
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
index 39a9f16925..6b947f0f1f 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x8703",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "backlight": true
+ },
"community_layouts": [
"tkl_ansi_tsangan",
"tkl_iso_tsangan"
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk b/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/mechlovin/infinity87/rev1/rules.mk b/keyboards/mechlovin/infinity87/rev1/rules.mk
index 53a9137b2f..101153f240 100644
--- a/keyboards/mechlovin/infinity87/rev1/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev1/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-
DEFAULT_FOLDER = mechlovin/infinity87/rev1/standard
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
index 964a7a8cb9..a0cb10fac2 100644
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/standard/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x8701",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"rgblight": {
"led_count": 26,
"sleep": true,
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk b/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
deleted file mode 100644
index 1e3cebb145..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/keyboard.json
index 42db9894ca..fdc6686988 100644
--- a/keyboards/mechlovin/infinity87/rev2/info.json
+++ b/keyboards/mechlovin/infinity87/rev2/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x8702",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"backlight": {
"pin": "B6",
"breathing": true
diff --git a/keyboards/mechlovin/infinity87/rev2/matrix.c b/keyboards/mechlovin/infinity87/rev2/matrix.c
index b1b0d20654..16bee61ad0 100644
--- a/keyboards/mechlovin/infinity87/rev2/matrix.c
+++ b/keyboards/mechlovin/infinity87/rev2/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifdef DIRECT_PINS
static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
@@ -40,7 +37,7 @@ static void init_pins(void) {
for (int col = 0; col < MATRIX_COLS; col++) {
pin_t pin = direct_pins[row][col];
if (pin != NO_PIN) {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
}
@@ -53,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
pin_t pin = direct_pins[current_row][col_index];
if (pin != NO_PIN) {
- current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
}
@@ -104,103 +101,103 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 1:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 2:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 3:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 4:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 5:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 6:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 7:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 8:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 9:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 10:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 11:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 12:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 13:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 14:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 15:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 16:
- writePinLow(E6);
+ gpio_write_pin_low(E6);
break;
}
}
@@ -208,130 +205,130 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 1:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 2:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 3:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 4:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 5:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 6:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 7:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 8:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 9:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 10:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 11:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 12:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 13:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 14:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 15:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 16:
- writePinHigh(E6);
+ gpio_write_pin_high(E6);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(E6);
+ gpio_write_pin_high(E6);
//Demultiplexer
- writePinLow(B0);
- writePinLow(F1);
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
+ gpio_write_pin_low(B0);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
- setPinOutput(B5);
- setPinOutput(B7);
- setPinOutput(F0);
- setPinOutput(B0);
- setPinOutput(F1);
- setPinOutput(E6);
+ gpio_set_pin_output(B5);
+ gpio_set_pin_output(B7);
+ gpio_set_pin_output(F0);
+ gpio_set_pin_output(B0);
+ gpio_set_pin_output(F1);
+ gpio_set_pin_output(E6);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -347,7 +344,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/mechlovin/infinity87/rev2/rules.mk b/keyboards/mechlovin/infinity87/rev2/rules.mk
index ea7804f158..179d02c3c6 100644
--- a/keyboards/mechlovin/infinity87/rev2/rules.mk
+++ b/keyboards/mechlovin/infinity87/rev2/rules.mk
@@ -1,11 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
index 27a7b441e3..2d177949dc 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x8710",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
deleted file mode 100644
index e408bde91c..0000000000
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/keyboards/mechlovin/infinity87/rules.mk b/keyboards/mechlovin/infinity87/rules.mk
index 251f8440aa..4aa072cae7 100644
--- a/keyboards/mechlovin/infinity87/rules.mk
+++ b/keyboards/mechlovin/infinity87/rules.mk
@@ -1,15 +1 @@
-
-# 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
-
DEFAULT_FOLDER = mechlovin/infinity87/rgb_rev1
diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/keyboard.json
index cb8154a713..73bdb0af13 100644
--- a/keyboards/mechlovin/infinity875/info.json
+++ b/keyboards/mechlovin/infinity875/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0875",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"rgb_matrix": {
"driver": "ws2812",
"max_brightness": 200,
diff --git a/keyboards/mechlovin/infinity875/matrix.c b/keyboards/mechlovin/infinity875/matrix.c
index b1b0d20654..16bee61ad0 100644
--- a/keyboards/mechlovin/infinity875/matrix.c
+++ b/keyboards/mechlovin/infinity875/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifdef DIRECT_PINS
static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
@@ -40,7 +37,7 @@ static void init_pins(void) {
for (int col = 0; col < MATRIX_COLS; col++) {
pin_t pin = direct_pins[row][col];
if (pin != NO_PIN) {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
}
@@ -53,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
pin_t pin = direct_pins[current_row][col_index];
if (pin != NO_PIN) {
- current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
}
@@ -104,103 +101,103 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 1:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 2:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 3:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 4:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 5:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 6:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 7:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 8:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 9:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 10:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 11:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 12:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 13:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 14:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 15:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 16:
- writePinLow(E6);
+ gpio_write_pin_low(E6);
break;
}
}
@@ -208,130 +205,130 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 1:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 2:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 3:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 4:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 5:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 6:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 7:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 8:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 9:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 10:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 11:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 12:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 13:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 14:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 15:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 16:
- writePinHigh(E6);
+ gpio_write_pin_high(E6);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(E6);
+ gpio_write_pin_high(E6);
//Demultiplexer
- writePinLow(B0);
- writePinLow(F1);
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
+ gpio_write_pin_low(B0);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
- setPinOutput(B5);
- setPinOutput(B7);
- setPinOutput(F0);
- setPinOutput(B0);
- setPinOutput(F1);
- setPinOutput(E6);
+ gpio_set_pin_output(B5);
+ gpio_set_pin_output(B7);
+ gpio_set_pin_output(F0);
+ gpio_set_pin_output(B0);
+ gpio_set_pin_output(F1);
+ gpio_set_pin_output(E6);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -347,7 +344,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk
index 33f549f3ae..179d02c3c6 100644
--- a/keyboards/mechlovin/infinity875/rules.mk
+++ b/keyboards/mechlovin/infinity875/rules.mk
@@ -1,16 +1,3 @@
-# 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
CUSTOM_MATRIX = lite
-RGB_MATRIX_ENABLE = yes
SRC += matrix.c
diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/keyboard.json
index 3724d8a82d..14371d2459 100644
--- a/keyboards/mechlovin/infinity88/info.json
+++ b/keyboards/mechlovin/infinity88/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x8802",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C13", "B9", "B4", "B7", "B8", "B5", "B6", "A9", "A5", "A6", "A7", "B1", "B2", "B10", "B3", "B14", "B15"],
"rows": ["A10", "B13", "B12", "B11", "C14", "C15"]
diff --git a/keyboards/mechlovin/infinity88/rules.mk b/keyboards/mechlovin/infinity88/rules.mk
deleted file mode 100644
index ca7f10db50..0000000000
--- a/keyboards/mechlovin/infinity88/rules.mk
+++ /dev/null
@@ -1,11 +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 = yes # Enable keyboard RGB underglow
diff --git a/keyboards/mechlovin/infinityce/infinityce.c b/keyboards/mechlovin/infinityce/infinityce.c
index 36f533fc2a..f1a9181a96 100644
--- a/keyboards/mechlovin/infinityce/infinityce.c
+++ b/keyboards/mechlovin/infinityce/infinityce.c
@@ -18,12 +18,12 @@
void led_init_ports(void) {
// * Set our LED pins as output
- setPinOutput(B3);
+ gpio_set_pin_output(B3);
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(B3, led_state.caps_lock);
+ gpio_write_pin(B3, led_state.caps_lock);
rgblight_set_effect_range(1, 30);
if (led_state.scroll_lock) {
rgblight_setrgb_at(255, 255, 255, 0);
diff --git a/keyboards/mechlovin/infinityce/info.json b/keyboards/mechlovin/infinityce/keyboard.json
index 0ded6a5eee..5b10e056ba 100644
--- a/keyboards/mechlovin/infinityce/info.json
+++ b/keyboards/mechlovin/infinityce/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x8801",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B5", "B4", "B0", "D5", "D4", "D1", "D0", "E6", "F7", "F6", "F5", "F4", "F1", "F0", "B2", "D3", "D2"],
"rows": ["D7", "D6", "B6", "B1", "C6", "C7"]
diff --git a/keyboards/mechlovin/infinityce/rules.mk b/keyboards/mechlovin/infinityce/rules.mk
deleted file mode 100644
index 3d5cb57ad5..0000000000
--- a/keyboards/mechlovin/infinityce/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/mechlovin/jay60/info.json b/keyboards/mechlovin/jay60/keyboard.json
index 1f8d68a541..37f25f36fe 100644
--- a/keyboards/mechlovin/jay60/info.json
+++ b/keyboards/mechlovin/jay60/keyboard.json
@@ -8,6 +8,11 @@
"pid": "0x0600",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B3", "B2", "B1", "B0", "A0", "A6", "A7", "C7", "C6", "C5", "C4", "C3"],
"rows": ["C2", "C1", "C0", "D7", "A1"]
diff --git a/keyboards/mechlovin/jay60/rules.mk b/keyboards/mechlovin/jay60/rules.mk
index 1e9f925544..c2ee0bc86f 100644
--- a/keyboards/mechlovin/jay60/rules.mk
+++ b/keyboards/mechlovin/jay60/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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
diff --git a/keyboards/mechlovin/kanu/kanu.c b/keyboards/mechlovin/kanu/kanu.c
index 67bf8f88fb..8622a38a22 100644
--- a/keyboards/mechlovin/kanu/kanu.c
+++ b/keyboards/mechlovin/kanu/kanu.c
@@ -17,15 +17,15 @@
#include "quantum.h"
void led_init_ports(void) {
- setPinOutput(B2);
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(D2);
+ gpio_set_pin_output(B2);
+ gpio_set_pin_output(D0);
+ gpio_set_pin_output(D1);
+ gpio_set_pin_output(D2);
}
bool led_update_kb(led_t led_state) {
if(led_update_user(led_state)) {
- writePin(B2, led_state.caps_lock);
+ gpio_write_pin(B2, led_state.caps_lock);
}
return true;
@@ -34,10 +34,10 @@ bool led_update_kb(led_t led_state) {
__attribute__((weak))
layer_state_t layer_state_set_user(layer_state_t state) {
// if on layer 1, turn on D2 LED, otherwise off.
- writePin(D2, get_highest_layer(state) == 1);
+ gpio_write_pin(D2, get_highest_layer(state) == 1);
// if on layer 2, turn on D1 LED, otherwise off.
- writePin(D1, get_highest_layer(state) == 2);
+ gpio_write_pin(D1, get_highest_layer(state) == 2);
// if on layer 3, turn on D0 LED, otherwise off.
- writePin(D0, get_highest_layer(state) == 3);
+ gpio_write_pin(D0, get_highest_layer(state) == 3);
return state;
}
diff --git a/keyboards/mechlovin/kanu/info.json b/keyboards/mechlovin/kanu/keyboard.json
index f8931cdff8..10cd22319a 100644
--- a/keyboards/mechlovin/kanu/info.json
+++ b/keyboards/mechlovin/kanu/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x4B4E",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "B1", "B3", "F0", "F1", "F4", "F5", "F6", "F7", "D5", "D4", "B4", "D6", "D7", "B0"],
"rows": ["B5", "B6", "D3", "C6", "C7"]
diff --git a/keyboards/mechlovin/kanu/rules.mk b/keyboards/mechlovin/kanu/rules.mk
deleted file mode 100644
index 3d5cb57ad5..0000000000
--- a/keyboards/mechlovin/kanu/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/mechlovin/kay60/info.json b/keyboards/mechlovin/kay60/keyboard.json
index 7e1ba1fa2d..7c38273947 100644
--- a/keyboards/mechlovin/kay60/info.json
+++ b/keyboards/mechlovin/kay60/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0601",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B2", "B3", "B7", "B4", "D7", "D6", "D4"],
"rows": ["D5", "D3", "D2", "B1", "B5"]
diff --git a/keyboards/mechlovin/kay60/rules.mk b/keyboards/mechlovin/kay60/rules.mk
deleted file mode 100644
index 48c738da8f..0000000000
--- a/keyboards/mechlovin/kay60/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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/kay65/kay65.c b/keyboards/mechlovin/kay65/kay65.c
index 591c618c6c..f59f23e13d 100644
--- a/keyboards/mechlovin/kay65/kay65.c
+++ b/keyboards/mechlovin/kay65/kay65.c
@@ -21,5 +21,5 @@ void keyboard_pre_init_user(void) {
// Call the keyboard pre init code.
// Set our LED pins as output
- setPinOutput(D7);
+ gpio_set_pin_output(D7);
}
diff --git a/keyboards/mechlovin/kay65/info.json b/keyboards/mechlovin/kay65/keyboard.json
index 9a8cf1b5d2..f5d5897939 100644
--- a/keyboards/mechlovin/kay65/info.json
+++ b/keyboards/mechlovin/kay65/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6502",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F7", "F6", "F5", "F4", "F1", "F0", "C7", "E6", "B0", "D2", "D1", "D0", "B3", "B2", "B1"],
"rows": ["B7", "D3", "D5", "D4", "C6"]
diff --git a/keyboards/mechlovin/kay65/rules.mk b/keyboards/mechlovin/kay65/rules.mk
deleted file mode 100644
index 2eba275490..0000000000
--- a/keyboards/mechlovin/kay65/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 = 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/mechlovin/mechlovin9/rev1/info.json b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json
index 1ece8fc52d..2aebe56639 100644
--- a/keyboards/mechlovin/mechlovin9/rev1/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev1/keyboard.json
@@ -4,14 +4,20 @@
"pid": "0x6509",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14", "A13"],
"rows": ["A4", "A5", "A3", "A2", "A1"]
},
"diode_direction": "COL2ROW",
- "features": {
- "backlight": true
- },
"backlight": {
"pin": "B8",
"breathing": true
diff --git a/keyboards/mechlovin/mechlovin9/rev1/rules.mk b/keyboards/mechlovin/mechlovin9/rev1/rules.mk
deleted file mode 100644
index d6fa845569..0000000000
--- a/keyboards/mechlovin/mechlovin9/rev1/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
diff --git a/keyboards/mechlovin/mechlovin9/rev2/info.json b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json
index 01e8d59579..a9b45df59d 100644
--- a/keyboards/mechlovin/mechlovin9/rev2/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev2/keyboard.json
@@ -10,6 +10,9 @@
},
"diode_direction": "COL2ROW",
"features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
"backlight": true
},
"backlight": {
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
index f5efcc1f6a..aa2787c34c 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
@@ -7,7 +7,9 @@
"device_version": "0.0.3"
},
"features": {
- "backlight": false
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
},
"bootmagic": {
"matrix": [0, 13]
diff --git a/keyboards/mechlovin/mechlovin9/rev3/rules.mk b/keyboards/mechlovin/mechlovin9/rev3/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/mechlovin9/rev3/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/mechlovin9/rules.mk b/keyboards/mechlovin/mechlovin9/rules.mk
index 3c4e38888c..79de7c7d31 100644
--- a/keyboards/mechlovin/mechlovin9/rules.mk
+++ b/keyboards/mechlovin/mechlovin9/rules.mk
@@ -1,13 +1 @@
-# 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
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-DEFAULT_FOLDER = mechlovin/mechlovin9/rev1 \ No newline at end of file
+DEFAULT_FOLDER = mechlovin/mechlovin9/rev1
diff --git a/keyboards/mechlovin/olly/bb/bb.c b/keyboards/mechlovin/olly/bb/bb.c
index dac77ff623..f9dcf211a1 100644
--- a/keyboards/mechlovin/olly/bb/bb.c
+++ b/keyboards/mechlovin/olly/bb/bb.c
@@ -17,19 +17,19 @@
#include "quantum.h"
void led_init_ports(void) {
- setPinOutput(C0);
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(C1);
- setPinOutput(C6);
+ gpio_set_pin_output(C0);
+ gpio_set_pin_output(D0);
+ gpio_set_pin_output(D1);
+ gpio_set_pin_output(C1);
+ gpio_set_pin_output(C6);
}
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
- writePin(D1, layer_state_cmp(state, 1));
- writePin(D0, layer_state_cmp(state, 2));
- writePin(C1, layer_state_cmp(state, 3));
- writePin(C0, layer_state_cmp(state, 4));
- writePin(C6, layer_state_cmp(state, 5));
+ gpio_write_pin(D1, layer_state_cmp(state, 1));
+ gpio_write_pin(D0, layer_state_cmp(state, 2));
+ gpio_write_pin(C1, layer_state_cmp(state, 3));
+ gpio_write_pin(C0, layer_state_cmp(state, 4));
+ gpio_write_pin(C6, layer_state_cmp(state, 5));
return state;
}
diff --git a/keyboards/mechlovin/olly/bb/info.json b/keyboards/mechlovin/olly/bb/keyboard.json
index fddb893113..ac08e94c3c 100644
--- a/keyboards/mechlovin/olly/bb/info.json
+++ b/keyboards/mechlovin/olly/bb/keyboard.json
@@ -8,6 +8,13 @@
"pid": "0xD181",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
+ },
"backlight": {
"pin": "D4",
"breathing": true
diff --git a/keyboards/mechlovin/olly/bb/matrix.c b/keyboards/mechlovin/olly/bb/matrix.c
index e045299bae..ecb6cf9e74 100644
--- a/keyboards/mechlovin/olly/bb/matrix.c
+++ b/keyboards/mechlovin/olly/bb/matrix.c
@@ -67,109 +67,109 @@ static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 1:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 2:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 3:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 4:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 5:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 6:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 7:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 8:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 9:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 10:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 11:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 12:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 13:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 14:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 15:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 16:
- writePinLow(C2);
+ gpio_write_pin_low(C2);
break;
case 17:
- writePinLow(C3);
+ gpio_write_pin_low(C3);
break;
case 18:
- writePinLow(C5);
+ gpio_write_pin_low(C5);
break;
}
}
@@ -177,140 +177,140 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 1:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 2:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 3:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 4:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 5:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 6:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 7:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 8:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 9:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 10:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 11:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 12:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 13:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 14:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 15:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 16:
- writePinHigh(C2);
+ gpio_write_pin_high(C2);
break;
case 17:
- writePinHigh(C3);
+ gpio_write_pin_high(C3);
break;
case 18:
- writePinHigh(C5);
+ gpio_write_pin_high(C5);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(C2);
- writePinHigh(C3);
- writePinHigh(C5);
+ gpio_write_pin_high(C2);
+ gpio_write_pin_high(C3);
+ gpio_write_pin_high(C5);
//Demultiplexer
- writePinLow(B4);
- writePinLow(C7);
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
+ gpio_write_pin_low(B4);
+ gpio_write_pin_low(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
- setPinOutput(A0);
- setPinOutput(A1);
- setPinOutput(A2);
- setPinOutput(B4);
- setPinOutput(C7);
- setPinOutput(C2);
- setPinOutput(C3);
- setPinOutput(C5);
+ gpio_set_pin_output(A0);
+ gpio_set_pin_output(A1);
+ gpio_set_pin_output(A2);
+ gpio_set_pin_output(B4);
+ gpio_set_pin_output(C7);
+ gpio_set_pin_output(C2);
+ gpio_set_pin_output(C3);
+ gpio_set_pin_output(C5);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -326,7 +326,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/mechlovin/olly/bb/rules.mk b/keyboards/mechlovin/olly/bb/rules.mk
index 1d15495eef..73681d1f1e 100644
--- a/keyboards/mechlovin/olly/bb/rules.mk
+++ b/keyboards/mechlovin/olly/bb/rules.mk
@@ -1,18 +1,5 @@
# Processor frequency
F_CPU = 16000000
-
-# 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index b67551a111..315191e840 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -5,15 +5,6 @@
"usb": {
"vid": "0x4D4C"
},
- "features": {
- "nkro": false,
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "rgblight": true
- },
"diode_direction": "ROW2COL",
"rgblight": {
"led_count": 27,
diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/keyboard.json
index 0b6aec094f..69f092af07 100644
--- a/keyboards/mechlovin/olly/jf/rev1/info.json
+++ b/keyboards/mechlovin/olly/jf/rev1/keyboard.json
@@ -5,7 +5,11 @@
"device_version": "0.0.1"
},
"features": {
- "backlight": true
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "backlight": true,
+ "rgblight": true
},
"matrix_pins": {
"cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
diff --git a/keyboards/mechlovin/olly/jf/rev1/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c
index c01879c9a5..8d1f80ea71 100644
--- a/keyboards/mechlovin/olly/jf/rev1/matrix.c
+++ b/keyboards/mechlovin/olly/jf/rev1/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifdef DIRECT_PINS
static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
@@ -40,7 +37,7 @@ static void init_pins(void) {
for (int col = 0; col < MATRIX_COLS; col++) {
pin_t pin = direct_pins[row][col];
if (pin != NO_PIN) {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
}
@@ -53,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
pin_t pin = direct_pins[current_row][col_index];
if (pin != NO_PIN) {
- current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
}
@@ -63,22 +60,22 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
#elif (DIODE_DIRECTION == COL2ROW)
static void select_row(uint8_t row) {
- setPinOutput(row_pins[row]);
- writePinLow(row_pins[row]);
+ gpio_set_pin_output(row_pins[row]);
+ gpio_write_pin_low(row_pins[row]);
}
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+static void unselect_row(uint8_t row) { gpio_set_pin_input_high(row_pins[row]); }
static void unselect_rows(void) {
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
}
static void init_pins(void) {
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputHigh(col_pins[x]);
+ gpio_set_pin_input_high(col_pins[x]);
}
}
@@ -97,7 +94,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
// Select the col pin to read (active low)
- uint8_t pin_state = readPin(col_pins[col_index]);
+ uint8_t pin_state = gpio_read_pin(col_pins[col_index]);
// Populate the matrix row with the state of the col pin
current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
@@ -157,109 +154,109 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 1:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 2:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 3:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 4:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 5:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 6:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(B4);
break;
case 7:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(B4);
break;
case 8:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 9:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 10:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 11:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 12:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 13:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 14:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_high(C7);
break;
case 15:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinHigh(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_high(C7);
break;
case 16:
- writePinLow(C2);
+ gpio_write_pin_low(C2);
break;
case 17:
- writePinLow(C3);
+ gpio_write_pin_low(C3);
break;
case 18:
- writePinLow(C5);
+ gpio_write_pin_low(C5);
break;
}
}
@@ -267,140 +264,140 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 1:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 2:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 3:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 4:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 5:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 6:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(B4);
break;
case 7:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(B4);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(B4);
break;
case 8:
- writePinLow(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 9:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 10:
- writePinHigh(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 11:
- writePinHigh(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 12:
- writePinHigh(A0);
- writePinLow(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 13:
- writePinLow(A0);
- writePinHigh(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 14:
- writePinLow(A0);
- writePinHigh(A1);
- writePinLow(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_low(A2);
+ gpio_write_pin_low(C7);
break;
case 15:
- writePinLow(A0);
- writePinLow(A1);
- writePinHigh(A2);
- writePinLow(C7);
+ gpio_write_pin_low(A0);
+ gpio_write_pin_low(A1);
+ gpio_write_pin_high(A2);
+ gpio_write_pin_low(C7);
break;
case 16:
- writePinHigh(C2);
+ gpio_write_pin_high(C2);
break;
case 17:
- writePinHigh(C3);
+ gpio_write_pin_high(C3);
break;
case 18:
- writePinHigh(C5);
+ gpio_write_pin_high(C5);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(C2);
- writePinHigh(C3);
- writePinHigh(C5);
+ gpio_write_pin_high(C2);
+ gpio_write_pin_high(C3);
+ gpio_write_pin_high(C5);
//Demultiplexer
- writePinLow(B4);
- writePinLow(C7);
- writePinHigh(A0);
- writePinHigh(A1);
- writePinHigh(A2);
+ gpio_write_pin_low(B4);
+ gpio_write_pin_low(C7);
+ gpio_write_pin_high(A0);
+ gpio_write_pin_high(A1);
+ gpio_write_pin_high(A2);
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
- setPinOutput(A0);
- setPinOutput(A1);
- setPinOutput(A2);
- setPinOutput(B4);
- setPinOutput(C7);
- setPinOutput(C2);
- setPinOutput(C3);
- setPinOutput(C5);
+ gpio_set_pin_output(A0);
+ gpio_set_pin_output(A1);
+ gpio_set_pin_output(A2);
+ gpio_set_pin_output(B4);
+ gpio_set_pin_output(C7);
+ gpio_set_pin_output(C2);
+ gpio_set_pin_output(C3);
+ gpio_set_pin_output(C5);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -416,7 +413,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/mechlovin/olly/jf/rev1/rev1.c b/keyboards/mechlovin/olly/jf/rev1/rev1.c
index 3d18d7bb5a..591c28dd44 100644
--- a/keyboards/mechlovin/olly/jf/rev1/rev1.c
+++ b/keyboards/mechlovin/olly/jf/rev1/rev1.c
@@ -18,22 +18,22 @@
void led_init_ports(void) {
- setPinOutput(C0);
- setPinOutput(D0);
- setPinOutput(D1);
- setPinOutput(C1);
- setPinOutput(C6);
- setPinOutput(B0);
- setPinOutput(B1);
- setPinOutput(B2);
+ gpio_set_pin_output(C0);
+ gpio_set_pin_output(D0);
+ gpio_set_pin_output(D1);
+ gpio_set_pin_output(C1);
+ gpio_set_pin_output(C6);
+ gpio_set_pin_output(B0);
+ gpio_set_pin_output(B1);
+ gpio_set_pin_output(B2);
}
layer_state_t layer_state_set_user(layer_state_t state) {
- writePin(D1, layer_state_cmp(state, 1));
- writePin(D0, layer_state_cmp(state, 2));
- writePin(C1, layer_state_cmp(state, 3));
- writePin(C0, layer_state_cmp(state, 4));
- writePin(C6, layer_state_cmp(state, 5));
+ gpio_write_pin(D1, layer_state_cmp(state, 1));
+ gpio_write_pin(D0, layer_state_cmp(state, 2));
+ gpio_write_pin(C1, layer_state_cmp(state, 3));
+ gpio_write_pin(C0, layer_state_cmp(state, 4));
+ gpio_write_pin(C6, layer_state_cmp(state, 5));
return state;
}
diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
index 600bf8a3af..3771188638 100644
--- a/keyboards/mechlovin/olly/jf/rev2/info.json
+++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
@@ -7,10 +7,14 @@
}
},
"features": {
- "command": true,
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
"console": true,
+ "command": true,
+ "nkro": true,
"led_matrix": true,
- "nkro": true
+ "rgblight": true
},
"led_matrix": {
"animations": {
@@ -704,4 +708,4 @@
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/mechlovin/olly/jf/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/mechlovin/olly/octagon/halconf.h b/keyboards/mechlovin/olly/octagon/halconf.h
index 3635a5c4a2..55add1de63 100644
--- a/keyboards/mechlovin/olly/octagon/halconf.h
+++ b/keyboards/mechlovin/olly/octagon/halconf.h
@@ -20,6 +20,4 @@
#define HAL_USE_SPI TRUE
-
#include_next <halconf.h>
-
diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/keyboard.json
index 3ef290d351..81b78b0b1c 100644
--- a/keyboards/mechlovin/olly/octagon/info.json
+++ b/keyboards/mechlovin/olly/octagon/keyboard.json
@@ -8,20 +8,25 @@
"pid": "0xD750",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "led_matrix": true,
+ "rgblight": true
+ },
+ "build": {
+ "lto": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
"led_count": 26,
"animations": {
"breathing": true,
- "rainbow_mood": true,
"rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
"static_gradient": true,
- "rgb_test": true,
- "alternating": true,
"twinkle": true
}
},
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
index fcb4929654..353f5f5d6d 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/default/keymap.c
@@ -15,16 +15,13 @@
*/
#include QMK_KEYBOARD_H
-#define LT1_CAP LT(1, KC_CAPS)
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
};
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md b/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
deleted file mode 100644
index 17d8ba9e07..0000000000
--- a/keyboards/mechlovin/olly/octagon/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for octagon \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
index 2de37e94d3..353f5f5d6d 100644
--- a/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
+++ b/keyboards/mechlovin/olly/octagon/keymaps/via/keymap.c
@@ -15,40 +15,13 @@
*/
#include QMK_KEYBOARD_H
-#define LT1_CAP LT(1, KC_CAPS)
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN,
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
- ),
- [1] = LAYOUT_split_bs(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
- [1] = LAYOUT_split_bs(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
- [1] = LAYOUT_split_bs(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
- ),
-
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, _______, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ )
};
diff --git a/keyboards/mechlovin/olly/octagon/mcuconf.h b/keyboards/mechlovin/olly/octagon/mcuconf.h
index 607305e567..6e4987337d 100644
--- a/keyboards/mechlovin/olly/octagon/mcuconf.h
+++ b/keyboards/mechlovin/olly/octagon/mcuconf.h
@@ -19,7 +19,6 @@
#include_next <mcuconf.h>
-
#undef STM32_SPI_USE_SPI1
#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/mechlovin/olly/octagon/octagon.c b/keyboards/mechlovin/olly/octagon/octagon.c
index 185ee32a3e..c89565168b 100644
--- a/keyboards/mechlovin/olly/octagon/octagon.c
+++ b/keyboards/mechlovin/olly/octagon/octagon.c
@@ -55,12 +55,13 @@ led_config_t g_led_config = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- }
+ }
};
-
bool led_matrix_indicators_kb(void) {
- if (!led_matrix_indicators_user()) { return false; }
+ if (!led_matrix_indicators_user()) {
+ return false;
+ }
if (host_keyboard_led_state().caps_lock) {
led_matrix_set_value(87, 0xFF);
led_matrix_set_value(47, 0xFF);
@@ -80,33 +81,25 @@ bool led_matrix_indicators_kb(void) {
return true;
}
-
layer_state_t layer_state_set_kb(layer_state_t state) {
- // if on layer 1, turn on L1 LED, otherwise off.
- if (get_highest_layer(state) == 0) {
- led_matrix_set_value(90, 0xFF);
- } else {
- led_matrix_set_value(90, 0x00);
- }
- // if on layer 2, turn on L2 LED, otherwise off.
- if (get_highest_layer(state) == 1) {
- led_matrix_set_value(91, 0xFF);
- } else {
- led_matrix_set_value(91, 0x00);
- }
-
- // if on layer 3, turn on L3 LED, otherwise off.
- if (get_highest_layer(state) == 2) {
- led_matrix_set_value(92, 0xFF);
- } else {
- led_matrix_set_value(92, 0x00);
- }
-
- // if on layer 4, turn on L4 LED, otherwise off.
- if (get_highest_layer(state) == 3) {
- led_matrix_set_value(93, 0xFF);
- } else {
- led_matrix_set_value(93, 0x00);
+ switch (get_highest_layer(state)) {
+ case 0:
+ led_matrix_set_value(90, 0xFF);
+ break;
+ case 1:
+ led_matrix_set_value(91, 0xFF);
+ break;
+ case 2:
+ led_matrix_set_value(92, 0xFF);
+ break;
+ case 3:
+ led_matrix_set_value(93, 0xFF);
+ break;
+ default:
+ led_matrix_set_value(90, 0x00);
+ led_matrix_set_value(91, 0x00);
+ led_matrix_set_value(92, 0x00);
+ led_matrix_set_value(93, 0x00);
}
return layer_state_set_user(state);
-} \ No newline at end of file
+}
diff --git a/keyboards/mechlovin/olly/octagon/readme.md b/keyboards/mechlovin/olly/octagon/readme.md
index 6f1833a571..5bf144ff5b 100644
--- a/keyboards/mechlovin/olly/octagon/readme.md
+++ b/keyboards/mechlovin/olly/octagon/readme.md
@@ -1,6 +1,6 @@
# Olly Octagon
-![Olly Octagon](https://i.imgur.com/lDMnyS4l.png)
+![Olly Octagon](https://i.imgur.com/lDMnyS4lh.png)
A replacement PCB for Duck Octagon 75% keyboard.
@@ -24,5 +24,5 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (Escape) and plug in the keyboard
* **Bootloader reset**: Hold down the key at (0,14) in the matrix (Backspace) and plug in the keyboard
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
* **Hardware reset**: Press reset button (located on the bottom side of the PCB)
diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk
deleted file mode 100644
index 97303c7e2f..0000000000
--- a/keyboards/mechlovin/olly/octagon/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
-LED_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/mechlovin/olly/orion/info.json b/keyboards/mechlovin/olly/orion/keyboard.json
index 0c0ee86c95..2780e21949 100644
--- a/keyboards/mechlovin/olly/orion/info.json
+++ b/keyboards/mechlovin/olly/orion/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xD870",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B14", "B13", "B12", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A15", "B3", "B4"],
"rows": ["A8", "A9", "A10", "B11", "C13", "C14"]
diff --git a/keyboards/mechlovin/olly/orion/orion.c b/keyboards/mechlovin/olly/orion/orion.c
index 9fc89a6d02..4dcc15cf77 100644
--- a/keyboards/mechlovin/olly/orion/orion.c
+++ b/keyboards/mechlovin/olly/orion/orion.c
@@ -22,20 +22,20 @@ void board_init(void) {
}
void keyboard_pre_init_kb(void) {
- setPinOutput(B5);
- setPinOutput(B6);
- setPinOutput(B7);
- setPinOutput(B8);
- setPinOutput(B9);
+ gpio_set_pin_output(B5);
+ gpio_set_pin_output(B6);
+ gpio_set_pin_output(B7);
+ gpio_set_pin_output(B8);
+ gpio_set_pin_output(B9);
keyboard_pre_init_user();
}
layer_state_t layer_state_set_kb(layer_state_t state) {
state = layer_state_set_user(state);
- writePin(B7, layer_state_cmp(state, 0));
- writePin(B6, layer_state_cmp(state, 1));
- writePin(B5, layer_state_cmp(state, 2));
- writePin(B8, layer_state_cmp(state, 3));
- writePin(B9, layer_state_cmp(state, 4));
+ gpio_write_pin(B7, layer_state_cmp(state, 0));
+ gpio_write_pin(B6, layer_state_cmp(state, 1));
+ gpio_write_pin(B5, layer_state_cmp(state, 2));
+ gpio_write_pin(B8, layer_state_cmp(state, 3));
+ gpio_write_pin(B9, layer_state_cmp(state, 4));
return state;
}
diff --git a/keyboards/mechlovin/olly/orion/rules.mk b/keyboards/mechlovin/olly/orion/rules.mk
deleted file mode 100644
index ef83f572cc..0000000000
--- a/keyboards/mechlovin/olly/orion/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 = 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/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/keyboard.json
index bf084ba863..37915826e6 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6501",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["E6", "B1", "B3", "D0", "D1", "D2", "D3", "D5", "F4", "F1", "D4", "D6", "D7", "B4", "B5"],
"rows": ["B0", "F0", "F5", "F6", "F7"]
diff --git a/keyboards/mechlovin/pisces/rules.mk b/keyboards/mechlovin/pisces/rules.mk
deleted file mode 100644
index bb8afde082..0000000000
--- a/keyboards/mechlovin/pisces/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # 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 = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/mechlovin/serratus/info.json b/keyboards/mechlovin/serratus/keyboard.json
index 780a369cb8..c283c48a35 100644
--- a/keyboards/mechlovin/serratus/info.json
+++ b/keyboards/mechlovin/serratus/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0870",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true,
+ "rgblight": true
+ },
"backlight": {
"pin": "B6",
"breathing": true
diff --git a/keyboards/mechlovin/serratus/matrix.c b/keyboards/mechlovin/serratus/matrix.c
index b1b0d20654..16bee61ad0 100644
--- a/keyboards/mechlovin/serratus/matrix.c
+++ b/keyboards/mechlovin/serratus/matrix.c
@@ -16,13 +16,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifdef DIRECT_PINS
static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
@@ -40,7 +37,7 @@ static void init_pins(void) {
for (int col = 0; col < MATRIX_COLS; col++) {
pin_t pin = direct_pins[row][col];
if (pin != NO_PIN) {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
}
@@ -53,7 +50,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
pin_t pin = direct_pins[current_row][col_index];
if (pin != NO_PIN) {
- current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ current_matrix[current_row] |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
}
@@ -104,103 +101,103 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void select_col(uint8_t col) {
switch (col) {
case 0:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 1:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 2:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 3:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 4:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 5:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 6:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(B0);
break;
case 7:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(B0);
break;
case 8:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 9:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 10:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 11:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 12:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 13:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 14:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_high(F1);
break;
case 15:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinHigh(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_high(F1);
break;
case 16:
- writePinLow(E6);
+ gpio_write_pin_low(E6);
break;
}
}
@@ -208,130 +205,130 @@ static void select_col(uint8_t col) {
static void unselect_col(uint8_t col) {
switch (col) {
case 0:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 1:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 2:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 3:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 4:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 5:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 6:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(B0);
break;
case 7:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(B0);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(B0);
break;
case 8:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 9:
- writePinHigh(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 10:
- writePinHigh(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 11:
- writePinHigh(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 12:
- writePinLow(B5);
- writePinHigh(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 13:
- writePinLow(B5);
- writePinHigh(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 14:
- writePinLow(B5);
- writePinLow(B7);
- writePinLow(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_low(F0);
+ gpio_write_pin_low(F1);
break;
case 15:
- writePinLow(B5);
- writePinLow(B7);
- writePinHigh(F0);
- writePinLow(F1);
+ gpio_write_pin_low(B5);
+ gpio_write_pin_low(B7);
+ gpio_write_pin_high(F0);
+ gpio_write_pin_low(F1);
break;
case 16:
- writePinHigh(E6);
+ gpio_write_pin_high(E6);
break;
}
}
static void unselect_cols(void) {
//Native
- writePinHigh(E6);
+ gpio_write_pin_high(E6);
//Demultiplexer
- writePinLow(B0);
- writePinLow(F1);
- writePinHigh(B5);
- writePinHigh(B7);
- writePinHigh(F0);
+ gpio_write_pin_low(B0);
+ gpio_write_pin_low(F1);
+ gpio_write_pin_high(B5);
+ gpio_write_pin_high(B7);
+ gpio_write_pin_high(F0);
}
static void init_pins(void) {
unselect_cols();
for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
- setPinOutput(B5);
- setPinOutput(B7);
- setPinOutput(F0);
- setPinOutput(B0);
- setPinOutput(F1);
- setPinOutput(E6);
+ gpio_set_pin_output(B5);
+ gpio_set_pin_output(B7);
+ gpio_set_pin_output(F0);
+ gpio_set_pin_output(B0);
+ gpio_set_pin_output(F1);
+ gpio_set_pin_output(E6);
}
static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
@@ -347,7 +344,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
} else {
diff --git a/keyboards/mechlovin/serratus/rules.mk b/keyboards/mechlovin/serratus/rules.mk
index 03ea2f1bda..179d02c3c6 100644
--- a/keyboards/mechlovin/serratus/rules.mk
+++ b/keyboards/mechlovin/serratus/rules.mk
@@ -1,15 +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 = 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
CUSTOM_MATRIX = lite
SRC += matrix.c
diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/keyboard.json
index 001c73f683..66b7487545 100644
--- a/keyboards/mechlovin/th1800/info.json
+++ b/keyboards/mechlovin/th1800/keyboard.json
@@ -8,6 +8,11 @@
"pid": "0x1800",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true
+ },
"matrix_pins": {
"cols": ["A3", "D7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "A7", "A6", "A5", "A4", "B3", "B2", "B0", "B1"],
"rows": ["B6", "B7", "D0", "D1", "D5", "D6"]
diff --git a/keyboards/mechlovin/th1800/rules.mk b/keyboards/mechlovin/th1800/rules.mk
index 1e9f925544..c2ee0bc86f 100644
--- a/keyboards/mechlovin/th1800/rules.mk
+++ b/keyboards/mechlovin/th1800/rules.mk
@@ -1,15 +1,2 @@
# Processor frequency
F_CPU = 16000000
-
-# 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
diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/keyboard.json
index f5ff5420b4..8b66e9a466 100644
--- a/keyboards/mechlovin/tmkl/info.json
+++ b/keyboards/mechlovin/tmkl/keyboard.json
@@ -7,6 +7,15 @@
"pid": "0xC601",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"],
"rows": ["A8", "A4", "A5", "A3", "A2", "A1"]
diff --git a/keyboards/mechlovin/tmkl/rules.mk b/keyboards/mechlovin/tmkl/rules.mk
deleted file mode 100644
index 80b09b5e41..0000000000
--- a/keyboards/mechlovin/tmkl/rules.mk
+++ /dev/null
@@ -1,11 +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
diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json
index 41179a6ef1..9de42c2442 100644
--- a/keyboards/mechlovin/zed1800/info.json
+++ b/keyboards/mechlovin/zed1800/info.json
@@ -17,15 +17,6 @@
"backing_size": 4096
}
},
- "features": {
- "bootmagic": true,
- "command": true,
- "console": true,
- "extrakey": true,
- "mousekey": true,
- "rgblight": true,
- "audio": false
- },
"rgblight": {
"sleep": true,
"animations": {
diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json
index 4a15f61ce4..c5652213d6 100644
--- a/keyboards/mechlovin/zed1800/oreum/info.json
+++ b/keyboards/mechlovin/zed1800/oreum/keyboard.json
@@ -3,6 +3,14 @@
"usb": {
"pid": "0x1802"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
"rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/oreum/rules.mk b/keyboards/mechlovin/zed1800/oreum/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/zed1800/oreum/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk
index d007da3fa2..e0088c95c3 100644
--- a/keyboards/mechlovin/zed1800/rules.mk
+++ b/keyboards/mechlovin/zed1800/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = mechlovin/zed1800/saber \ No newline at end of file
+DEFAULT_FOLDER = mechlovin/zed1800/saber
diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/keyboard.json
index d921d95a95..a3d236e511 100644
--- a/keyboards/mechlovin/zed1800/saber/info.json
+++ b/keyboards/mechlovin/zed1800/saber/keyboard.json
@@ -3,6 +3,14 @@
"usb": {
"pid": "0x1803"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"],
"rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/saber/rules.mk b/keyboards/mechlovin/zed1800/saber/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/zed1800/saber/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
index dab92b26d7..8a973d181f 100644
--- a/keyboards/mechlovin/zed1800/zepsody/info.json
+++ b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
@@ -3,6 +3,14 @@
"usb": {
"pid": "0x1801"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
"rows": ["B8", "B7", "B6", "B5", "B4", "B3"]
diff --git a/keyboards/mechlovin/zed1800/zepsody/rules.mk b/keyboards/mechlovin/zed1800/zepsody/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/zed1800/zepsody/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/zed60/info.json b/keyboards/mechlovin/zed60/keyboard.json
index 83b8c3f449..39a8ae7ea7 100644
--- a/keyboards/mechlovin/zed60/info.json
+++ b/keyboards/mechlovin/zed60/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0602",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A10", "A3", "A9", "A8", "B15", "B14", "B13", "B12", "B5", "B4", "B3", "A15", "B7", "B6"],
"rows": ["B10", "B2", "B1", "B0", "A2"]
diff --git a/keyboards/mechlovin/zed60/rules.mk b/keyboards/mechlovin/zed60/rules.mk
deleted file mode 100644
index 622edc3408..0000000000
--- a/keyboards/mechlovin/zed60/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 = 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/mechlovin/zed65/910/info.json b/keyboards/mechlovin/zed65/910/keyboard.json
index d1de863c03..36f1a1ed3b 100644
--- a/keyboards/mechlovin/zed65/910/info.json
+++ b/keyboards/mechlovin/zed65/910/keyboard.json
@@ -9,7 +9,11 @@
"device_version": "0.0.1"
},
"features": {
- "backlight": false,
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
"nkro": true,
"rgblight": true
},
diff --git a/keyboards/mechlovin/zed65/910/rules.mk b/keyboards/mechlovin/zed65/910/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/mechlovin/zed65/910/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/info.json b/keyboards/mechlovin/zed65/info.json
index c255dd23c6..cf993be247 100644
--- a/keyboards/mechlovin/zed65/info.json
+++ b/keyboards/mechlovin/zed65/info.json
@@ -1,11 +1,4 @@
{
"processor": "STM32F103",
- "bootloader": "stm32duino",
- "features": {
- "bootmagic": true,
- "command": true,
- "console": true,
- "extrakey": true,
- "mousekey": true
- },
+ "bootloader": "stm32duino"
}
diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/keyboard.json
index aa46b1bd8b..0cf13002d9 100644
--- a/keyboards/mechlovin/zed65/mono_led/info.json
+++ b/keyboards/mechlovin/zed65/mono_led/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6503",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "led_matrix": true,
+ "rgblight": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk
deleted file mode 100644
index 55d38a7b91..0000000000
--- a/keyboards/mechlovin/zed65/mono_led/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-NKRO_ENABLE = yes # Enable N-Key Rollover
-LED_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json b/keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json
index 4b3ed831c5..4b3ed831c5 100644
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/cor65/keyboard.json
diff --git a/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk b/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/cor65/rules.mk
+++ /dev/null
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
index 0709014f76..49ed44f0a1 100644
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/retro66/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6601",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "encoder": true
+ },
"matrix_pins": {
"cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
"rows": ["B13", "B14", "A8", "A1", "A0"]
diff --git a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
deleted file mode 100644
index 5af1ba8536..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/retro66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_ENABLE = yes
diff --git a/keyboards/mechlovin/zed65/no_backlight/rules.mk b/keyboards/mechlovin/zed65/no_backlight/rules.mk
index b0b388db50..a699765498 100644
--- a/keyboards/mechlovin/zed65/no_backlight/rules.mk
+++ b/keyboards/mechlovin/zed65/no_backlight/rules.mk
@@ -1,3 +1 @@
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-
DEFAULT_FOLDER = mechlovin/zed65/no_backlight/wearhaus66
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
index 5b0df671df..c9c9e0ddb1 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/info.json
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6602",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B11", "B12", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "B3", "A15", "B5"],
"rows": ["B13", "B14", "A8", "A1", "A0"]
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
deleted file mode 100644
index 84ef473c02..0000000000
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
diff --git a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c
index 091373e387..a6942a2cb8 100644
--- a/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c
+++ b/keyboards/mechlovin/zed65/no_backlight/wearhaus66/wearhaus66.c
@@ -20,5 +20,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
void keyboard_pre_init_user(void) {
// Call the keyboard pre init code.
// Set our LED pins as output
- setPinOutput(B7);
+ gpio_set_pin_output(B7);
}
diff --git a/keyboards/mechlovin/zed65/rev1/info.json b/keyboards/mechlovin/zed65/rev1/keyboard.json
index 20f04dbe65..99de5d53f2 100644
--- a/keyboards/mechlovin/zed65/rev1/info.json
+++ b/keyboards/mechlovin/zed65/rev1/keyboard.json
@@ -9,6 +9,11 @@
"device_version": "0.0.1"
},
"features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
"nkro": true,
"rgblight": true
},
diff --git a/keyboards/mechlovin/zed65/rev1/rules.mk b/keyboards/mechlovin/zed65/rev1/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/mechlovin/zed65/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file