summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cannonkeys')
-rw-r--r--keyboards/cannonkeys/adelie/adelie.c17
-rw-r--r--keyboards/cannonkeys/adelie/config.h19
-rw-r--r--keyboards/cannonkeys/adelie/info.json5
-rw-r--r--keyboards/cannonkeys/aella/aella.c1
-rw-r--r--keyboards/cannonkeys/aella/config.h4
-rw-r--r--keyboards/cannonkeys/aella/info.json5
-rw-r--r--keyboards/cannonkeys/an_c/an_c.c1
-rw-r--r--keyboards/cannonkeys/an_c/config.h4
-rw-r--r--keyboards/cannonkeys/an_c/info.json8
-rw-r--r--keyboards/cannonkeys/an_c/rules.mk1
-rw-r--r--keyboards/cannonkeys/atlas/atlas.c1
-rw-r--r--keyboards/cannonkeys/atlas/atlas.h48
-rw-r--r--keyboards/cannonkeys/atlas/config.h4
-rw-r--r--keyboards/cannonkeys/atlas/info.json374
-rw-r--r--keyboards/cannonkeys/atlas/rules.mk1
-rw-r--r--keyboards/cannonkeys/atlas_alps/atlas_alps.c17
-rw-r--r--keyboards/cannonkeys/atlas_alps/atlas_alps.h33
-rw-r--r--keyboards/cannonkeys/atlas_alps/config.h9
-rw-r--r--keyboards/cannonkeys/atlas_alps/info.json72
-rw-r--r--keyboards/cannonkeys/balance/config.h4
-rw-r--r--keyboards/cannonkeys/balance/info.json5
-rw-r--r--keyboards/cannonkeys/brutalv2_1800/info.json76
-rw-r--r--keyboards/cannonkeys/brutalv2_65/brutalv2_65.c16
-rw-r--r--keyboards/cannonkeys/brutalv2_65/config.h4
-rw-r--r--keyboards/cannonkeys/brutalv2_65/info.json5
-rw-r--r--keyboards/cannonkeys/caerdroia/info.json76
-rw-r--r--keyboards/cannonkeys/chimera65/chimera65.c1
-rw-r--r--keyboards/cannonkeys/chimera65/config.h4
-rw-r--r--keyboards/cannonkeys/chimera65/info.json5
-rw-r--r--keyboards/cannonkeys/chimera65_hs/info.json126
-rw-r--r--keyboards/cannonkeys/cloudline/cloudline.c4
-rw-r--r--keyboards/cannonkeys/cloudline/config.h4
-rw-r--r--keyboards/cannonkeys/cloudline/info.json8
-rw-r--r--keyboards/cannonkeys/cloudline/rules.mk1
-rw-r--r--keyboards/cannonkeys/crin/config.h5
-rw-r--r--keyboards/cannonkeys/crin/crin.c17
-rw-r--r--keyboards/cannonkeys/crin/info.json5
-rw-r--r--keyboards/cannonkeys/db60/config.h5
-rw-r--r--keyboards/cannonkeys/db60/info.json8
-rw-r--r--keyboards/cannonkeys/db60/rules.mk1
-rw-r--r--keyboards/cannonkeys/devastatingtkl/config.h4
-rw-r--r--keyboards/cannonkeys/devastatingtkl/devastatingtkl.c1
-rw-r--r--keyboards/cannonkeys/devastatingtkl/info.json8
-rw-r--r--keyboards/cannonkeys/devastatingtkl/rules.mk1
-rw-r--r--keyboards/cannonkeys/ellipse/info.json130
-rw-r--r--keyboards/cannonkeys/ellipse_hs/info.json124
-rw-r--r--keyboards/cannonkeys/gentoo/config.h4
-rw-r--r--keyboards/cannonkeys/gentoo/gentoo.c16
-rw-r--r--keyboards/cannonkeys/gentoo/info.json5
-rw-r--r--keyboards/cannonkeys/gentoo_hs/config.h4
-rw-r--r--keyboards/cannonkeys/gentoo_hs/gentoo_hs.c16
-rw-r--r--keyboards/cannonkeys/gentoo_hs/info.json5
-rw-r--r--keyboards/cannonkeys/hoodrowg/config.h5
-rw-r--r--keyboards/cannonkeys/hoodrowg/hoodrowg.c17
-rw-r--r--keyboards/cannonkeys/hoodrowg/info.json5
-rw-r--r--keyboards/cannonkeys/instant60/config.h4
-rw-r--r--keyboards/cannonkeys/instant60/info.json8
-rw-r--r--keyboards/cannonkeys/instant60/instant60.c1
-rw-r--r--keyboards/cannonkeys/instant60/rules.mk1
-rw-r--r--keyboards/cannonkeys/instant65/config.h4
-rw-r--r--keyboards/cannonkeys/instant65/info.json8
-rw-r--r--keyboards/cannonkeys/instant65/instant65.c1
-rw-r--r--keyboards/cannonkeys/instant65/rules.mk1
-rw-r--r--keyboards/cannonkeys/iron165/config.h4
-rw-r--r--keyboards/cannonkeys/iron165/info.json5
-rw-r--r--keyboards/cannonkeys/iron165/iron165.c1
-rw-r--r--keyboards/cannonkeys/malicious_ergo/config.h4
-rw-r--r--keyboards/cannonkeys/malicious_ergo/info.json8
-rw-r--r--keyboards/cannonkeys/malicious_ergo/malicious_ergo.c16
-rw-r--r--keyboards/cannonkeys/malicious_ergo/rules.mk1
-rw-r--r--keyboards/cannonkeys/moment/info.json128
-rw-r--r--keyboards/cannonkeys/moment_hs/info.json124
-rwxr-xr-xkeyboards/cannonkeys/nearfield/config.h26
-rw-r--r--keyboards/cannonkeys/nearfield/info.json5
-rwxr-xr-xkeyboards/cannonkeys/nearfield/nearfield.c18
-rw-r--r--keyboards/cannonkeys/obliterated75/config.h4
-rw-r--r--keyboards/cannonkeys/obliterated75/info.json8
-rw-r--r--keyboards/cannonkeys/obliterated75/obliterated75.c1
-rw-r--r--keyboards/cannonkeys/obliterated75/rules.mk1
-rw-r--r--keyboards/cannonkeys/onyx/config.h4
-rw-r--r--keyboards/cannonkeys/onyx/info.json5
-rw-r--r--keyboards/cannonkeys/onyx/onyx.c17
-rw-r--r--keyboards/cannonkeys/ortho48/config.h4
-rw-r--r--keyboards/cannonkeys/ortho48/info.json204
-rw-r--r--keyboards/cannonkeys/ortho48/ortho48.c3
-rw-r--r--keyboards/cannonkeys/ortho48/ortho48.h29
-rw-r--r--keyboards/cannonkeys/ortho48/rules.mk1
-rw-r--r--keyboards/cannonkeys/ortho60/config.h4
-rw-r--r--keyboards/cannonkeys/ortho60/info.json254
-rw-r--r--keyboards/cannonkeys/ortho60/ortho60.c3
-rw-r--r--keyboards/cannonkeys/ortho60/ortho60.h33
-rw-r--r--keyboards/cannonkeys/ortho60/rules.mk1
-rw-r--r--keyboards/cannonkeys/ortho60v2/info.json120
-rw-r--r--keyboards/cannonkeys/ortho75/config.h4
-rw-r--r--keyboards/cannonkeys/ortho75/info.json162
-rw-r--r--keyboards/cannonkeys/ortho75/ortho75.c2
-rw-r--r--keyboards/cannonkeys/ortho75/ortho75.h18
-rw-r--r--keyboards/cannonkeys/ortho75/rules.mk1
-rw-r--r--keyboards/cannonkeys/practice60/config.h4
-rw-r--r--keyboards/cannonkeys/practice60/info.json8
-rw-r--r--keyboards/cannonkeys/practice60/practice60.c2
-rw-r--r--keyboards/cannonkeys/practice60/rules.mk1
-rw-r--r--keyboards/cannonkeys/practice65/config.h4
-rw-r--r--keyboards/cannonkeys/practice65/info.json8
-rw-r--r--keyboards/cannonkeys/practice65/practice65.c2
-rw-r--r--keyboards/cannonkeys/practice65/rules.mk1
-rw-r--r--keyboards/cannonkeys/rekt1800/config.h4
-rw-r--r--keyboards/cannonkeys/rekt1800/info.json5
-rw-r--r--keyboards/cannonkeys/rekt1800/rekt1800.c1
-rw-r--r--keyboards/cannonkeys/sagittarius/config.h4
-rw-r--r--keyboards/cannonkeys/sagittarius/info.json8
-rw-r--r--keyboards/cannonkeys/sagittarius/rules.mk1
-rw-r--r--keyboards/cannonkeys/sagittarius/sagittarius.c17
-rw-r--r--keyboards/cannonkeys/satisfaction75/config.h4
-rw-r--r--keyboards/cannonkeys/satisfaction75/info.json5
-rw-r--r--keyboards/cannonkeys/savage65/config.h4
-rw-r--r--keyboards/cannonkeys/savage65/info.json8
-rw-r--r--keyboards/cannonkeys/savage65/rules.mk1
-rw-r--r--keyboards/cannonkeys/savage65/savage65.c1
-rw-r--r--keyboards/cannonkeys/serenity/info.json74
-rw-r--r--keyboards/cannonkeys/tmov2/config.h4
-rw-r--r--keyboards/cannonkeys/tmov2/info.json8
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk1
-rw-r--r--keyboards/cannonkeys/tmov2/tmov2.c1
-rw-r--r--keyboards/cannonkeys/tsukuyomi/config.h4
-rw-r--r--keyboards/cannonkeys/tsukuyomi/info.json8
-rw-r--r--keyboards/cannonkeys/tsukuyomi/rules.mk1
-rw-r--r--keyboards/cannonkeys/tsukuyomi/tsukuyomi.c17
-rw-r--r--keyboards/cannonkeys/typeb/info.json122
-rw-r--r--keyboards/cannonkeys/vicious40/config.h4
-rw-r--r--keyboards/cannonkeys/vicious40/info.json5
-rw-r--r--keyboards/cannonkeys/vicious40/vicious40.c17
132 files changed, 1337 insertions, 1622 deletions
diff --git a/keyboards/cannonkeys/adelie/adelie.c b/keyboards/cannonkeys/adelie/adelie.c
deleted file mode 100644
index 04764169ee..0000000000
--- a/keyboards/cannonkeys/adelie/adelie.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "adelie.h"
diff --git a/keyboards/cannonkeys/adelie/config.h b/keyboards/cannonkeys/adelie/config.h
index e5f6cbedab..2dd64009a5 100644
--- a/keyboards/cannonkeys/adelie/config.h
+++ b/keyboards/cannonkeys/adelie/config.h
@@ -17,25 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, F1, B1, B0 }
-#define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 3
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/cannonkeys/adelie/info.json b/keyboards/cannonkeys/adelie/info.json
index d075dc199a..5dd8a27b23 100644
--- a/keyboards/cannonkeys/adelie/info.json
+++ b/keyboards/cannonkeys/adelie/info.json
@@ -8,6 +8,11 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "B2"],
+ "rows": ["F4", "F1", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/aella/aella.c b/keyboards/cannonkeys/aella/aella.c
deleted file mode 100644
index 862bf41451..0000000000
--- a/keyboards/cannonkeys/aella/aella.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "aella.h"
diff --git a/keyboards/cannonkeys/aella/config.h b/keyboards/cannonkeys/aella/config.h
index a03a1f3fb8..4b007cf387 100644
--- a/keyboards/cannonkeys/aella/config.h
+++ b/keyboards/cannonkeys/aella/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A5, B0, B1, B2, B10, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A7 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/aella/info.json b/keyboards/cannonkeys/aella/info.json
index 1fc2da7d64..be8335bfd3 100644
--- a/keyboards/cannonkeys/aella/info.json
+++ b/keyboards/cannonkeys/aella/info.json
@@ -8,6 +8,11 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A5", "B0", "B1", "B2", "B10", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A13", "B12", "B11", "B14", "A8", "A7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/an_c/an_c.c b/keyboards/cannonkeys/an_c/an_c.c
deleted file mode 100644
index 9dfb80e9e2..0000000000
--- a/keyboards/cannonkeys/an_c/an_c.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "an_c.h"
diff --git a/keyboards/cannonkeys/an_c/config.h b/keyboards/cannonkeys/an_c/config.h
index a6b9872268..3120b3167a 100644
--- a/keyboards/cannonkeys/an_c/config.h
+++ b/keyboards/cannonkeys/an_c/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/an_c/info.json b/keyboards/cannonkeys/an_c/info.json
index 0517bb09d3..07ca88e770 100644
--- a/keyboards/cannonkeys/an_c/info.json
+++ b/keyboards/cannonkeys/an_c/info.json
@@ -8,11 +8,19 @@
"pid": "0xA00C",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["60_ansi", "60_tsangan_hhkb"],
diff --git a/keyboards/cannonkeys/an_c/rules.mk b/keyboards/cannonkeys/an_c/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/an_c/rules.mk
+++ b/keyboards/cannonkeys/an_c/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/atlas/atlas.c b/keyboards/cannonkeys/atlas/atlas.c
deleted file mode 100644
index 8b0b236fe9..0000000000
--- a/keyboards/cannonkeys/atlas/atlas.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "atlas.h"
diff --git a/keyboards/cannonkeys/atlas/atlas.h b/keyboards/cannonkeys/atlas/atlas.h
deleted file mode 100644
index 2a6bf7d88a..0000000000
--- a/keyboards/cannonkeys/atlas/atlas.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12_1x2uC( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45 , k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12_2x2uC( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k45, k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, KC_NO, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h
index 9689ba3d22..0ff5f383bb 100644
--- a/keyboards/cannonkeys/atlas/config.h
+++ b/keyboards/cannonkeys/atlas/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A2, A1, A0, F1, F0, C15, C14, C13, B9, A15, A10, A9 }
-#define MATRIX_ROW_PINS { A8, B14, B12, B4, B3 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/atlas/info.json b/keyboards/cannonkeys/atlas/info.json
index fbc4e94d83..6cd7fa15a0 100644
--- a/keyboards/cannonkeys/atlas/info.json
+++ b/keyboards/cannonkeys/atlas/info.json
@@ -8,196 +8,216 @@
"pid": "0xA7A5",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "spi"
+ },
+ "matrix_pins": {
+ "cols": ["A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "B9", "A15", "A10", "A9"],
+ "rows": ["A8", "B14", "B12", "B4", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"Delete", "x":11, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"Fn", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"Meta", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4},
- {"label":"Space", "x":6, "y":4},
- {"label":"Raise", "x":7, "y":4},
- {"label":"Left", "x":8, "y":4},
- {"label":"Down", "x":9, "y":4},
- {"label":"Up", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
},
"LAYOUT_ortho_5x12_1x2uC": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"Delete", "x":11, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"Fn", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"Meta", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4, "w":2},
- {"label":"Raise", "x":7, "y":4},
- {"label":"Left", "x":8, "y":4},
- {"label":"Down", "x":9, "y":4},
- {"label":"Up", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
},
"LAYOUT_ortho_5x12_2x2uC": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"Delete", "x":11, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"Fn", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"Meta", "x":3, "y":4},
- {"label":"Space1", "x":4, "y":4, "w":2},
- {"label":"Space2", "x":6, "y":4, "w":2},
- {"label":"Left", "x":8, "y":4},
- {"label":"Down", "x":9, "y":4},
- {"label":"Up", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 5], "x": 4, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 6, "y": 4, "w": 2},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/cannonkeys/atlas/rules.mk b/keyboards/cannonkeys/atlas/rules.mk
index fa596a2fb8..451e1c675c 100644
--- a/keyboards/cannonkeys/atlas/rules.mk
+++ b/keyboards/cannonkeys/atlas/rules.mk
@@ -9,4 +9,3 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
diff --git a/keyboards/cannonkeys/atlas_alps/atlas_alps.c b/keyboards/cannonkeys/atlas_alps/atlas_alps.c
deleted file mode 100644
index b1cdb84517..0000000000
--- a/keyboards/cannonkeys/atlas_alps/atlas_alps.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "atlas_alps.h"
diff --git a/keyboards/cannonkeys/atlas_alps/atlas_alps.h b/keyboards/cannonkeys/atlas_alps/atlas_alps.h
deleted file mode 100644
index 5cdb15a603..0000000000
--- a/keyboards/cannonkeys/atlas_alps/atlas_alps.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020 Nathan Spears
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B \
- ) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B } \
- }
diff --git a/keyboards/cannonkeys/atlas_alps/config.h b/keyboards/cannonkeys/atlas_alps/config.h
index 9adbb67a2f..52b15c350c 100644
--- a/keyboards/cannonkeys/atlas_alps/config.h
+++ b/keyboards/cannonkeys/atlas_alps/config.h
@@ -16,15 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B4, D1, D7, D6 }
-#define MATRIX_COL_PINS { B6, C6, D2, E6, C7, B3, F7, F6, F5, F4, F1, F0 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/cannonkeys/atlas_alps/info.json b/keyboards/cannonkeys/atlas_alps/info.json
index e1831be72a..c5f6141fb9 100644
--- a/keyboards/cannonkeys/atlas_alps/info.json
+++ b/keyboards/cannonkeys/atlas_alps/info.json
@@ -8,12 +8,82 @@
"pid": "0xA7A5",
"device_version": "0.1.0"
},
+ "matrix_pins": {
+ "cols": ["B6", "C6", "D2", "E6", "C7", "B3", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B5", "B4", "D1", "D7", "D6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"|", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"Q", "x":1, "y":1}, {"label":"W", "x":2, "y":1}, {"label":"E", "x":3, "y":1}, {"label":"R", "x":4, "y":1}, {"label":"T", "x":5, "y":1}, {"label":"Y", "x":6, "y":1}, {"label":"U", "x":7, "y":1}, {"label":"I", "x":8, "y":1}, {"label":"O", "x":9, "y":1}, {"label":"P", "x":10, "y":1}, {"label":"Back Space", "x":11, "y":1}, {"label":"Esc", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";", "x":10, "y":2}, {"label":"'", "x":11, "y":2}, {"label":"Shift", "x":0, "y":3}, {"label":"Z", "x":1, "y":3}, {"label":"X", "x":2, "y":3}, {"label":"C", "x":3, "y":3}, {"label":"V", "x":4, "y":3}, {"label":"B", "x":5, "y":3}, {"label":"N", "x":6, "y":3}, {"label":"M", "x":7, "y":3}, {"label":",", "x":8, "y":3}, {"label":".", "x":9, "y":3}, {"label":"/", "x":10, "y":3}, {"label":"Return", "x":11, "y":3}, {"label":"Caps Lock", "x":0, "y":4}, {"label":"Ctrl", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"label":"Super", "x":3, "y":4}, {"label":"&dArr;", "x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"label":"&uArr;", "x":7, "y":4}, {"label":"&larr;", "x":8, "y":4}, {"label":"&darr;", "x":9, "y":4}, {"label":"&uarr;", "x":10, "y":4}, {"label":"&rarr;", "x":11, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/balance/config.h b/keyboards/cannonkeys/balance/config.h
index 5d93b09a27..f9c629dad8 100644
--- a/keyboards/cannonkeys/balance/config.h
+++ b/keyboards/cannonkeys/balance/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, F1, C15, B3, C14, C13, B9, B8, B7 }
-#define MATRIX_ROW_PINS { B4, A15, A14, A0, F0 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/balance/info.json b/keyboards/cannonkeys/balance/info.json
index b9844e5295..7a1db4a0ec 100644
--- a/keyboards/cannonkeys/balance/info.json
+++ b/keyboards/cannonkeys/balance/info.json
@@ -8,6 +8,11 @@
"pid": "0xBA77",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "F1", "C15", "B3", "C14", "C13", "B9", "B8", "B7"],
+ "rows": ["B4", "A15", "A14", "A0", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B6", "resolution": 2}
diff --git a/keyboards/cannonkeys/brutalv2_1800/info.json b/keyboards/cannonkeys/brutalv2_1800/info.json
index 0515152901..64ca1975b6 100644
--- a/keyboards/cannonkeys/brutalv2_1800/info.json
+++ b/keyboards/cannonkeys/brutalv2_1800/info.json
@@ -34,44 +34,44 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
- { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
- { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
- { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
- { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
- { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
- { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
- { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
- { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
- { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
- { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
- { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
- { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
- { "matrix": [0, 14], "x": 15.5, "y": 0.0 },
- { "matrix": [0, 15], "x": 16.5, "y": 0.0 },
- { "matrix": [0, 16], "x": 17.5, "y": 0.0 },
- { "matrix": [0, 17], "x": 18.5, "y": 0.0 },
- { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
- { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
- { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
- { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
- { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
- { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
- { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
- { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
- { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
- { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
- { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
- { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
- { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
- { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
- { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+ { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 },
+ { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 },
+ { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 },
+ { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 },
+ { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+ { "matrix": [0, 14], "x": 15.5, "y": 0 },
+ { "matrix": [0, 15], "x": 16.5, "y": 0 },
+ { "matrix": [0, 16], "x": 17.5, "y": 0 },
+ { "matrix": [0, 17], "x": 18.5, "y": 0 },
+ { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+ { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "matrix": [1, 13], "x": 13, "y": 1.25 },
+ { "matrix": [3, 12], "x": 14, "y": 1.25 },
{ "label": "Insert", "matrix": [1, 14], "x": 15.5, "y": 1.25 },
{ "label": "Home", "matrix": [1, 15], "x": 16.5, "y": 1.25 },
{ "label": "PgUp", "matrix": [1, 16], "x": 17.5, "y": 1.25 },
{ "matrix": [1, 17], "x": 18.5, "y": 1.25 },
- { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+ { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -89,7 +89,7 @@
{ "label": "End", "matrix": [2, 15], "x": 16.5, "y": 2.25 },
{ "label": "PgDn", "matrix": [2, 16], "x": 17.5, "y": 2.25 },
{ "matrix": [2, 17], "x": 18.5, "y": 2.25 },
- { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+ { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -106,7 +106,7 @@
{ "matrix": [3, 15], "x": 16.5, "y": 3.25 },
{ "matrix": [3, 16], "x": 17.5, "y": 3.25 },
{ "matrix": [3, 17], "x": 18.5, "y": 3.25 },
- { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+ { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
{ "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -124,11 +124,11 @@
{ "matrix": [4, 15], "x": 16.5, "y": 4.25 },
{ "matrix": [4, 16], "x": 17.5, "y": 4.25 },
{ "matrix": [4, 17], "x": 18.5, "y": 4.25 },
- { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+ { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
{ "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
- { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10.0, "y": 5.25 },
+ { "label": "Alt", "matrix": [5, 10], "w": 1.5, "x": 10, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 11], "w": 1.5, "x": 11.5, "y": 5.25 },
{ "label": "\u2190", "matrix": [5, 12], "x": 13.25, "y": 5.25 },
{ "label": "\u2193", "matrix": [5, 13], "x": 14.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c b/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c
deleted file mode 100644
index e7102c47f2..0000000000
--- a/keyboards/cannonkeys/brutalv2_65/brutalv2_65.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "brutalv2_65.h"
diff --git a/keyboards/cannonkeys/brutalv2_65/config.h b/keyboards/cannonkeys/brutalv2_65/config.h
index 14b14879d6..ae9c049bc1 100644
--- a/keyboards/cannonkeys/brutalv2_65/config.h
+++ b/keyboards/cannonkeys/brutalv2_65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 }
-#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/brutalv2_65/info.json b/keyboards/cannonkeys/brutalv2_65/info.json
index 000e541557..699b31fea2 100644
--- a/keyboards/cannonkeys/brutalv2_65/info.json
+++ b/keyboards/cannonkeys/brutalv2_65/info.json
@@ -8,6 +8,11 @@
"pid": "0x0008",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2"],
+ "rows": ["C14", "A1", "B14", "B15", "A8"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B3",
"on_state": 0
diff --git a/keyboards/cannonkeys/caerdroia/info.json b/keyboards/cannonkeys/caerdroia/info.json
index 9fb4da4c93..1b3bd40e67 100644
--- a/keyboards/cannonkeys/caerdroia/info.json
+++ b/keyboards/cannonkeys/caerdroia/info.json
@@ -31,41 +31,41 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.5, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.5, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.5, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.5, "y": 0.0 },
- { "matrix": [0, 10], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 13.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 14.0, "y": 0.0 },
- { "matrix": [0, 14], "x": 15.25, "y": 0.0 },
- { "matrix": [0, 15], "x": 16.25, "y": 0.0 },
- { "matrix": [0, 16], "x": 17.25, "y": 0.0 },
- { "matrix": [1, 0], "x": 0.0, "y": 1.25 },
- { "matrix": [1, 1], "x": 1.0, "y": 1.25 },
- { "matrix": [1, 2], "x": 2.0, "y": 1.25 },
- { "matrix": [1, 3], "x": 3.0, "y": 1.25 },
- { "matrix": [1, 4], "x": 4.0, "y": 1.25 },
- { "matrix": [1, 5], "x": 5.0, "y": 1.25 },
- { "matrix": [1, 6], "x": 6.0, "y": 1.25 },
- { "matrix": [1, 7], "x": 7.0, "y": 1.25 },
- { "matrix": [1, 8], "x": 8.0, "y": 1.25 },
- { "matrix": [1, 9], "x": 9.0, "y": 1.25 },
- { "matrix": [1, 10], "x": 10.0, "y": 1.25 },
- { "matrix": [1, 11], "x": 11.0, "y": 1.25 },
- { "matrix": [1, 12], "x": 12.0, "y": 1.25 },
- { "matrix": [1, 13], "x": 13.0, "y": 1.25 },
- { "matrix": [3, 12], "x": 14.0, "y": 1.25 },
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6.5, "y": 0 },
+ { "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "matrix": [0, 9], "x": 9.5, "y": 0 },
+ { "matrix": [0, 10], "x": 11, "y": 0 },
+ { "matrix": [0, 11], "x": 12, "y": 0 },
+ { "matrix": [0, 12], "x": 13, "y": 0 },
+ { "matrix": [0, 13], "x": 14, "y": 0 },
+ { "matrix": [0, 14], "x": 15.25, "y": 0 },
+ { "matrix": [0, 15], "x": 16.25, "y": 0 },
+ { "matrix": [0, 16], "x": 17.25, "y": 0 },
+ { "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "matrix": [1, 4], "x": 4, "y": 1.25 },
+ { "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "matrix": [1, 13], "x": 13, "y": 1.25 },
+ { "matrix": [3, 12], "x": 14, "y": 1.25 },
{ "matrix": [1, 14], "x": 15.25, "y": 1.25 },
{ "matrix": [1, 15], "x": 16.25, "y": 1.25 },
{ "matrix": [1, 16], "x": 17.25, "y": 1.25 },
- { "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+ { "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -82,7 +82,7 @@
{ "matrix": [2, 14], "x": 15.25, "y": 2.25 },
{ "matrix": [2, 15], "x": 16.25, "y": 2.25 },
{ "matrix": [2, 16], "x": 17.25, "y": 2.25 },
- { "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+ { "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -95,7 +95,7 @@
{ "matrix": [3, 10], "x": 10.75, "y": 3.25 },
{ "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "matrix": [3, 13], "w": 2.25, "x": 12.75, "y": 3.25 },
- { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
{ "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -108,13 +108,13 @@
{ "matrix": [4, 10], "x": 10.25, "y": 4.25 },
{ "matrix": [4, 11], "x": 11.25, "y": 4.25 },
{ "matrix": [4, 12], "w": 1.75, "x": 12.25, "y": 4.25 },
- { "matrix": [4, 13], "x": 14.0, "y": 4.25 },
+ { "matrix": [4, 13], "x": 14, "y": 4.25 },
{ "matrix": [4, 15], "x": 16.25, "y": 4.25 },
- { "matrix": [5, 0], "w": 1.5, "x": 0.0, "y": 5.25 },
+ { "matrix": [5, 0], "w": 1.5, "x": 0, "y": 5.25 },
{ "matrix": [5, 1], "x": 1.5, "y": 5.25 },
{ "matrix": [5, 2], "w": 1.5, "x": 2.5, "y": 5.25 },
- { "matrix": [5, 6], "w": 7, "x": 4.0, "y": 5.25 },
- { "matrix": [5, 11], "w": 1.5, "x": 11.0, "y": 5.25 },
+ { "matrix": [5, 6], "w": 7, "x": 4, "y": 5.25 },
+ { "matrix": [5, 11], "w": 1.5, "x": 11, "y": 5.25 },
{ "matrix": [5, 12], "x": 12.5, "y": 5.25 },
{ "matrix": [5, 13], "w": 1.5, "x": 13.5, "y": 5.25 },
{ "matrix": [5, 14], "x": 15.25, "y": 5.25 },
diff --git a/keyboards/cannonkeys/chimera65/chimera65.c b/keyboards/cannonkeys/chimera65/chimera65.c
deleted file mode 100644
index 14f170d9c2..0000000000
--- a/keyboards/cannonkeys/chimera65/chimera65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "chimera65.h"
diff --git a/keyboards/cannonkeys/chimera65/config.h b/keyboards/cannonkeys/chimera65/config.h
index 26e04106ab..a47b76953a 100644
--- a/keyboards/cannonkeys/chimera65/config.h
+++ b/keyboards/cannonkeys/chimera65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B2, B1, A5, A4, A3, A2, A1, F0, C15, C14, A9, A8, A10, B3 }
-#define MATRIX_ROW_PINS { A13, A14, A15, C13, B8 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/chimera65/info.json b/keyboards/cannonkeys/chimera65/info.json
index cdd07c3459..e5b30d6ea3 100644
--- a/keyboards/cannonkeys/chimera65/info.json
+++ b/keyboards/cannonkeys/chimera65/info.json
@@ -8,6 +8,11 @@
"pid": "0xC024",
"device_version": "0.0.1"
},
+ "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"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/chimera65_hs/info.json b/keyboards/cannonkeys/chimera65_hs/info.json
index bea5e6b7c8..be1e83e190 100644
--- a/keyboards/cannonkeys/chimera65_hs/info.json
+++ b/keyboards/cannonkeys/chimera65_hs/info.json
@@ -30,70 +30,70 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "matrix": [1, 14], "x": 15.5, "y": 1.0 },
- { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "matrix": [2, 14], "x": 15.5, "y": 2.0 },
- { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+ { "matrix": [0, 10], "x": 10, "y": 0 },
+ { "matrix": [0, 11], "x": 11, "y": 0 },
+ { "matrix": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [0, 13], "x": 13, "y": 0 },
+ { "matrix": [0, 14], "x": 14, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [1, 14], "x": 15.5, "y": 1 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+ { "matrix": [2, 14], "x": 15.5, "y": 2 },
+ { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
{ "matrix": [3, 13], "x": 14.25, "y": 3.25 },
- { "matrix": [3, 14], "x": 15.5, "y": 3.0 },
- { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
- { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
- { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
- { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
- { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4.0 },
+ { "matrix": [3, 14], "x": 15.5, "y": 3 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "w": 1.5, "x": 11.5, "y": 4 },
{ "matrix": [4, 12], "x": 13.25, "y": 4.25 },
{ "matrix": [4, 13], "x": 14.25, "y": 4.25 },
{ "matrix": [4, 14], "x": 15.25, "y": 4.25 }
diff --git a/keyboards/cannonkeys/cloudline/cloudline.c b/keyboards/cannonkeys/cloudline/cloudline.c
deleted file mode 100644
index d2b347a455..0000000000
--- a/keyboards/cannonkeys/cloudline/cloudline.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Andrew Kannan (@awkannan)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "cloudline.h"
diff --git a/keyboards/cannonkeys/cloudline/config.h b/keyboards/cannonkeys/cloudline/config.h
index d7c7052163..8826d5568a 100644
--- a/keyboards/cannonkeys/cloudline/config.h
+++ b/keyboards/cannonkeys/cloudline/config.h
@@ -3,10 +3,6 @@
#pragma once
-#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 }
-#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/cloudline/info.json b/keyboards/cannonkeys/cloudline/info.json
index d5d8b817ea..c9e8c7a05c 100644
--- a/keyboards/cannonkeys/cloudline/info.json
+++ b/keyboards/cannonkeys/cloudline/info.json
@@ -8,6 +8,14 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "driver": "spi"
+ },
+ "matrix_pins": {
+ "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
+ "rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/cloudline/rules.mk b/keyboards/cannonkeys/cloudline/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/cloudline/rules.mk
+++ b/keyboards/cannonkeys/cloudline/rules.mk
@@ -13,7 +13,6 @@ 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
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/crin/config.h b/keyboards/cannonkeys/crin/config.h
index c275e78f23..d6e974b21d 100644
--- a/keyboards/cannonkeys/crin/config.h
+++ b/keyboards/cannonkeys/crin/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 }
-#define DIODE_DIRECTION COL2ROW
-
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/crin/crin.c b/keyboards/cannonkeys/crin/crin.c
deleted file mode 100644
index 9f6039ff09..0000000000
--- a/keyboards/cannonkeys/crin/crin.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "crin.h"
diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json
index 6c6afa0f89..0fa01b54a2 100644
--- a/keyboards/cannonkeys/crin/info.json
+++ b/keyboards/cannonkeys/crin/info.json
@@ -8,6 +8,11 @@
"pid": "0x0012",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "C15", "C14", "A7", "A5", "C13", "A4", "A2", "A1", "A0", "B9", "B8", "B7", "A3", "B6", "B4", "B3", "A15"],
+ "rows": ["B11", "B10", "B2", "F0", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/db60/config.h b/keyboards/cannonkeys/db60/config.h
index 9e034e7c12..1bdd8995f7 100644
--- a/keyboards/cannonkeys/db60/config.h
+++ b/keyboards/cannonkeys/db60/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B2, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/db60/info.json b/keyboards/cannonkeys/db60/info.json
index 5f4a94d367..41aee2dda7 100644
--- a/keyboards/cannonkeys/db60/info.json
+++ b/keyboards/cannonkeys/db60/info.json
@@ -6,11 +6,19 @@
"vid": "0xCA04",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B2", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu"
}
diff --git a/keyboards/cannonkeys/db60/rules.mk b/keyboards/cannonkeys/db60/rules.mk
index 56e7b05c52..9a57c69c7e 100644
--- a/keyboards/cannonkeys/db60/rules.mk
+++ b/keyboards/cannonkeys/db60/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
DEFAULT_FOLDER = cannonkeys/db60/rev2
diff --git a/keyboards/cannonkeys/devastatingtkl/config.h b/keyboards/cannonkeys/devastatingtkl/config.h
index cd6fa15243..ab8f8fa121 100644
--- a/keyboards/cannonkeys/devastatingtkl/config.h
+++ b/keyboards/cannonkeys/devastatingtkl/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B14, A8, A9, A10, A3, B0, A2, A1, A7, A0, B4, B6, B7 }
-#define MATRIX_ROW_PINS { A15, B3, B5, A4, A5, F1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c b/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c
deleted file mode 100644
index 46072b4090..0000000000
--- a/keyboards/cannonkeys/devastatingtkl/devastatingtkl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "devastatingtkl.h"
diff --git a/keyboards/cannonkeys/devastatingtkl/info.json b/keyboards/cannonkeys/devastatingtkl/info.json
index 557b53817b..2e176b4751 100644
--- a/keyboards/cannonkeys/devastatingtkl/info.json
+++ b/keyboards/cannonkeys/devastatingtkl/info.json
@@ -8,11 +8,19 @@
"pid": "0xDE57",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B2", "B10", "B11", "B12", "B14", "A8", "A9", "A10", "A3", "B0", "A2", "A1", "A7", "A0", "B4", "B6", "B7"],
+ "rows": ["A15", "B3", "B5", "A4", "A5", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/devastatingtkl/rules.mk b/keyboards/cannonkeys/devastatingtkl/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ellipse/info.json b/keyboards/cannonkeys/ellipse/info.json
index 7788b893bf..461ec4971e 100644
--- a/keyboards/cannonkeys/ellipse/info.json
+++ b/keyboards/cannonkeys/ellipse/info.json
@@ -36,71 +36,71 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
- { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
- { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4.0 }
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+ { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2 },
+ { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4 },
+ { "label": "Alt", "matrix": [4, 10], "w": 1.25, "x": 10, "y": 4 },
+ { "label": "Win", "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4 },
+ { "label": "Fn", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.25, "x": 13.75, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/ellipse_hs/info.json b/keyboards/cannonkeys/ellipse_hs/info.json
index 76cb0cfae2..f83f26bcaa 100644
--- a/keyboards/cannonkeys/ellipse_hs/info.json
+++ b/keyboards/cannonkeys/ellipse_hs/info.json
@@ -26,68 +26,68 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+ { "label": "Del", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "Bksp", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/gentoo/config.h b/keyboards/cannonkeys/gentoo/config.h
index 14b14879d6..ae9c049bc1 100644
--- a/keyboards/cannonkeys/gentoo/config.h
+++ b/keyboards/cannonkeys/gentoo/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { C13, C15, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2 }
-#define MATRIX_ROW_PINS { C14, A1, B14, B15, A8 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/gentoo/gentoo.c b/keyboards/cannonkeys/gentoo/gentoo.c
deleted file mode 100644
index a535e9b44c..0000000000
--- a/keyboards/cannonkeys/gentoo/gentoo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gentoo.h"
diff --git a/keyboards/cannonkeys/gentoo/info.json b/keyboards/cannonkeys/gentoo/info.json
index 6b0c9399be..0608a560be 100644
--- a/keyboards/cannonkeys/gentoo/info.json
+++ b/keyboards/cannonkeys/gentoo/info.json
@@ -8,6 +8,11 @@
"pid": "0x000F",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C13", "C15", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2"],
+ "rows": ["C14", "A1", "B14", "B15", "A8"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B3",
"on_state": 0
diff --git a/keyboards/cannonkeys/gentoo_hs/config.h b/keyboards/cannonkeys/gentoo_hs/config.h
index 8c83fe3fc6..4b007cf387 100644
--- a/keyboards/cannonkeys/gentoo_hs/config.h
+++ b/keyboards/cannonkeys/gentoo_hs/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 }
-#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c b/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c
deleted file mode 100644
index 8ecaa655f8..0000000000
--- a/keyboards/cannonkeys/gentoo_hs/gentoo_hs.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "gentoo_hs.h"
diff --git a/keyboards/cannonkeys/gentoo_hs/info.json b/keyboards/cannonkeys/gentoo_hs/info.json
index 8595a321b2..f42bb88baa 100644
--- a/keyboards/cannonkeys/gentoo_hs/info.json
+++ b/keyboards/cannonkeys/gentoo_hs/info.json
@@ -8,6 +8,11 @@
"pid": "0x0010",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+ "rows": ["A14", "A15", "A0", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B14",
"on_state": 0
diff --git a/keyboards/cannonkeys/hoodrowg/config.h b/keyboards/cannonkeys/hoodrowg/config.h
index 103faf39f9..c4e3629964 100644
--- a/keyboards/cannonkeys/hoodrowg/config.h
+++ b/keyboards/cannonkeys/hoodrowg/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_COL_PINS { B5, B4, D7, F5, F6, F7, F4, D2, D0 }
-#define MATRIX_ROW_PINS { E6, B7, B0, B1, F1, F0, C6, C7, D4, D6, D5, D3 }
-#define DIODE_DIRECTION COL2ROW
-
#define RGB_DI_PIN D1
#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cannonkeys/hoodrowg/hoodrowg.c b/keyboards/cannonkeys/hoodrowg/hoodrowg.c
deleted file mode 100644
index f3aff6a32b..0000000000
--- a/keyboards/cannonkeys/hoodrowg/hoodrowg.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
-Copyright 2021 CannonKeys LLC
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "hoodrowg.h"
diff --git a/keyboards/cannonkeys/hoodrowg/info.json b/keyboards/cannonkeys/hoodrowg/info.json
index 4d0adb731a..cd08c00354 100644
--- a/keyboards/cannonkeys/hoodrowg/info.json
+++ b/keyboards/cannonkeys/hoodrowg/info.json
@@ -8,6 +8,11 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "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"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B6",
"scroll_lock": "B2"
diff --git a/keyboards/cannonkeys/instant60/config.h b/keyboards/cannonkeys/instant60/config.h
index 8e7158765d..3120b3167a 100644
--- a/keyboards/cannonkeys/instant60/config.h
+++ b/keyboards/cannonkeys/instant60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B2, B10, B11, A9, A15, B3, B4, B5, B6, B7, B8, B9, C13, C14, C15 }
-#define MATRIX_ROW_PINS { B1, B0, A7, A5, A4 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/instant60/info.json b/keyboards/cannonkeys/instant60/info.json
index 56f5126d0d..de3359c1a8 100644
--- a/keyboards/cannonkeys/instant60/info.json
+++ b/keyboards/cannonkeys/instant60/info.json
@@ -8,11 +8,19 @@
"pid": "0x1600",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B2", "B10", "B11", "A9", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15"],
+ "rows": ["B1", "B0", "A7", "A5", "A4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["60_ansi", "60_tsangan_hhkb"],
diff --git a/keyboards/cannonkeys/instant60/instant60.c b/keyboards/cannonkeys/instant60/instant60.c
deleted file mode 100644
index 25b7099b0b..0000000000
--- a/keyboards/cannonkeys/instant60/instant60.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "instant60.h"
diff --git a/keyboards/cannonkeys/instant60/rules.mk b/keyboards/cannonkeys/instant60/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/instant60/rules.mk
+++ b/keyboards/cannonkeys/instant60/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/instant65/config.h b/keyboards/cannonkeys/instant65/config.h
index 5afccde3a7..898aff0ff5 100644
--- a/keyboards/cannonkeys/instant65/config.h
+++ b/keyboards/cannonkeys/instant65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A8, C13, B9, B8, B7, B6, B5, B4, B3, A7, A5, A4, A3, A2, A1 }
-#define MATRIX_ROW_PINS { A14, A15, A0, B1, B0 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/instant65/info.json b/keyboards/cannonkeys/instant65/info.json
index eedb9bd5c7..4fcb8a1c77 100644
--- a/keyboards/cannonkeys/instant65/info.json
+++ b/keyboards/cannonkeys/instant65/info.json
@@ -8,11 +8,19 @@
"pid": "0x1565",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A8", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A7", "A5", "A4", "A3", "A2", "A1"],
+ "rows": ["A14", "A15", "A0", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/instant65/instant65.c b/keyboards/cannonkeys/instant65/instant65.c
deleted file mode 100644
index 5efbf8226c..0000000000
--- a/keyboards/cannonkeys/instant65/instant65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "instant65.h"
diff --git a/keyboards/cannonkeys/instant65/rules.mk b/keyboards/cannonkeys/instant65/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/instant65/rules.mk
+++ b/keyboards/cannonkeys/instant65/rules.mk
@@ -13,7 +13,6 @@ 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
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/iron165/config.h b/keyboards/cannonkeys/iron165/config.h
index eb7011b349..eb890c1cbf 100644
--- a/keyboards/cannonkeys/iron165/config.h
+++ b/keyboards/cannonkeys/iron165/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A8, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B12, B13, B14, B15, A1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/iron165/info.json b/keyboards/cannonkeys/iron165/info.json
index b0ad19785c..39eaa70731 100644
--- a/keyboards/cannonkeys/iron165/info.json
+++ b/keyboards/cannonkeys/iron165/info.json
@@ -8,6 +8,11 @@
"pid": "0x5165",
"device_version": "0.0.1"
},
+ "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"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/iron165/iron165.c b/keyboards/cannonkeys/iron165/iron165.c
deleted file mode 100644
index da21712fb2..0000000000
--- a/keyboards/cannonkeys/iron165/iron165.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "iron165.h"
diff --git a/keyboards/cannonkeys/malicious_ergo/config.h b/keyboards/cannonkeys/malicious_ergo/config.h
index 57fa0cf7c3..a45b992779 100644
--- a/keyboards/cannonkeys/malicious_ergo/config.h
+++ b/keyboards/cannonkeys/malicious_ergo/config.h
@@ -19,10 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B1, B0, A7, A1, A5, A4, A3, A10, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B2, B10, B11, A2, A0 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/malicious_ergo/info.json b/keyboards/cannonkeys/malicious_ergo/info.json
index 9058e07878..1e52c18190 100644
--- a/keyboards/cannonkeys/malicious_ergo/info.json
+++ b/keyboards/cannonkeys/malicious_ergo/info.json
@@ -8,11 +8,19 @@
"pid": "0x0009",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B0", "A7", "A1", "A5", "A4", "A3", "A10", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B2", "B10", "B11", "A2", "A0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"indicators": {
"caps_lock": "A8",
"num_lock": "A9",
diff --git a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c b/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
deleted file mode 100644
index 58e33a3889..0000000000
--- a/keyboards/cannonkeys/malicious_ergo/malicious_ergo.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2022 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "malicious_ergo.h"
diff --git a/keyboards/cannonkeys/malicious_ergo/rules.mk b/keyboards/cannonkeys/malicious_ergo/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/malicious_ergo/rules.mk
+++ b/keyboards/cannonkeys/malicious_ergo/rules.mk
@@ -13,7 +13,6 @@ 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
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/moment/info.json b/keyboards/cannonkeys/moment/info.json
index 462c42d9b6..63da2b29e4 100644
--- a/keyboards/cannonkeys/moment/info.json
+++ b/keyboards/cannonkeys/moment/info.json
@@ -36,70 +36,70 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
- { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+ { "label": "Bksp", "matrix": [0, 13], "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "label": "\\", "matrix": [2, 12], "x": 12.75, "y": 2 },
+ { "label": "Enter", "matrix": [2, 14], "w": 1.25, "x": 13.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "label": "|", "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/moment_hs/info.json b/keyboards/cannonkeys/moment_hs/info.json
index 721eb80ad2..098d0dc4cf 100644
--- a/keyboards/cannonkeys/moment_hs/info.json
+++ b/keyboards/cannonkeys/moment_hs/info.json
@@ -30,68 +30,68 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "!", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "@", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "#", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "$", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "%", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "^", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "&", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "*", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "(", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": ")", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "_", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "+", "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "label": "Bksp", "matrix": [0, 14], "x": 13.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 13], "x": 14.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
- { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "label": "Fn", "matrix": [3, 14], "x": 14.0, "y": 3.0 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 7.0, "x": 4.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11.0, "y": 4.0 },
- { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4.0 },
- { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4.0 }
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "*", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "(", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": ")", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "_", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "+", "matrix": [0, 12], "x": 12, "y": 0 },
+ { "label": "Bksp", "matrix": [0, 14], "x": 13, "y": 0 },
+ { "label": "Del", "matrix": [0, 13], "x": 14, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "label": "{", "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "label": "}", "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "label": "|", "matrix": [1, 14], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "label": ":", "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "label": "Enter", "matrix": [2, 14], "w": 2.25, "x": 12.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "label": "<", "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "label": ">", "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "label": "?", "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "label": "Fn", "matrix": [3, 14], "x": 14, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.5, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 7, "x": 4, "y": 4 },
+ { "label": "Alt", "matrix": [4, 11], "w": 1.5, "x": 11, "y": 4 },
+ { "label": "Win", "matrix": [4, 12], "x": 12.5, "y": 4 },
+ { "label": "Menu", "matrix": [4, 14], "w": 1.5, "x": 13.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/nearfield/config.h b/keyboards/cannonkeys/nearfield/config.h
deleted file mode 100755
index 5c989ba3f3..0000000000
--- a/keyboards/cannonkeys/nearfield/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2021 Dr.Doof
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B4, D2, D4, D6, D7 }
-#define MATRIX_COL_PINS { D3, D5, C6, C7, B6, B5, B7, F0, F1, F4, F5, F6, F7, B3, B2, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/cannonkeys/nearfield/info.json b/keyboards/cannonkeys/nearfield/info.json
index 83550cbd36..998cbc14d6 100644
--- a/keyboards/cannonkeys/nearfield/info.json
+++ b/keyboards/cannonkeys/nearfield/info.json
@@ -8,6 +8,11 @@
"pid":"0x0002",
"device_version":"0.0.1"
},
+ "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"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"debounce": 0,
diff --git a/keyboards/cannonkeys/nearfield/nearfield.c b/keyboards/cannonkeys/nearfield/nearfield.c
deleted file mode 100755
index 7a635209de..0000000000
--- a/keyboards/cannonkeys/nearfield/nearfield.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2021 Dr.Doof
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "nearfield.h"
diff --git a/keyboards/cannonkeys/obliterated75/config.h b/keyboards/cannonkeys/obliterated75/config.h
index 6d2ab14c6b..898aff0ff5 100644
--- a/keyboards/cannonkeys/obliterated75/config.h
+++ b/keyboards/cannonkeys/obliterated75/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { A13, B12, B11, B14, A8, A1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/obliterated75/info.json b/keyboards/cannonkeys/obliterated75/info.json
index 30ea22bd74..63d8af39e3 100644
--- a/keyboards/cannonkeys/obliterated75/info.json
+++ b/keyboards/cannonkeys/obliterated75/info.json
@@ -8,11 +8,19 @@
"pid": "0x0B75",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["A13", "B12", "B11", "B14", "A8", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/obliterated75/obliterated75.c b/keyboards/cannonkeys/obliterated75/obliterated75.c
deleted file mode 100644
index 347a643836..0000000000
--- a/keyboards/cannonkeys/obliterated75/obliterated75.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "obliterated75.h"
diff --git a/keyboards/cannonkeys/obliterated75/rules.mk b/keyboards/cannonkeys/obliterated75/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/keyboards/cannonkeys/obliterated75/rules.mk
@@ -13,7 +13,6 @@ 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
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/onyx/config.h b/keyboards/cannonkeys/onyx/config.h
index 3c95a53960..a47b76953a 100644
--- a/keyboards/cannonkeys/onyx/config.h
+++ b/keyboards/cannonkeys/onyx/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B1, B0, C15, C14, A7, A5, C13, A4, A2, A1, A0, B9, B8, B7, A3, B6, B4, B3, A15 }
-#define MATRIX_ROW_PINS { B11, B10, B2, F0, B5 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/onyx/info.json b/keyboards/cannonkeys/onyx/info.json
index a4e1a69c9c..0227024f02 100644
--- a/keyboards/cannonkeys/onyx/info.json
+++ b/keyboards/cannonkeys/onyx/info.json
@@ -8,6 +8,11 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B0", "C15", "C14", "A7", "A5", "C13", "A4", "A2", "A1", "A0", "B9", "B8", "B7", "A3", "B6", "B4", "B3", "A15"],
+ "rows": ["B11", "B10", "B2", "F0", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/onyx/onyx.c b/keyboards/cannonkeys/onyx/onyx.c
deleted file mode 100644
index fee271c9ee..0000000000
--- a/keyboards/cannonkeys/onyx/onyx.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "onyx.h"
diff --git a/keyboards/cannonkeys/ortho48/config.h b/keyboards/cannonkeys/ortho48/config.h
index 5c864541c7..fd38d4677f 100644
--- a/keyboards/cannonkeys/ortho48/config.h
+++ b/keyboards/cannonkeys/ortho48/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14}
-#define MATRIX_ROW_PINS { B12, C13, A2, A1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/cannonkeys/ortho48/info.json b/keyboards/cannonkeys/ortho48/info.json
index ba7f1dbdd4..e4832540d4 100644
--- a/keyboards/cannonkeys/ortho48/info.json
+++ b/keyboards/cannonkeys/ortho48/info.json
@@ -8,116 +8,130 @@
"pid": "0x4F48",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14"],
+ "rows": ["B12", "C13", "A2", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A8",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"community_layouts": ["ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
- {"label":"Tab", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Delete", "x":11, "y":0},
- {"label":"Esc", "x":0, "y":1},
- {"label":"A", "x":1, "y":1},
- {"label":"S", "x":2, "y":1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1},
- {"label":"G", "x":5, "y":1},
- {"label":"H", "x":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":";", "x":10, "y":1},
- {"label":"'", "x":11, "y":1},
- {"label":"Shift", "x":0, "y":2},
- {"label":"Z", "x":1, "y":2},
- {"label":"X", "x":2, "y":2},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2},
- {"label":"B", "x":5, "y":2},
- {"label":"N", "x":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":",", "x":8, "y":2},
- {"label":".", "x":9, "y":2},
- {"label":"/", "x":10, "y":2},
- {"label":"Enter", "x":11, "y":2},
- {"label":"Fn", "x":0, "y":3},
- {"label":"Ctrl", "x":1, "y":3},
- {"label":"Alt", "x":2, "y":3},
- {"label":"Meta", "x":3, "y":3},
- {"label":"Lower", "x":4, "y":3},
- {"label":"Space", "x":5, "y":3},
- {"label":"Space", "x":6, "y":3},
- {"label":"Raise", "x":7, "y":3},
- {"label":"Left", "x":8, "y":3},
- {"label":"Down", "x":9, "y":3},
- {"label":"Up", "x":10, "y":3},
- {"label":"Right", "x":11, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
},
"LAYOUT_1x2uC": {
"layout": [
- {"label":"Tab", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Delete", "x":11, "y":0},
- {"label":"Esc", "x":0, "y":1},
- {"label":"A", "x":1, "y":1},
- {"label":"S", "x":2, "y":1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1},
- {"label":"G", "x":5, "y":1},
- {"label":"H", "x":6, "y":1},
- {"label":"J", "x":7, "y":1},
- {"label":"K", "x":8, "y":1},
- {"label":"L", "x":9, "y":1},
- {"label":";", "x":10, "y":1},
- {"label":"'", "x":11, "y":1},
- {"label":"Shift", "x":0, "y":2},
- {"label":"Z", "x":1, "y":2},
- {"label":"X", "x":2, "y":2},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2},
- {"label":"B", "x":5, "y":2},
- {"label":"N", "x":6, "y":2},
- {"label":"M", "x":7, "y":2},
- {"label":",", "x":8, "y":2},
- {"label":".", "x":9, "y":2},
- {"label":"/", "x":10, "y":2},
- {"label":"Enter", "x":11, "y":2},
- {"label":"Fn", "x":0, "y":3},
- {"label":"Ctrl", "x":1, "y":3},
- {"label":"Alt", "x":2, "y":3},
- {"label":"Meta", "x":3, "y":3},
- {"label":"Lower", "x":4, "y":3},
- {"label":"Space", "x":5, "y":3, "w":2},
- {"label":"Raise", "x":7, "y":3},
- {"label":"Left", "x":8, "y":3},
- {"label":"Down", "x":9, "y":3},
- {"label":"Up", "x":10, "y":3},
- {"label":"Right", "x":11, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/cannonkeys/ortho48/ortho48.c b/keyboards/cannonkeys/ortho48/ortho48.c
deleted file mode 100644
index fe38f02007..0000000000
--- a/keyboards/cannonkeys/ortho48/ortho48.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "ortho48.h"
-
diff --git a/keyboards/cannonkeys/ortho48/ortho48.h b/keyboards/cannonkeys/ortho48/ortho48.h
deleted file mode 100644
index 1e51c37af7..0000000000
--- a/keyboards/cannonkeys/ortho48/ortho48.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_1x2uC( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35 , k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/cannonkeys/ortho48/rules.mk b/keyboards/cannonkeys/ortho48/rules.mk
index f7dee7ff20..57a302eec3 100644
--- a/keyboards/cannonkeys/ortho48/rules.mk
+++ b/keyboards/cannonkeys/ortho48/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho60/config.h b/keyboards/cannonkeys/ortho60/config.h
index f9c6596a9f..378e08c49d 100644
--- a/keyboards/cannonkeys/ortho60/config.h
+++ b/keyboards/cannonkeys/ortho60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0 }
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/cannonkeys/ortho60/info.json b/keyboards/cannonkeys/ortho60/info.json
index 8426955dae..bf5b56c57f 100644
--- a/keyboards/cannonkeys/ortho60/info.json
+++ b/keyboards/cannonkeys/ortho60/info.json
@@ -8,140 +8,156 @@
"pid": "0x4F60",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
+ "rows": ["B3", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A8",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"Delete", "x":11, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"Fn", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"Meta", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4},
- {"label":"Space", "x":6, "y":4},
- {"label":"Raise", "x":7, "y":4},
- {"label":"Left", "x":8, "y":4},
- {"label":"Down", "x":9, "y":4},
- {"label":"Up", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
},
"LAYOUT_1x2uC": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"Delete", "x":11, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"Fn", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"Meta", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4, "w":2},
- {"label":"Raise", "x":7, "y":4},
- {"label":"Left", "x":8, "y":4},
- {"label":"Down", "x":9, "y":4},
- {"label":"Up", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4, "w": 2},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/cannonkeys/ortho60/ortho60.c b/keyboards/cannonkeys/ortho60/ortho60.c
deleted file mode 100644
index f917ef96f9..0000000000
--- a/keyboards/cannonkeys/ortho60/ortho60.c
+++ /dev/null
@@ -1,3 +0,0 @@
-
-#include "ortho60.h"
-
diff --git a/keyboards/cannonkeys/ortho60/ortho60.h b/keyboards/cannonkeys/ortho60/ortho60.h
deleted file mode 100644
index 0f3ae127aa..0000000000
--- a/keyboards/cannonkeys/ortho60/ortho60.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_1x2uC( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45 , k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b }, \
-}
-
-#define LAYOUT_ortho_5x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b }, \
-}
diff --git a/keyboards/cannonkeys/ortho60/rules.mk b/keyboards/cannonkeys/ortho60/rules.mk
index f7dee7ff20..57a302eec3 100644
--- a/keyboards/cannonkeys/ortho60/rules.mk
+++ b/keyboards/cannonkeys/ortho60/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/ortho60v2/info.json b/keyboards/cannonkeys/ortho60v2/info.json
index 03e1a28f30..0f7c6ba0c6 100644
--- a/keyboards/cannonkeys/ortho60v2/info.json
+++ b/keyboards/cannonkeys/ortho60v2/info.json
@@ -38,66 +38,66 @@
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
- { "label": "`", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "1", "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "label": "2", "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "label": "3", "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "label": "4", "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "label": "5", "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "label": "6", "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "label": "7", "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "label": "8", "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "label": "9", "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "label": "0", "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "label": "Del", "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "label": "Tab", "matrix": [1, 0], "x": 0.0, "y": 1.0 },
- { "label": "Q", "matrix": [1, 1], "x": 1.0, "y": 1.0 },
- { "label": "W", "matrix": [1, 2], "x": 2.0, "y": 1.0 },
- { "label": "E", "matrix": [1, 3], "x": 3.0, "y": 1.0 },
- { "label": "R", "matrix": [1, 4], "x": 4.0, "y": 1.0 },
- { "label": "T", "matrix": [1, 5], "x": 5.0, "y": 1.0 },
- { "label": "Y", "matrix": [1, 6], "x": 6.0, "y": 1.0 },
- { "label": "U", "matrix": [1, 7], "x": 7.0, "y": 1.0 },
- { "label": "I", "matrix": [1, 8], "x": 8.0, "y": 1.0 },
- { "label": "O", "matrix": [1, 9], "x": 9.0, "y": 1.0 },
- { "label": "P", "matrix": [1, 10], "x": 10.0, "y": 1.0 },
- { "label": "Back Space", "matrix": [1, 11], "x": 11.0, "y": 1.0 },
- { "label": "Esc", "matrix": [2, 0], "x": 0.0, "y": 2.0 },
- { "label": "A", "matrix": [2, 1], "x": 1.0, "y": 2.0 },
- { "label": "S", "matrix": [2, 2], "x": 2.0, "y": 2.0 },
- { "label": "D", "matrix": [2, 3], "x": 3.0, "y": 2.0 },
- { "label": "F", "matrix": [2, 4], "x": 4.0, "y": 2.0 },
- { "label": "G", "matrix": [2, 5], "x": 5.0, "y": 2.0 },
- { "label": "H", "matrix": [2, 6], "x": 6.0, "y": 2.0 },
- { "label": "J", "matrix": [2, 7], "x": 7.0, "y": 2.0 },
- { "label": "K", "matrix": [2, 8], "x": 8.0, "y": 2.0 },
- { "label": "L", "matrix": [2, 9], "x": 9.0, "y": 2.0 },
- { "label": ";", "matrix": [2, 10], "x": 10.0, "y": 2.0 },
- { "label": "'", "matrix": [2, 11], "x": 11.0, "y": 2.0 },
- { "label": "Shift", "matrix": [3, 0], "x": 0.0, "y": 3.0 },
- { "label": "Z", "matrix": [3, 1], "x": 1.0, "y": 3.0 },
- { "label": "X", "matrix": [3, 2], "x": 2.0, "y": 3.0 },
- { "label": "C", "matrix": [3, 3], "x": 3.0, "y": 3.0 },
- { "label": "V", "matrix": [3, 4], "x": 4.0, "y": 3.0 },
- { "label": "B", "matrix": [3, 5], "x": 5.0, "y": 3.0 },
- { "label": "N", "matrix": [3, 6], "x": 6.0, "y": 3.0 },
- { "label": "M", "matrix": [3, 7], "x": 7.0, "y": 3.0 },
- { "label": ",", "matrix": [3, 8], "x": 8.0, "y": 3.0 },
- { "label": ".", "matrix": [3, 9], "x": 9.0, "y": 3.0 },
- { "label": "/", "matrix": [3, 10], "x": 10.0, "y": 3.0 },
- { "label": "Return", "matrix": [3, 11], "x": 11.0, "y": 3.0 },
- { "matrix": [4, 0], "x": 0.0, "y": 4.0 },
- { "label": "Ctrl", "matrix": [4, 1], "x": 1.0, "y": 4.0 },
- { "label": "Alt", "matrix": [4, 2], "x": 2.0, "y": 4.0 },
- { "label": "Super", "matrix": [4, 3], "x": 3.0, "y": 4.0 },
- { "label": "Lower", "matrix": [4, 4], "x": 4.0, "y": 4.0 },
- { "matrix": [4, 5], "x": 5.0, "y": 4.0 },
- { "matrix": [4, 6], "x": 6.0, "y": 4.0 },
- { "label": "Raise", "matrix": [4, 7], "x": 7.0, "y": 4.0 },
- { "label": "&larr;", "matrix": [4, 8], "x": 8.0, "y": 4.0 },
- { "label": "&darr;", "matrix": [4, 9], "x": 9.0, "y": 4.0 },
- { "label": "&uarr;", "matrix": [4, 10], "x": 10.0, "y": 4.0 },
- { "label": "&rarr;", "matrix": [4, 11], "x": 11.0, "y": 4.0 }
+ { "label": "`", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "8", "matrix": [0, 8], "x": 8, "y": 0 },
+ { "label": "9", "matrix": [0, 9], "x": 9, "y": 0 },
+ { "label": "0", "matrix": [0, 10], "x": 10, "y": 0 },
+ { "label": "Del", "matrix": [0, 11], "x": 11, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7, "y": 1 },
+ { "label": "I", "matrix": [1, 8], "x": 8, "y": 1 },
+ { "label": "O", "matrix": [1, 9], "x": 9, "y": 1 },
+ { "label": "P", "matrix": [1, 10], "x": 10, "y": 1 },
+ { "label": "Back Space", "matrix": [1, 11], "x": 11, "y": 1 },
+ { "label": "Esc", "matrix": [2, 0], "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7, "y": 2 },
+ { "label": "K", "matrix": [2, 8], "x": 8, "y": 2 },
+ { "label": "L", "matrix": [2, 9], "x": 9, "y": 2 },
+ { "label": ";", "matrix": [2, 10], "x": 10, "y": 2 },
+ { "label": "'", "matrix": [2, 11], "x": 11, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "x": 0, "y": 3 },
+ { "label": "Z", "matrix": [3, 1], "x": 1, "y": 3 },
+ { "label": "X", "matrix": [3, 2], "x": 2, "y": 3 },
+ { "label": "C", "matrix": [3, 3], "x": 3, "y": 3 },
+ { "label": "V", "matrix": [3, 4], "x": 4, "y": 3 },
+ { "label": "B", "matrix": [3, 5], "x": 5, "y": 3 },
+ { "label": "N", "matrix": [3, 6], "x": 6, "y": 3 },
+ { "label": "M", "matrix": [3, 7], "x": 7, "y": 3 },
+ { "label": ",", "matrix": [3, 8], "x": 8, "y": 3 },
+ { "label": ".", "matrix": [3, 9], "x": 9, "y": 3 },
+ { "label": "/", "matrix": [3, 10], "x": 10, "y": 3 },
+ { "label": "Return", "matrix": [3, 11], "x": 11, "y": 3 },
+ { "matrix": [4, 0], "x": 0, "y": 4 },
+ { "label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "x": 2, "y": 4 },
+ { "label": "Super", "matrix": [4, 3], "x": 3, "y": 4 },
+ { "label": "Lower", "matrix": [4, 4], "x": 4, "y": 4 },
+ { "matrix": [4, 5], "x": 5, "y": 4 },
+ { "matrix": [4, 6], "x": 6, "y": 4 },
+ { "label": "Raise", "matrix": [4, 7], "x": 7, "y": 4 },
+ { "label": "&larr;", "matrix": [4, 8], "x": 8, "y": 4 },
+ { "label": "&darr;", "matrix": [4, 9], "x": 9, "y": 4 },
+ { "label": "&uarr;", "matrix": [4, 10], "x": 10, "y": 4 },
+ { "label": "&rarr;", "matrix": [4, 11], "x": 11, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/ortho75/config.h b/keyboards/cannonkeys/ortho75/config.h
index 5246778d13..378e08c49d 100644
--- a/keyboards/cannonkeys/ortho75/config.h
+++ b/keyboards/cannonkeys/ortho75/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, B14, A15, A0, C15, C14, B7, B6, B5 }
-#define MATRIX_ROW_PINS { B12, C13, A2, A1, A3 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/cannonkeys/ortho75/info.json b/keyboards/cannonkeys/ortho75/info.json
index 751eeb5297..b9e0526ed8 100644
--- a/keyboards/cannonkeys/ortho75/info.json
+++ b/keyboards/cannonkeys/ortho75/info.json
@@ -8,6 +8,11 @@
"pid": "0x6464",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "B14", "A15", "A0", "C15", "C14", "B7", "B6", "B5"],
+ "rows": ["B12", "C13", "A2", "A1", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B9", "pin_b": "B8"}
@@ -18,87 +23,94 @@
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"community_layouts": ["ortho_5x15"],
"layouts": {
"LAYOUT_ortho_5x15": {
"layout": [
- {"label":"`", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":6, "y":0},
- {"label":"7", "x":7, "y":0},
- {"label":"8", "x":8, "y":0},
- {"label":"9", "x":9, "y":0},
- {"label":"0", "x":10, "y":0},
- {"label":"Backspace", "x":11, "y":0},
- {"label":"0", "x":12, "y":0},
- {"label":"0", "x":13, "y":0},
- {"label":"0", "x":14, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":6, "y":1},
- {"label":"U", "x":7, "y":1},
- {"label":"I", "x":8, "y":1},
- {"label":"O", "x":9, "y":1},
- {"label":"P", "x":10, "y":1},
- {"label":"Delete", "x":11, "y":1},
- {"label":"0", "x":12, "y":1},
- {"label":"0", "x":13, "y":1},
- {"label":"0", "x":14, "y":1},
- {"label":"Esc", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":";", "x":10, "y":2},
- {"label":"'", "x":11, "y":2},
- {"label":"0", "x":12, "y":2},
- {"label":"0", "x":13, "y":2},
- {"label":"0", "x":14, "y":2},
- {"label":"Shift", "x":0, "y":3},
- {"label":"Z", "x":1, "y":3},
- {"label":"X", "x":2, "y":3},
- {"label":"C", "x":3, "y":3},
- {"label":"V", "x":4, "y":3},
- {"label":"B", "x":5, "y":3},
- {"label":"N", "x":6, "y":3},
- {"label":"M", "x":7, "y":3},
- {"label":",", "x":8, "y":3},
- {"label":".", "x":9, "y":3},
- {"label":"/", "x":10, "y":3},
- {"label":"Enter", "x":11, "y":3},
- {"label":"0", "x":12, "y":3},
- {"label":"0", "x":13, "y":3},
- {"label":"0", "x":14, "y":3},
- {"label":"Fn", "x":0, "y":4},
- {"label":"Ctrl", "x":1, "y":4},
- {"label":"Alt", "x":2, "y":4},
- {"label":"Meta", "x":3, "y":4},
- {"label":"Lower", "x":4, "y":4},
- {"label":"Space", "x":5, "y":4},
- {"label":"Space", "x":6, "y":4},
- {"label":"Raise", "x":7, "y":4},
- {"label":"Left", "x":8, "y":4},
- {"label":"Down", "x":9, "y":4},
- {"label":"Up", "x":10, "y":4},
- {"label":"Right", "x":11, "y":4},
- {"label":"0", "x":12, "y":4},
- {"label":"0", "x":13, "y":4},
- {"label":"0", "x":14, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [2, 12], "x": 12, "y": 2},
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [2, 14], "x": 14, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3},
+ {"matrix": [3, 12], "x": 12, "y": 3},
+ {"matrix": [3, 13], "x": 13, "y": 3},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4},
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [4, 7], "x": 7, "y": 4},
+ {"matrix": [4, 8], "x": 8, "y": 4},
+ {"matrix": [4, 9], "x": 9, "y": 4},
+ {"matrix": [4, 10], "x": 10, "y": 4},
+ {"matrix": [4, 11], "x": 11, "y": 4},
+ {"matrix": [4, 12], "x": 12, "y": 4},
+ {"matrix": [4, 13], "x": 13, "y": 4},
+ {"matrix": [4, 14], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/cannonkeys/ortho75/ortho75.c b/keyboards/cannonkeys/ortho75/ortho75.c
index 58b7396a1b..366f4e7767 100644
--- a/keyboards/cannonkeys/ortho75/ortho75.c
+++ b/keyboards/cannonkeys/ortho75/ortho75.c
@@ -1,5 +1,5 @@
-#include "ortho75.h"
+#include "quantum.h"
#define MEDIA_KEY_DELAY 10
diff --git a/keyboards/cannonkeys/ortho75/ortho75.h b/keyboards/cannonkeys/ortho75/ortho75.h
deleted file mode 100644
index d23e064296..0000000000
--- a/keyboards/cannonkeys/ortho75/ortho75.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_5x15( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \
-}
diff --git a/keyboards/cannonkeys/ortho75/rules.mk b/keyboards/cannonkeys/ortho75/rules.mk
index ee4421ed3a..2407875062 100644
--- a/keyboards/cannonkeys/ortho75/rules.mk
+++ b/keyboards/cannonkeys/ortho75/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
ENCODER_ENABLE = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/cannonkeys/practice60/config.h b/keyboards/cannonkeys/practice60/config.h
index 287b1484e9..6e361ccf78 100644
--- a/keyboards/cannonkeys/practice60/config.h
+++ b/keyboards/cannonkeys/practice60/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C15, C14 }
-#define MATRIX_ROW_PINS { B3, B4, B5, B6, B7 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/cannonkeys/practice60/info.json b/keyboards/cannonkeys/practice60/info.json
index a25485038b..286be82e9e 100644
--- a/keyboards/cannonkeys/practice60/info.json
+++ b/keyboards/cannonkeys/practice60/info.json
@@ -8,11 +8,19 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"],
+ "rows": ["B3", "B4", "B5", "B6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A8",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"community_layouts": ["60_ansi"],
diff --git a/keyboards/cannonkeys/practice60/practice60.c b/keyboards/cannonkeys/practice60/practice60.c
deleted file mode 100644
index d2cf47deb8..0000000000
--- a/keyboards/cannonkeys/practice60/practice60.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "practice60.h"
diff --git a/keyboards/cannonkeys/practice60/rules.mk b/keyboards/cannonkeys/practice60/rules.mk
index 07f7d949d9..01c330aeb6 100644
--- a/keyboards/cannonkeys/practice60/rules.mk
+++ b/keyboards/cannonkeys/practice60/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
DEFAULT_FOLDER = cannonkeys/practice60
diff --git a/keyboards/cannonkeys/practice65/config.h b/keyboards/cannonkeys/practice65/config.h
index ac3f193da9..1e62cd6a51 100644
--- a/keyboards/cannonkeys/practice65/config.h
+++ b/keyboards/cannonkeys/practice65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B8, B0, A0, B5, B10, B9, A6, B12, A7, A5, A4, A3, A2, A1, B13, B14 }
-#define MATRIX_ROW_PINS { B4, B11, B1, B7, B6 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD1
#define BACKLIGHT_PWM_CHANNEL 1
diff --git a/keyboards/cannonkeys/practice65/info.json b/keyboards/cannonkeys/practice65/info.json
index 17e548a825..8bf9a0f9e7 100644
--- a/keyboards/cannonkeys/practice65/info.json
+++ b/keyboards/cannonkeys/practice65/info.json
@@ -8,11 +8,19 @@
"pid": "0x6565",
"device_version": "0.0.1"
},
+ "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"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A8",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F103",
"bootloader": "stm32duino",
"layouts": {
diff --git a/keyboards/cannonkeys/practice65/practice65.c b/keyboards/cannonkeys/practice65/practice65.c
deleted file mode 100644
index 10f60460fa..0000000000
--- a/keyboards/cannonkeys/practice65/practice65.c
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "practice65.h"
diff --git a/keyboards/cannonkeys/practice65/rules.mk b/keyboards/cannonkeys/practice65/rules.mk
index f7dee7ff20..57a302eec3 100644
--- a/keyboards/cannonkeys/practice65/rules.mk
+++ b/keyboards/cannonkeys/practice65/rules.mk
@@ -10,7 +10,6 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
SLEEP_LED_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/rekt1800/config.h b/keyboards/cannonkeys/rekt1800/config.h
index 37d156feb9..7f21b3f8a8 100644
--- a/keyboards/cannonkeys/rekt1800/config.h
+++ b/keyboards/cannonkeys/rekt1800/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B12, A14, A15, B3, B4, B5, B6, B7, B8, B9, A7, B0, B1, B2, B10, A3, A4, A5, C15 }
-#define MATRIX_ROW_PINS { C13, C14, A0, A1, A2, B11 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/rekt1800/info.json b/keyboards/cannonkeys/rekt1800/info.json
index e68f214427..675b572739 100644
--- a/keyboards/cannonkeys/rekt1800/info.json
+++ b/keyboards/cannonkeys/rekt1800/info.json
@@ -8,6 +8,11 @@
"pid": "0x2377",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B12", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "A7", "B0", "B1", "B2", "B10", "A3", "A4", "A5", "C15"],
+ "rows": ["C13", "C14", "A0", "A1", "A2", "B11"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/rekt1800/rekt1800.c b/keyboards/cannonkeys/rekt1800/rekt1800.c
deleted file mode 100644
index 3a8673b955..0000000000
--- a/keyboards/cannonkeys/rekt1800/rekt1800.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rekt1800.h"
diff --git a/keyboards/cannonkeys/sagittarius/config.h b/keyboards/cannonkeys/sagittarius/config.h
index 5edf9fdeb9..b65cf4792b 100644
--- a/keyboards/cannonkeys/sagittarius/config.h
+++ b/keyboards/cannonkeys/sagittarius/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A7, A5, A4, A3, A2, A1, A0, B5, A13, B2, B1, B0, B9, B8, B7, B6 }
-#define MATRIX_ROW_PINS { B10, B14, A8, A9, A10, C13, C14, C15, F0, F1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/sagittarius/info.json b/keyboards/cannonkeys/sagittarius/info.json
index 2b25ee6b98..9d969a5aaa 100644
--- a/keyboards/cannonkeys/sagittarius/info.json
+++ b/keyboards/cannonkeys/sagittarius/info.json
@@ -8,11 +8,19 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A7", "A5", "A4", "A3", "A2", "A1", "A0", "B5", "A13", "B2", "B1", "B0", "B9", "B8", "B7", "B6"],
+ "rows": ["B10", "B14", "A8", "A9", "A10", "C13", "C14", "C15", "F0", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"indicators": {
"caps_lock": "B3",
"num_lock": "B4",
diff --git a/keyboards/cannonkeys/sagittarius/rules.mk b/keyboards/cannonkeys/sagittarius/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/sagittarius/rules.mk
+++ b/keyboards/cannonkeys/sagittarius/rules.mk
@@ -13,7 +13,6 @@ 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
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/sagittarius/sagittarius.c b/keyboards/cannonkeys/sagittarius/sagittarius.c
deleted file mode 100644
index ea1b979c49..0000000000
--- a/keyboards/cannonkeys/sagittarius/sagittarius.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "sagittarius.h"
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index ac9548dd27..9005b064b7 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -23,10 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* LSE clock */
#define STM32_LSECLK 32768
-#define MATRIX_COL_PINS { B1, B2, B10, B11, B12, B13, B14, A8, A9, A10, B0, A7, A5, B5, A15, A1 }
-#define MATRIX_ROW_PINS { B3, B4, A0, A2, A4, A3 }
-#define DIODE_DIRECTION COL2ROW
-
// I2C config
#define I2C_DRIVER I2CD1
#define I2C1_SCL_PIN B6
diff --git a/keyboards/cannonkeys/satisfaction75/info.json b/keyboards/cannonkeys/satisfaction75/info.json
index 9bf8459b1a..60695b9ac7 100644
--- a/keyboards/cannonkeys/satisfaction75/info.json
+++ b/keyboards/cannonkeys/satisfaction75/info.json
@@ -8,6 +8,11 @@
"pid": "0x57F5",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B1", "B2", "B10", "B11", "B12", "B13", "B14", "A8", "A9", "A10", "B0", "A7", "A5", "B5", "A15", "A1"],
+ "rows": ["B3", "B4", "A0", "A2", "A4", "A3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B9", "pin_b": "B8", "resolution": 2}
diff --git a/keyboards/cannonkeys/savage65/config.h b/keyboards/cannonkeys/savage65/config.h
index 79414a9a78..97fbded3c0 100644
--- a/keyboards/cannonkeys/savage65/config.h
+++ b/keyboards/cannonkeys/savage65/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/savage65/info.json b/keyboards/cannonkeys/savage65/info.json
index 1aa34de891..406cf8deff 100644
--- a/keyboards/cannonkeys/savage65/info.json
+++ b/keyboards/cannonkeys/savage65/info.json
@@ -8,11 +8,19 @@
"pid": "0x5A65",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B12", "B11", "B14", "A8", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"community_layouts": ["65_ansi_blocker", "65_ansi_blocker_split_bs", "65_ansi_blocker_tsangan", "65_iso_blocker"],
diff --git a/keyboards/cannonkeys/savage65/rules.mk b/keyboards/cannonkeys/savage65/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/savage65/rules.mk
+++ b/keyboards/cannonkeys/savage65/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/savage65/savage65.c b/keyboards/cannonkeys/savage65/savage65.c
deleted file mode 100644
index d8e610c8b9..0000000000
--- a/keyboards/cannonkeys/savage65/savage65.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "savage65.h"
diff --git a/keyboards/cannonkeys/serenity/info.json b/keyboards/cannonkeys/serenity/info.json
index 9672161bfc..271589a75f 100644
--- a/keyboards/cannonkeys/serenity/info.json
+++ b/keyboards/cannonkeys/serenity/info.json
@@ -57,42 +57,42 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0.0 },
- { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0.0 },
- { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0.0 },
- { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0.0 },
- { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0.0 },
- { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0.0 },
- { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0.0 },
- { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0.0 },
- { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0.0 },
- { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0.0 },
- { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0.0 },
- { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0.0 },
- { "label": "F13", "matrix": [0, 14], "x": 14.0, "y": 0.0 },
- { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0.0 },
- { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0.0 },
- { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0.0 },
- { "label": "~", "matrix": [1, 0], "x": 0.0, "y": 1.25 },
- { "label": "!", "matrix": [1, 1], "x": 1.0, "y": 1.25 },
- { "label": "@", "matrix": [1, 2], "x": 2.0, "y": 1.25 },
- { "label": "#", "matrix": [1, 3], "x": 3.0, "y": 1.25 },
- { "label": "$", "matrix": [1, 4], "x": 4.0, "y": 1.25 },
- { "label": "%", "matrix": [1, 5], "x": 5.0, "y": 1.25 },
- { "label": "^", "matrix": [1, 6], "x": 6.0, "y": 1.25 },
- { "label": "&", "matrix": [1, 7], "x": 7.0, "y": 1.25 },
- { "label": "*", "matrix": [1, 8], "x": 8.0, "y": 1.25 },
- { "label": "(", "matrix": [1, 9], "x": 9.0, "y": 1.25 },
- { "label": ")", "matrix": [1, 10], "x": 10.0, "y": 1.25 },
- { "label": "_", "matrix": [1, 11], "x": 11.0, "y": 1.25 },
- { "label": "+", "matrix": [1, 12], "x": 12.0, "y": 1.25 },
- { "label": "Bksp", "matrix": [1, 13], "x": 13.0, "y": 1.25 },
- { "label": "Del", "matrix": [1, 14], "x": 14.0, "y": 1.25 },
+ { "label": "Esc", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0 },
+ { "label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0 },
+ { "label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0 },
+ { "label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0 },
+ { "label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0 },
+ { "label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0 },
+ { "label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0 },
+ { "label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0 },
+ { "label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0 },
+ { "label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0 },
+ { "label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0 },
+ { "label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0 },
+ { "label": "F13", "matrix": [0, 14], "x": 14, "y": 0 },
+ { "label": "PrtSc", "matrix": [0, 15], "x": 15.25, "y": 0 },
+ { "label": "Scroll Lock", "matrix": [0, 16], "x": 16.25, "y": 0 },
+ { "label": "Pause", "matrix": [0, 17], "x": 17.25, "y": 0 },
+ { "label": "~", "matrix": [1, 0], "x": 0, "y": 1.25 },
+ { "label": "!", "matrix": [1, 1], "x": 1, "y": 1.25 },
+ { "label": "@", "matrix": [1, 2], "x": 2, "y": 1.25 },
+ { "label": "#", "matrix": [1, 3], "x": 3, "y": 1.25 },
+ { "label": "$", "matrix": [1, 4], "x": 4, "y": 1.25 },
+ { "label": "%", "matrix": [1, 5], "x": 5, "y": 1.25 },
+ { "label": "^", "matrix": [1, 6], "x": 6, "y": 1.25 },
+ { "label": "&", "matrix": [1, 7], "x": 7, "y": 1.25 },
+ { "label": "*", "matrix": [1, 8], "x": 8, "y": 1.25 },
+ { "label": "(", "matrix": [1, 9], "x": 9, "y": 1.25 },
+ { "label": ")", "matrix": [1, 10], "x": 10, "y": 1.25 },
+ { "label": "_", "matrix": [1, 11], "x": 11, "y": 1.25 },
+ { "label": "+", "matrix": [1, 12], "x": 12, "y": 1.25 },
+ { "label": "Bksp", "matrix": [1, 13], "x": 13, "y": 1.25 },
+ { "label": "Del", "matrix": [1, 14], "x": 14, "y": 1.25 },
{ "label": "Insert", "matrix": [1, 15], "x": 15.25, "y": 1.25 },
{ "label": "Home", "matrix": [1, 16], "x": 16.25, "y": 1.25 },
{ "label": "PgUp", "matrix": [1, 17], "x": 17.25, "y": 1.25 },
- { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0.0, "y": 2.25 },
+ { "label": "Tab", "matrix": [2, 0], "w": 1.5, "x": 0, "y": 2.25 },
{ "label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25 },
{ "label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25 },
{ "label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25 },
@@ -109,7 +109,7 @@
{ "label": "Delete", "matrix": [2, 15], "x": 15.25, "y": 2.25 },
{ "label": "End", "matrix": [2, 16], "x": 16.25, "y": 2.25 },
{ "label": "PgDn", "matrix": [2, 17], "x": 17.25, "y": 2.25 },
- { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0.0, "y": 3.25 },
+ { "label": "Caps Lock", "matrix": [3, 0], "w": 1.75, "x": 0, "y": 3.25 },
{ "label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25 },
{ "label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25 },
{ "label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25 },
@@ -123,7 +123,7 @@
{ "label": "\"", "matrix": [3, 11], "x": 11.75, "y": 3.25 },
{ "label": "|", "matrix": [3, 12], "x": 12.75, "y": 3.25 },
{ "label": "Enter", "matrix": [3, 14], "w": 1.25, "x": 13.75, "y": 3.25 },
- { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.25 },
+ { "label": "Shift", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4.25 },
{ "label": "|", "matrix": [4, 1], "x": 1.25, "y": 4.25 },
{ "label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25 },
{ "label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25 },
@@ -138,11 +138,11 @@
{ "label": "Shift", "matrix": [4, 12], "w": 1.75, "x": 14.75, "y": 4.25 },
{ "label": "Fn", "matrix": [4, 14], "x": 16.5, "y": 4.25 },
{ "label": "\u2191", "matrix": [4, 16], "x": 18.75, "y": 4.25 },
- { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0.0, "y": 5.25 },
+ { "label": "Ctrl", "matrix": [5, 0], "w": 1.25, "x": 0, "y": 5.25 },
{ "label": "Win", "matrix": [5, 1], "w": 1.25, "x": 1.25, "y": 5.25 },
{ "label": "Alt", "matrix": [5, 2], "w": 1.25, "x": 2.5, "y": 5.25 },
{ "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 },
- { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10.0, "y": 5.25 },
+ { "label": "Alt", "matrix": [5, 10], "w": 1.25, "x": 10, "y": 5.25 },
{ "label": "Fn", "matrix": [5, 11], "w": 1.25, "x": 11.25, "y": 5.25 },
{ "label": "Win", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 5.25 },
{ "label": "Ctrl", "matrix": [5, 14], "w": 1.25, "x": 13.75, "y": 5.25 },
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index 8722ba8d54..1dfaa69473 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B14, A14, B1, C13, C14, C15, F0, F1, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { A10, A9, A8, B12 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index bdb6cd7453..b9931edfda 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -8,11 +8,19 @@
"pid": "0x70F2",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "A14", "B1", "C13", "C14", "C15", "F0", "F1", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+ "rows": ["A10", "A9", "A8", "B12"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tmov2/tmov2.c b/keyboards/cannonkeys/tmov2/tmov2.c
deleted file mode 100644
index 47295ac270..0000000000
--- a/keyboards/cannonkeys/tmov2/tmov2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tmov2.h"
diff --git a/keyboards/cannonkeys/tsukuyomi/config.h b/keyboards/cannonkeys/tsukuyomi/config.h
index 8987acd837..97fbded3c0 100644
--- a/keyboards/cannonkeys/tsukuyomi/config.h
+++ b/keyboards/cannonkeys/tsukuyomi/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { A7, A5, B10, A3, A2, B0, A9, C13, B9, B8, B7, B6, B5, B4, B3, A15, A14 }
-#define MATRIX_ROW_PINS { B12, B11, B14, A8, A1 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/tsukuyomi/info.json b/keyboards/cannonkeys/tsukuyomi/info.json
index fb5b22e5b7..53b8324a99 100644
--- a/keyboards/cannonkeys/tsukuyomi/info.json
+++ b/keyboards/cannonkeys/tsukuyomi/info.json
@@ -8,11 +8,19 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A7", "A5", "B10", "A3", "A2", "B0", "A9", "C13", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
+ "rows": ["B12", "B11", "B14", "A8", "A1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
diff --git a/keyboards/cannonkeys/tsukuyomi/rules.mk b/keyboards/cannonkeys/tsukuyomi/rules.mk
index 2eaae2dc9b..42e73a4650 100644
--- a/keyboards/cannonkeys/tsukuyomi/rules.mk
+++ b/keyboards/cannonkeys/tsukuyomi/rules.mk
@@ -13,7 +13,6 @@ 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
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c b/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c
deleted file mode 100644
index aca92f07db..0000000000
--- a/keyboards/cannonkeys/tsukuyomi/tsukuyomi.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2020 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "tsukuyomi.h"
diff --git a/keyboards/cannonkeys/typeb/info.json b/keyboards/cannonkeys/typeb/info.json
index d09eb90026..b80474f46e 100644
--- a/keyboards/cannonkeys/typeb/info.json
+++ b/keyboards/cannonkeys/typeb/info.json
@@ -30,67 +30,67 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
- { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
- { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
- { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
- { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
- { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
- { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
- { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
- { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
- { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
- { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
- { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
- { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
- { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
- { "matrix": [2, 12], "x": 14.0, "y": 0.0 },
- { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
- { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
- { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
- { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
- { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
- { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
- { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
- { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
- { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
- { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
- { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
- { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
- { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
- { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
- { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
- { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
- { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
- { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
- { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
- { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
- { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
- { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
- { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
- { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
- { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
- { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
- { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 },
- { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
- { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
- { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
- { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
- { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
- { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
- { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
- { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
- { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
- { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
- { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
- { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
- { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
- { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
- { "matrix": [4, 1], "x": 1.5, "y": 4.0 },
- { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 },
- { "matrix": [4, 6], "w": 6, "x": 4.0, "y": 4.0 },
- { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 },
- { "matrix": [4, 11], "x": 11.5, "y": 4.0 }
+ { "matrix": [0, 0], "x": 0, "y": 0 },
+ { "matrix": [0, 1], "x": 1, "y": 0 },
+ { "matrix": [0, 2], "x": 2, "y": 0 },
+ { "matrix": [0, 3], "x": 3, "y": 0 },
+ { "matrix": [0, 4], "x": 4, "y": 0 },
+ { "matrix": [0, 5], "x": 5, "y": 0 },
+ { "matrix": [0, 6], "x": 6, "y": 0 },
+ { "matrix": [0, 7], "x": 7, "y": 0 },
+ { "matrix": [0, 8], "x": 8, "y": 0 },
+ { "matrix": [0, 9], "x": 9, "y": 0 },
+ { "matrix": [0, 10], "x": 10, "y": 0 },
+ { "matrix": [0, 11], "x": 11, "y": 0 },
+ { "matrix": [0, 12], "x": 12, "y": 0 },
+ { "matrix": [0, 13], "x": 13, "y": 0 },
+ { "matrix": [2, 12], "x": 14, "y": 0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1 },
+ { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2 },
+ { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
+ { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
+ { "matrix": [3, 13], "x": 14, "y": 3 },
+ { "matrix": [4, 1], "x": 1.5, "y": 4 },
+ { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 },
+ { "matrix": [4, 6], "w": 6, "x": 4, "y": 4 },
+ { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 },
+ { "matrix": [4, 11], "x": 11.5, "y": 4 }
]
}
}
diff --git a/keyboards/cannonkeys/vicious40/config.h b/keyboards/cannonkeys/vicious40/config.h
index d989d427ff..a47b76953a 100644
--- a/keyboards/cannonkeys/vicious40/config.h
+++ b/keyboards/cannonkeys/vicious40/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B0, A7, A5, B1, B2, B10, B11, A9, B6, B7, B8, B9 }
-#define MATRIX_ROW_PINS { A15, B3, B4, B5 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
diff --git a/keyboards/cannonkeys/vicious40/info.json b/keyboards/cannonkeys/vicious40/info.json
index 384343b8e9..d995250980 100644
--- a/keyboards/cannonkeys/vicious40/info.json
+++ b/keyboards/cannonkeys/vicious40/info.json
@@ -8,6 +8,11 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "A7", "A5", "B1", "B2", "B10", "B11", "A9", "B6", "B7", "B8", "B9"],
+ "rows": ["A15", "B3", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
diff --git a/keyboards/cannonkeys/vicious40/vicious40.c b/keyboards/cannonkeys/vicious40/vicious40.c
deleted file mode 100644
index ae8ca5082b..0000000000
--- a/keyboards/cannonkeys/vicious40/vicious40.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* Copyright 2021 Andrew Kannan
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "vicious40.h"