aboutsummaryrefslogtreecommitdiff
path: root/keyboards/mechlovin
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechlovin')
-rw-r--r--keyboards/mechlovin/adelais/info.json8
-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)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev2/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json9
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk2
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json (renamed from keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json)0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk0
-rw-r--r--keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c3
-rw-r--r--keyboards/mechlovin/delphine/info.json8
-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/hannah65/info.json9
-rw-r--r--keyboards/mechlovin/hannah65/rev1/haus/keyboard.json (renamed from keyboards/mechlovin/hannah65/rev1/haus/info.json)0
-rw-r--r--keyboards/mechlovin/hannah65/rev1/haus/rules.mk0
-rw-r--r--keyboards/mechlovin/hannah65/rules.mk13
-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/info.json9
-rw-r--r--keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json (renamed from keyboards/mechlovin/infinity87/rev1/rogue87/info.json)0
-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)0
-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/rev2/matrix.c3
-rw-r--r--keyboards/mechlovin/infinity875/matrix.c3
-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/keyboard.json (renamed from keyboards/mechlovin/infinityce/info.json)10
-rw-r--r--keyboards/mechlovin/infinityce/rules.mk12
-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/keyboard.json (renamed from keyboards/mechlovin/kay65/info.json)9
-rw-r--r--keyboards/mechlovin/kay65/rules.mk12
-rw-r--r--keyboards/mechlovin/mechlovin9/info.json8
-rw-r--r--keyboards/mechlovin/mechlovin9/rev3/keyboard.json (renamed from keyboards/mechlovin/mechlovin9/rev3/info.json)3
-rw-r--r--keyboards/mechlovin/mechlovin9/rev3/rules.mk0
-rw-r--r--keyboards/mechlovin/mechlovin9/rules.mk14
-rw-r--r--keyboards/mechlovin/olly/jf/rev1/matrix.c3
-rw-r--r--keyboards/mechlovin/olly/jf/rev2/keyboard.json (renamed from keyboards/mechlovin/olly/jf/rev2/info.json)0
-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/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/matrix.c3
-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/oreum/keyboard.json (renamed from keyboards/mechlovin/zed1800/oreum/info.json)0
-rw-r--r--keyboards/mechlovin/zed1800/oreum/rules.mk0
-rw-r--r--keyboards/mechlovin/zed1800/saber/keyboard.json (renamed from keyboards/mechlovin/zed1800/saber/info.json)0
-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)0
-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)1
-rw-r--r--keyboards/mechlovin/zed65/910/rules.mk1
-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/rev1/keyboard.json (renamed from keyboards/mechlovin/zed65/rev1/info.json)0
-rw-r--r--keyboards/mechlovin/zed65/rev1/rules.mk1
76 files changed, 198 insertions, 301 deletions
diff --git a/keyboards/mechlovin/adelais/info.json b/keyboards/mechlovin/adelais/info.json
index 42b16d6398..d8aae5a8da 100644
--- a/keyboards/mechlovin/adelais/info.json
+++ b/keyboards/mechlovin/adelais/info.json
@@ -2,6 +2,14 @@
"manufacturer": "Team.Mechlovin",
"url": "",
"maintainer": "mechlovin",
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"usb": {
"vid": "0x4D4C",
"device_version": "0.0.1"
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..9a2a280c10 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/keyboard.json
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/rev4/apm32f103/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
index cf993be247..cf993be247 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/keyboard.json
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/info.json b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
index f0d10942ad..17cf63fecf 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/info.json
@@ -1,4 +1,13 @@
{
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false
+ },
"usb": {
"pid": "0xAD03"
},
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/keyboard.json
index 774c3dcf31..774c3dcf31 100644
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/keyboard.json
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/matrix.c b/keyboards/mechlovin/adelais/standard_led/avr/rev1/matrix.c
index 37046790fe..864de5e660 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;
diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json
index baeeab6f18..e8f39b8d6d 100644
--- a/keyboards/mechlovin/delphine/info.json
+++ b/keyboards/mechlovin/delphine/info.json
@@ -6,6 +6,14 @@
"usb": {
"vid": "0x4D4C"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F7", "D7", "D6", "D2"],
"rows": ["F0", "F1", "F4", "F5", "F6", "D3"]
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/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json
index 88a3f39719..f9adc72966 100644
--- a/keyboards/mechlovin/hannah65/info.json
+++ b/keyboards/mechlovin/hannah65/info.json
@@ -3,6 +3,15 @@
"pin": "B8",
"breathing": true
},
+ "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", "A13"],
"rows": ["A4", "A5", "A3", "A2", "A1"]
diff --git a/keyboards/mechlovin/hannah65/rev1/haus/info.json b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
index ac97de5f18..ac97de5f18 100644
--- a/keyboards/mechlovin/hannah65/rev1/haus/info.json
+++ b/keyboards/mechlovin/hannah65/rev1/haus/keyboard.json
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/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/info.json b/keyboards/mechlovin/infinity87/rev1/info.json
index dbe7cb83f9..249bbd5cb4 100644
--- a/keyboards/mechlovin/infinity87/rev1/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/info.json
@@ -1,4 +1,13 @@
{
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false
+ },
"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/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
index 6fdc9d6e5d..6fdc9d6e5d 100644
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rogue87/keyboard.json
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..39a9f16925 100644
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ b/keyboards/mechlovin/infinity87/rev1/rouge87/keyboard.json
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/rev2/matrix.c b/keyboards/mechlovin/infinity87/rev2/matrix.c
index b1b0d20654..62a56f687c 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;
diff --git a/keyboards/mechlovin/infinity875/matrix.c b/keyboards/mechlovin/infinity875/matrix.c
index b1b0d20654..62a56f687c 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;
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/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/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/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/info.json b/keyboards/mechlovin/mechlovin9/info.json
index 41133813ef..a5439f56a9 100644
--- a/keyboards/mechlovin/mechlovin9/info.json
+++ b/keyboards/mechlovin/mechlovin9/info.json
@@ -2,6 +2,14 @@
"manufacturer": "Mechlovin Studio",
"url": "",
"maintainer": "Team Mechlovin",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"usb": {
"vid": "0x4D4C"
},
diff --git a/keyboards/mechlovin/mechlovin9/rev3/info.json b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
index f5efcc1f6a..faa4cf0a87 100644
--- a/keyboards/mechlovin/mechlovin9/rev3/info.json
+++ b/keyboards/mechlovin/mechlovin9/rev3/keyboard.json
@@ -6,9 +6,6 @@
"pid": "0x6509",
"device_version": "0.0.3"
},
- "features": {
- "backlight": false
- },
"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/jf/rev1/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c
index c01879c9a5..2abda55d0e 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;
diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
index 600bf8a3af..600bf8a3af 100644
--- a/keyboards/mechlovin/olly/jf/rev2/info.json
+++ b/keyboards/mechlovin/olly/jf/rev2/keyboard.json
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/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/matrix.c b/keyboards/mechlovin/serratus/matrix.c
index b1b0d20654..62a56f687c 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;
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/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/keyboard.json
index 4a15f61ce4..4a15f61ce4 100644
--- a/keyboards/mechlovin/zed1800/oreum/info.json
+++ b/keyboards/mechlovin/zed1800/oreum/keyboard.json
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/saber/info.json b/keyboards/mechlovin/zed1800/saber/keyboard.json
index d921d95a95..d921d95a95 100644
--- a/keyboards/mechlovin/zed1800/saber/info.json
+++ b/keyboards/mechlovin/zed1800/saber/keyboard.json
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..dab92b26d7 100644
--- a/keyboards/mechlovin/zed1800/zepsody/info.json
+++ b/keyboards/mechlovin/zed1800/zepsody/keyboard.json
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..3b1472014d 100644
--- a/keyboards/mechlovin/zed65/910/info.json
+++ b/keyboards/mechlovin/zed65/910/keyboard.json
@@ -9,7 +9,6 @@
"device_version": "0.0.1"
},
"features": {
- "backlight": false,
"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/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/rev1/info.json b/keyboards/mechlovin/zed65/rev1/keyboard.json
index 20f04dbe65..20f04dbe65 100644
--- a/keyboards/mechlovin/zed65/rev1/info.json
+++ b/keyboards/mechlovin/zed65/rev1/keyboard.json
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