aboutsummaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cannonkeys')
-rw-r--r--keyboards/cannonkeys/adelie/keyboard.json (renamed from keyboards/cannonkeys/adelie/info.json)9
-rw-r--r--keyboards/cannonkeys/adelie/rules.mk12
-rw-r--r--keyboards/cannonkeys/atlas/keyboard.json (renamed from keyboards/cannonkeys/atlas/info.json)9
-rw-r--r--keyboards/cannonkeys/atlas/rules.mk11
-rw-r--r--keyboards/cannonkeys/atlas_alps/keyboard.json (renamed from keyboards/cannonkeys/atlas_alps/info.json)9
-rw-r--r--keyboards/cannonkeys/atlas_alps/rules.mk12
-rw-r--r--keyboards/cannonkeys/bastion60/keyboard.json (renamed from keyboards/cannonkeys/bastion60/info.json)0
-rw-r--r--keyboards/cannonkeys/bastion60/rules.mk1
-rw-r--r--keyboards/cannonkeys/bastion65/keyboard.json (renamed from keyboards/cannonkeys/bastion65/info.json)0
-rw-r--r--keyboards/cannonkeys/bastion65/rules.mk1
-rw-r--r--keyboards/cannonkeys/bastion75/keyboard.json (renamed from keyboards/cannonkeys/bastion75/info.json)0
-rw-r--r--keyboards/cannonkeys/bastion75/rules.mk1
-rw-r--r--keyboards/cannonkeys/bastiontkl/keyboard.json (renamed from keyboards/cannonkeys/bastiontkl/info.json)0
-rw-r--r--keyboards/cannonkeys/bastiontkl/rules.mk1
-rw-r--r--keyboards/cannonkeys/brutalv2_1800/keyboard.json (renamed from keyboards/cannonkeys/brutalv2_1800/info.json)0
-rw-r--r--keyboards/cannonkeys/brutalv2_1800/rules.mk1
-rw-r--r--keyboards/cannonkeys/brutalv2_60/keyboard.json (renamed from keyboards/cannonkeys/brutalv2_60/info.json)0
-rw-r--r--keyboards/cannonkeys/brutalv2_60/rules.mk1
-rw-r--r--keyboards/cannonkeys/caerdroia/keyboard.json (renamed from keyboards/cannonkeys/caerdroia/info.json)0
-rw-r--r--keyboards/cannonkeys/caerdroia/rules.mk1
-rw-r--r--keyboards/cannonkeys/chimera65/keyboard.json (renamed from keyboards/cannonkeys/chimera65/info.json)9
-rw-r--r--keyboards/cannonkeys/chimera65/rules.mk13
-rw-r--r--keyboards/cannonkeys/db60/hotswap/keyboard.json (renamed from keyboards/cannonkeys/db60/hotswap/info.json)0
-rw-r--r--keyboards/cannonkeys/db60/hotswap/rules.mk0
-rw-r--r--keyboards/cannonkeys/db60/j02/keyboard.json (renamed from keyboards/cannonkeys/db60/j02/info.json)0
-rw-r--r--keyboards/cannonkeys/db60/j02/rules.mk0
-rw-r--r--keyboards/cannonkeys/db60/rev2/keyboard.json (renamed from keyboards/cannonkeys/db60/rev2/info.json)0
-rw-r--r--keyboards/cannonkeys/db60/rev2/rules.mk0
-rw-r--r--keyboards/cannonkeys/hoodrowg/keyboard.json (renamed from keyboards/cannonkeys/hoodrowg/info.json)9
-rw-r--r--keyboards/cannonkeys/hoodrowg/rules.mk12
-rw-r--r--keyboards/cannonkeys/iron165/keyboard.json (renamed from keyboards/cannonkeys/iron165/info.json)9
-rw-r--r--keyboards/cannonkeys/iron165/rules.mk13
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c3
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h3
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c3
-rw-r--r--keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c8
-rw-r--r--keyboards/cannonkeys/nearfield/keyboard.json (renamed from keyboards/cannonkeys/nearfield/info.json)8
-rwxr-xr-xkeyboards/cannonkeys/nearfield/rules.mk12
-rw-r--r--keyboards/cannonkeys/ortho48/keyboard.json (renamed from keyboards/cannonkeys/ortho48/info.json)11
-rw-r--r--keyboards/cannonkeys/ortho48/rules.mk13
-rw-r--r--keyboards/cannonkeys/ortho48v2/keyboard.json (renamed from keyboards/cannonkeys/ortho48v2/info.json)0
-rw-r--r--keyboards/cannonkeys/ortho48v2/rules.mk1
-rw-r--r--keyboards/cannonkeys/ortho60/keyboard.json (renamed from keyboards/cannonkeys/ortho60/info.json)11
-rw-r--r--keyboards/cannonkeys/ortho60/rules.mk13
-rw-r--r--keyboards/cannonkeys/ortho60v2/keyboard.json (renamed from keyboards/cannonkeys/ortho60v2/info.json)0
-rw-r--r--keyboards/cannonkeys/ortho60v2/rules.mk1
-rw-r--r--keyboards/cannonkeys/ortho75/keyboard.json (renamed from keyboards/cannonkeys/ortho75/info.json)12
-rw-r--r--keyboards/cannonkeys/ortho75/rules.mk14
-rw-r--r--keyboards/cannonkeys/practice60/keyboard.json (renamed from keyboards/cannonkeys/practice60/info.json)11
-rw-r--r--keyboards/cannonkeys/practice60/rules.mk16
-rw-r--r--keyboards/cannonkeys/practice65/keyboard.json (renamed from keyboards/cannonkeys/practice65/info.json)11
-rw-r--r--keyboards/cannonkeys/practice65/rules.mk13
-rw-r--r--keyboards/cannonkeys/satisfaction75/prototype/keyboard.json (renamed from keyboards/cannonkeys/satisfaction75/prototype/info.json)0
-rw-r--r--keyboards/cannonkeys/satisfaction75/prototype/rules.mk1
-rw-r--r--keyboards/cannonkeys/satisfaction75/rev1/keyboard.json (renamed from keyboards/cannonkeys/satisfaction75/rev1/info.json)0
-rw-r--r--keyboards/cannonkeys/satisfaction75/rev1/rules.mk1
-rw-r--r--keyboards/cannonkeys/satisfaction75/rev2/keyboard.json (renamed from keyboards/cannonkeys/satisfaction75/rev2/info.json)0
-rw-r--r--keyboards/cannonkeys/satisfaction75/rev2/rules.mk1
-rw-r--r--keyboards/cannonkeys/typeb/keyboard.json (renamed from keyboards/cannonkeys/typeb/info.json)0
-rw-r--r--keyboards/cannonkeys/typeb/rules.mk1
60 files changed, 134 insertions, 168 deletions
diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/keyboard.json
index 798c599692..f4d46b35d1 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/keyboard.json
@@ -29,6 +29,15 @@
"ws2812": {
"pin": "F0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"],
"rows": ["F4", "F1", "B1", "B0"]
diff --git a/keyboards/cannonkeys/adelie/rules.mk b/keyboards/cannonkeys/adelie/rules.mk
deleted file mode 100644
index 6d85e16f92..0000000000
--- a/keyboards/cannonkeys/adelie/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 = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/keyboard.json
index 8173ec6a8f..86eaec2d51 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/keyboard.json
@@ -27,6 +27,15 @@
"pin": "B15",
"driver": "spi"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "A15", "A10", "A9"],
"rows": ["A8", "B14", "B12", "B4", "B3"]
diff --git a/keyboards/cannonkeys/atlas/rules.mk b/keyboards/cannonkeys/atlas/rules.mk
deleted file mode 100644
index 451e1c675c..0000000000
--- a/keyboards/cannonkeys/atlas/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 = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/keyboard.json
index 7166206f05..6f8c1305c3 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/keyboard.json
@@ -30,6 +30,15 @@
"twinkle": true
}
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B5", "B4", "D1", "D7", "D6"]
diff --git a/keyboards/cannonkeys/atlas_alps/rules.mk b/keyboards/cannonkeys/atlas_alps/rules.mk
deleted file mode 100644
index b851d0ab39..0000000000
--- a/keyboards/cannonkeys/atlas_alps/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/cannonkeys/bastion60/info.json b/keyboards/cannonkeys/bastion60/keyboard.json
index 07443b50b7..07443b50b7 100644
--- a/keyboards/cannonkeys/bastion60/info.json
+++ b/keyboards/cannonkeys/bastion60/keyboard.json
diff --git a/keyboards/cannonkeys/bastion60/rules.mk b/keyboards/cannonkeys/bastion60/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/bastion60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/bastion65/info.json b/keyboards/cannonkeys/bastion65/keyboard.json
index dd7dd4516e..dd7dd4516e 100644
--- a/keyboards/cannonkeys/bastion65/info.json
+++ b/keyboards/cannonkeys/bastion65/keyboard.json
diff --git a/keyboards/cannonkeys/bastion65/rules.mk b/keyboards/cannonkeys/bastion65/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/bastion65/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/bastion75/info.json b/keyboards/cannonkeys/bastion75/keyboard.json
index 276cc03c51..276cc03c51 100644
--- a/keyboards/cannonkeys/bastion75/info.json
+++ b/keyboards/cannonkeys/bastion75/keyboard.json
diff --git a/keyboards/cannonkeys/bastion75/rules.mk b/keyboards/cannonkeys/bastion75/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/bastion75/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/bastiontkl/info.json b/keyboards/cannonkeys/bastiontkl/keyboard.json
index 72733b3d8f..72733b3d8f 100644
--- a/keyboards/cannonkeys/bastiontkl/info.json
+++ b/keyboards/cannonkeys/bastiontkl/keyboard.json
diff --git a/keyboards/cannonkeys/bastiontkl/rules.mk b/keyboards/cannonkeys/bastiontkl/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/bastiontkl/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/keyboard.json
index 13f1b12733..13f1b12733 100644
--- a/keyboards/cannonkeys/brutalv2_1800/info.json
+++ b/keyboards/cannonkeys/brutalv2_1800/keyboard.json
diff --git a/keyboards/cannonkeys/brutalv2_1800/rules.mk b/keyboards/cannonkeys/brutalv2_1800/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/brutalv2_1800/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/brutalv2_60/info.json b/keyboards/cannonkeys/brutalv2_60/keyboard.json
index 3ee5f0d576..3ee5f0d576 100644
--- a/keyboards/cannonkeys/brutalv2_60/info.json
+++ b/keyboards/cannonkeys/brutalv2_60/keyboard.json
diff --git a/keyboards/cannonkeys/brutalv2_60/rules.mk b/keyboards/cannonkeys/brutalv2_60/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/brutalv2_60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/keyboard.json
index 4b5baf21dd..4b5baf21dd 100644
--- a/keyboards/cannonkeys/caerdroia/info.json
+++ b/keyboards/cannonkeys/caerdroia/keyboard.json
diff --git a/keyboards/cannonkeys/caerdroia/rules.mk b/keyboards/cannonkeys/caerdroia/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/caerdroia/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/keyboard.json
index e9881750d9..7cf30d2ea7 100644
--- a/keyboards/cannonkeys/chimera65/info.json
+++ b/keyboards/cannonkeys/chimera65/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xC024",
"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", "A5", "A4", "A3", "A2", "A1", "F0", "C15", "C14", "A9", "A8", "A10", "B3"],
"rows": ["A13", "A14", "A15", "C13", "B8"]
diff --git a/keyboards/cannonkeys/chimera65/rules.mk b/keyboards/cannonkeys/chimera65/rules.mk
deleted file mode 100644
index 9bdf6b8093..0000000000
--- a/keyboards/cannonkeys/chimera65/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 = yes
-RGBLIGHT_ENABLE = no
-
-
diff --git a/keyboards/cannonkeys/db60/hotswap/info.json b/keyboards/cannonkeys/db60/hotswap/keyboard.json
index d272b35a0f..d272b35a0f 100644
--- a/keyboards/cannonkeys/db60/hotswap/info.json
+++ b/keyboards/cannonkeys/db60/hotswap/keyboard.json
diff --git a/keyboards/cannonkeys/db60/hotswap/rules.mk b/keyboards/cannonkeys/db60/hotswap/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/cannonkeys/db60/hotswap/rules.mk
+++ /dev/null
diff --git a/keyboards/cannonkeys/db60/j02/info.json b/keyboards/cannonkeys/db60/j02/keyboard.json
index 0778b604ff..0778b604ff 100644
--- a/keyboards/cannonkeys/db60/j02/info.json
+++ b/keyboards/cannonkeys/db60/j02/keyboard.json
diff --git a/keyboards/cannonkeys/db60/j02/rules.mk b/keyboards/cannonkeys/db60/j02/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/cannonkeys/db60/j02/rules.mk
+++ /dev/null
diff --git a/keyboards/cannonkeys/db60/rev2/info.json b/keyboards/cannonkeys/db60/rev2/keyboard.json
index dc45ffecd5..dc45ffecd5 100644
--- a/keyboards/cannonkeys/db60/rev2/info.json
+++ b/keyboards/cannonkeys/db60/rev2/keyboard.json
diff --git a/keyboards/cannonkeys/db60/rev2/rules.mk b/keyboards/cannonkeys/db60/rev2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/cannonkeys/db60/rev2/rules.mk
+++ /dev/null
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/keyboard.json
index 1c1fbf5964..231b67e244 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B5", "B4", "D7", "F5", "F6", "F7", "F4", "D2", "D0"],
"rows": ["E6", "B7", "B0", "B1", "F1", "F0", "C6", "C7", "D4", "D6", "D5", "D3"]
diff --git a/keyboards/cannonkeys/hoodrowg/rules.mk b/keyboards/cannonkeys/hoodrowg/rules.mk
deleted file mode 100644
index b483118606..0000000000
--- a/keyboards/cannonkeys/hoodrowg/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 = 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/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/keyboard.json
index 3ec67e95b6..bc0c6af503 100644
--- a/keyboards/cannonkeys/iron165/info.json
+++ b/keyboards/cannonkeys/iron165/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x5165",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A5", "B10", "A3", "A2", "B0", "A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
"rows": ["B12", "B13", "B14", "B15", "A1"]
diff --git a/keyboards/cannonkeys/iron165/rules.mk b/keyboards/cannonkeys/iron165/rules.mk
deleted file mode 100644
index 9bdf6b8093..0000000000
--- a/keyboards/cannonkeys/iron165/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 = yes
-RGBLIGHT_ENABLE = no
-
-
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
index e148ae468a..6f76582e4b 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.c
@@ -4,6 +4,9 @@
#include "satisfaction_core.h"
#include "print.h"
#include "debug.h"
+#include "matrix.h"
+#include "quantum.h"
+#include "encoder.h"
#include <ch.h>
#include <hal.h>
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
index 9c46642195..70ee2a3fda 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_core.h
@@ -3,7 +3,8 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
#include "via.h" // only for EEPROM address
#include "satisfaction_keycodes.h"
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
index 7122091ea3..aab005ebd8 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_encoder.c
@@ -3,6 +3,9 @@
#include "satisfaction_core.h"
#include "eeprom.h"
+#ifdef BACKLIGHT_ENABLE
+# include "backlight.h"
+#endif
void pre_encoder_mode_change(void){
if(encoder_mode == ENC_MODE_CLOCK_SET){
diff --git a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
index 18ae368e53..0361453c52 100644
--- a/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
+++ b/keyboards/cannonkeys/lib/satisfaction75/satisfaction_oled.c
@@ -2,6 +2,14 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "satisfaction_core.h"
+#include "action_layer.h"
+#include "action_util.h"
+#include "timer.h"
+#include "matrix.h"
+#include "led.h"
+#include "host.h"
+#include "oled_driver.h"
+#include "progmem.h"
#include <stdio.h>
void draw_default(void);
diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/keyboard.json
index ab3a2d765d..e516198f09 100644
--- a/keyboards/cannonkeys/nearfield/info.json
+++ b/keyboards/cannonkeys/nearfield/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D3", "D5", "C6", "C7", "B6", "B5", "B7", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2", "D1"],
"rows": ["B4", "D2", "D4", "D6", "D7"]
diff --git a/keyboards/cannonkeys/nearfield/rules.mk b/keyboards/cannonkeys/nearfield/rules.mk
deleted file mode 100755
index 3b6a1809db..0000000000
--- a/keyboards/cannonkeys/nearfield/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 = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/keyboard.json
index c995210ba4..1f35187e29 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x4F48",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14"],
"rows": ["B12", "C13", "A2", "A1"]
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
deleted file mode 100644
index 7b6ddd5ad3..0000000000
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ /dev/null
@@ -1,13 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/ortho48v2/info.json b/keyboards/cannonkeys/ortho48v2/keyboard.json
index 4ead7db042..4ead7db042 100644
--- a/keyboards/cannonkeys/ortho48v2/info.json
+++ b/keyboards/cannonkeys/ortho48v2/keyboard.json
diff --git a/keyboards/cannonkeys/ortho48v2/rules.mk b/keyboards/cannonkeys/ortho48v2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/ortho48v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/keyboard.json
index 18fcbc828b..f429bd9f40 100644
--- a/keyboards/cannonkeys/ortho60/info.json
+++ b/keyboards/cannonkeys/ortho60/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x4F60",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
"rows": ["B3", "B4", "B5", "B6", "B7"]
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
deleted file mode 100644
index 7b6ddd5ad3..0000000000
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ /dev/null
@@ -1,13 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/keyboard.json
index 360c98bff9..360c98bff9 100644
--- a/keyboards/cannonkeys/ortho60v2/info.json
+++ b/keyboards/cannonkeys/ortho60v2/keyboard.json
diff --git a/keyboards/cannonkeys/ortho60v2/rules.mk b/keyboards/cannonkeys/ortho60v2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/ortho60v2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/keyboard.json
index 1f9fa94086..236334c598 100644
--- a/keyboards/cannonkeys/ortho75/info.json
+++ b/keyboards/cannonkeys/ortho75/keyboard.json
@@ -8,6 +8,18 @@
"pid": "0x6464",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14", "B7", "B6", "B5"],
"rows": ["B12", "C13", "A2", "A1", "A3"]
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
deleted file mode 100644
index 5a1f61bac0..0000000000
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ /dev/null
@@ -1,14 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-ENCODER_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/keyboard.json
index ae57bfbf06..3254b1702f 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
"rows": ["B3", "B4", "B5", "B6", "B7"]
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
deleted file mode 100644
index 544fe68a88..0000000000
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ /dev/null
@@ -1,16 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-
-DEFAULT_FOLDER = cannonkeys/practice60
-
-
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/keyboard.json
index f86951bf5c..950d1bae9f 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x6565",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["B8", "B0", "A0", "B5", "B10", "B9", "A6", "B12", "A7", "A5", "A4", "A3", "A2", "A1", "B13", "B14"],
"rows": ["B4", "B11", "B1", "B7", "B6"]
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
deleted file mode 100644
index 7b6ddd5ad3..0000000000
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ /dev/null
@@ -1,13 +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 = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/info.json b/keyboards/cannonkeys/satisfaction75/prototype/keyboard.json
index 4f67754d8f..4f67754d8f 100644
--- a/keyboards/cannonkeys/satisfaction75/prototype/info.json
+++ b/keyboards/cannonkeys/satisfaction75/prototype/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk b/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/cannonkeys/satisfaction75/prototype/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/info.json b/keyboards/cannonkeys/satisfaction75/rev1/keyboard.json
index d4a6b4423c..d4a6b4423c 100644
--- a/keyboards/cannonkeys/satisfaction75/rev1/info.json
+++ b/keyboards/cannonkeys/satisfaction75/rev1/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk b/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/cannonkeys/satisfaction75/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/info.json b/keyboards/cannonkeys/satisfaction75/rev2/keyboard.json
index e8ddb90c89..e8ddb90c89 100644
--- a/keyboards/cannonkeys/satisfaction75/rev2/info.json
+++ b/keyboards/cannonkeys/satisfaction75/rev2/keyboard.json
diff --git a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk b/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/cannonkeys/satisfaction75/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/keyboard.json
index 1f16991205..1f16991205 100644
--- a/keyboards/cannonkeys/typeb/info.json
+++ b/keyboards/cannonkeys/typeb/keyboard.json
diff --git a/keyboards/cannonkeys/typeb/rules.mk b/keyboards/cannonkeys/typeb/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/cannonkeys/typeb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank