summaryrefslogtreecommitdiff
path: root/keyboards/40percentclub
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/40percentclub')
-rw-r--r--keyboards/40percentclub/25/config.h16
-rw-r--r--keyboards/40percentclub/25/info.json5
-rw-r--r--keyboards/40percentclub/4x4/4x4.c1
-rw-r--r--keyboards/40percentclub/4x4/4x4.h58
-rw-r--r--keyboards/40percentclub/4x4/config.h17
-rw-r--r--keyboards/40percentclub/4x4/info.json325
-rw-r--r--keyboards/40percentclub/5x5/5x5.c1
-rw-r--r--keyboards/40percentclub/5x5/5x5.h53
-rw-r--r--keyboards/40percentclub/5x5/config.h17
-rw-r--r--keyboards/40percentclub/5x5/info.json305
-rw-r--r--keyboards/40percentclub/6lit/config.h16
-rw-r--r--keyboards/40percentclub/6lit/info.json5
-rw-r--r--keyboards/40percentclub/foobar/config.h16
-rw-r--r--keyboards/40percentclub/foobar/info.json5
-rw-r--r--keyboards/40percentclub/gherkin/config.h25
-rw-r--r--keyboards/40percentclub/gherkin/gherkin.c1
-rw-r--r--keyboards/40percentclub/gherkin/gherkin.h15
-rw-r--r--keyboards/40percentclub/gherkin/info.json40
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h4
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/michel/config.h4
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h1
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h2
-rw-r--r--keyboards/40percentclub/half_n_half/config.h17
-rw-r--r--keyboards/40percentclub/half_n_half/half_n_half.c16
-rw-r--r--keyboards/40percentclub/half_n_half/half_n_half.h26
-rw-r--r--keyboards/40percentclub/half_n_half/info.json99
-rw-r--r--keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h1
-rw-r--r--keyboards/40percentclub/i75/i75.c16
-rw-r--r--keyboards/40percentclub/i75/i75.h24
-rw-r--r--keyboards/40percentclub/i75/info.json6
-rw-r--r--keyboards/40percentclub/i75/promicro/config.h34
-rw-r--r--keyboards/40percentclub/i75/promicro/info.json93
-rw-r--r--keyboards/40percentclub/i75/promicro/promicro.c16
-rw-r--r--keyboards/40percentclub/i75/promicro/promicro.h47
-rw-r--r--keyboards/40percentclub/i75/teensy2/config.h34
-rw-r--r--keyboards/40percentclub/i75/teensy2/info.json93
-rw-r--r--keyboards/40percentclub/i75/teensy2/teensy2.c16
-rw-r--r--keyboards/40percentclub/i75/teensy2/teensy2.h47
-rw-r--r--keyboards/40percentclub/luddite/config.h8
-rw-r--r--keyboards/40percentclub/luddite/info.json8
-rw-r--r--keyboards/40percentclub/luddite/luddite.c1
-rw-r--r--keyboards/40percentclub/mf68/config.h17
-rw-r--r--keyboards/40percentclub/mf68/info.json84
-rw-r--r--keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c2
-rw-r--r--keyboards/40percentclub/mf68/mf68.c1
-rw-r--r--keyboards/40percentclub/mf68/mf68.h20
-rw-r--r--keyboards/40percentclub/nano/config.h1
-rw-r--r--keyboards/40percentclub/nano/info.json3
-rw-r--r--keyboards/40percentclub/nano/keymaps/default/rules.mk0
-rw-r--r--keyboards/40percentclub/nori/config.h18
-rw-r--r--keyboards/40percentclub/nori/info.json212
-rw-r--r--keyboards/40percentclub/nori/keymaps/wings_36key/config.h2
-rw-r--r--keyboards/40percentclub/nori/nori.c16
-rw-r--r--keyboards/40percentclub/nori/nori.h56
-rw-r--r--keyboards/40percentclub/polyandry/info.json22
-rw-r--r--keyboards/40percentclub/polyandry/polyandry.c16
-rw-r--r--keyboards/40percentclub/polyandry/polyandry.h24
-rw-r--r--keyboards/40percentclub/polyandry/promicro/config.h28
-rw-r--r--keyboards/40percentclub/polyandry/promicro/info.json28
-rw-r--r--keyboards/40percentclub/polyandry/promicro/promicro.c16
-rw-r--r--keyboards/40percentclub/polyandry/promicro/promicro.h27
-rw-r--r--keyboards/40percentclub/polyandry/teensy2/config.h30
-rw-r--r--keyboards/40percentclub/polyandry/teensy2/info.json28
-rw-r--r--keyboards/40percentclub/polyandry/teensy2/teensy2.c16
-rw-r--r--keyboards/40percentclub/polyandry/teensy2/teensy2.h32
-rw-r--r--keyboards/40percentclub/tomato/config.h9
-rw-r--r--keyboards/40percentclub/tomato/info.json43
-rw-r--r--keyboards/40percentclub/tomato/tomato.c1
-rw-r--r--keyboards/40percentclub/tomato/tomato.h15
-rw-r--r--keyboards/40percentclub/ut47/info.json53
-rw-r--r--keyboards/40percentclub/ut47/keymaps/rgb/config.h2
-rw-r--r--keyboards/40percentclub/ut47/ut47.c2
-rw-r--r--keyboards/40percentclub/ut47/ut47.h31
73 files changed, 977 insertions, 1412 deletions
diff --git a/keyboards/40percentclub/25/config.h b/keyboards/40percentclub/25/config.h
index 86d1f0b90f..20ecf94708 100644
--- a/keyboards/40percentclub/25/config.h
+++ b/keyboards/40percentclub/25/config.h
@@ -21,22 +21,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/*
- * 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 { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#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/40percentclub/25/info.json b/keyboards/40percentclub/25/info.json
index d0544f9a2e..70a2749a65 100644
--- a/keyboards/40percentclub/25/info.json
+++ b/keyboards/40percentclub/25/info.json
@@ -8,6 +8,11 @@
"pid": "0x0F25",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
diff --git a/keyboards/40percentclub/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
deleted file mode 100644
index 8510b358f5..0000000000
--- a/keyboards/40percentclub/4x4/4x4.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x4.h"
diff --git a/keyboards/40percentclub/4x4/4x4.h b/keyboards/40percentclub/4x4/4x4.h
deleted file mode 100644
index 8cc5a150aa..0000000000
--- a/keyboards/40percentclub/4x4/4x4.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) \
-{ \
- { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#define LAYOUT_ortho_4x8( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, K17, \
- K20, K21, K22, K23, K24, K25, K26, K27, \
- K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, K34, K35, K35, K37, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-#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, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_4x16( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c, K0d, K0e, K0f }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c, K1d, K1e, K1f }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2a, K2b, K2c, K2d, K2e, K2f }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3a, K3b, K3c, K3d, K3e, K3f } \
-}
diff --git a/keyboards/40percentclub/4x4/config.h b/keyboards/40percentclub/4x4/config.h
index ac308220e4..7caa265c1a 100644
--- a/keyboards/40percentclub/4x4/config.h
+++ b/keyboards/40percentclub/4x4/config.h
@@ -2,23 +2,6 @@
#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 { B2, D1, D0, D4 }
-#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#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/40percentclub/4x4/info.json b/keyboards/40percentclub/4x4/info.json
index 7864832484..389aad3619 100644
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -8,196 +8,201 @@
"pid": "0x0A0C",
"device_version": "44.4.4"
},
+ "matrix_pins": {
+ "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+ "rows": ["B2", "D1", "D0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]}
]
},
"LAYOUT_ortho_4x8": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"x":5, "y":0, "matrix": [0, 5]},
+ {"x":6, "y":0, "matrix": [0, 6]},
+ {"x":7, "y":0, "matrix": [0, 7]},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]},
+ {"x":5, "y":1, "matrix": [1, 5]},
+ {"x":6, "y":1, "matrix": [1, 6]},
+ {"x":7, "y":1, "matrix": [1, 7]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
+ {"x":4, "y":2, "matrix": [2, 4]},
+ {"x":5, "y":2, "matrix": [2, 5]},
+ {"x":6, "y":2, "matrix": [2, 6]},
+ {"x":7, "y":2, "matrix": [2, 7]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]},
+ {"x":4, "y":3, "matrix": [3, 4]},
+ {"x":5, "y":3, "matrix": [3, 5]},
+ {"x":6, "y":3, "matrix": [3, 6]},
+ {"x":7, "y":3, "matrix": [3, 7]}
]
},
"LAYOUT_ortho_4x12": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"x":5, "y":0, "matrix": [0, 5]},
+ {"x":6, "y":0, "matrix": [0, 6]},
+ {"x":7, "y":0, "matrix": [0, 7]},
+ {"x":8, "y":0, "matrix": [0, 8]},
+ {"x":9, "y":0, "matrix": [0, 9]},
+ {"x":10, "y":0, "matrix": [0, 10]},
+ {"x":11, "y":0, "matrix": [0, 11]},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]},
+ {"x":5, "y":1, "matrix": [1, 5]},
+ {"x":6, "y":1, "matrix": [1, 6]},
+ {"x":7, "y":1, "matrix": [1, 7]},
+ {"x":8, "y":1, "matrix": [1, 8]},
+ {"x":9, "y":1, "matrix": [1, 9]},
+ {"x":10, "y":1, "matrix": [1, 10]},
+ {"x":11, "y":1, "matrix": [1, 11]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
+ {"x":4, "y":2, "matrix": [2, 4]},
+ {"x":5, "y":2, "matrix": [2, 5]},
+ {"x":6, "y":2, "matrix": [2, 6]},
+ {"x":7, "y":2, "matrix": [2, 7]},
+ {"x":8, "y":2, "matrix": [2, 8]},
+ {"x":9, "y":2, "matrix": [2, 9]},
+ {"x":10, "y":2, "matrix": [2, 10]},
+ {"x":11, "y":2, "matrix": [2, 11]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]},
+ {"x":4, "y":3, "matrix": [3, 4]},
+ {"x":5, "y":3, "matrix": [3, 5]},
+ {"x":6, "y":3, "matrix": [3, 6]},
+ {"x":7, "y":3, "matrix": [3, 7]},
+ {"x":8, "y":3, "matrix": [3, 8]},
+ {"x":9, "y":3, "matrix": [3, 9]},
+ {"x":10, "y":3, "matrix": [3, 10]},
+ {"x":11, "y":3, "matrix": [3, 11]}
]
},
"LAYOUT_ortho_4x16": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
+ {"x":0, "y":0, "matrix": [0, 0]},
+ {"x":1, "y":0, "matrix": [0, 1]},
+ {"x":2, "y":0, "matrix": [0, 2]},
+ {"x":3, "y":0, "matrix": [0, 3]},
+ {"x":4, "y":0, "matrix": [0, 4]},
+ {"x":5, "y":0, "matrix": [0, 5]},
+ {"x":6, "y":0, "matrix": [0, 6]},
+ {"x":7, "y":0, "matrix": [0, 7]},
+ {"x":8, "y":0, "matrix": [0, 8]},
+ {"x":9, "y":0, "matrix": [0, 9]},
+ {"x":10, "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, "y":0, "matrix": [0, 15]},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1},
- {"x":14, "y":1},
- {"x":15, "y":1},
+ {"x":0, "y":1, "matrix": [1, 0]},
+ {"x":1, "y":1, "matrix": [1, 1]},
+ {"x":2, "y":1, "matrix": [1, 2]},
+ {"x":3, "y":1, "matrix": [1, 3]},
+ {"x":4, "y":1, "matrix": [1, 4]},
+ {"x":5, "y":1, "matrix": [1, 5]},
+ {"x":6, "y":1, "matrix": [1, 6]},
+ {"x":7, "y":1, "matrix": [1, 7]},
+ {"x":8, "y":1, "matrix": [1, 8]},
+ {"x":9, "y":1, "matrix": [1, 9]},
+ {"x":10, "y":1, "matrix": [1, 10]},
+ {"x":11, "y":1, "matrix": [1, 11]},
+ {"x":12, "y":1, "matrix": [1, 12]},
+ {"x":13, "y":1, "matrix": [1, 13]},
+ {"x":14, "y":1, "matrix": [1, 14]},
+ {"x":15, "y":1, "matrix": [1, 15]},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
- {"x":15, "y":2},
+ {"x":0, "y":2, "matrix": [2, 0]},
+ {"x":1, "y":2, "matrix": [2, 1]},
+ {"x":2, "y":2, "matrix": [2, 2]},
+ {"x":3, "y":2, "matrix": [2, 3]},
+ {"x":4, "y":2, "matrix": [2, 4]},
+ {"x":5, "y":2, "matrix": [2, 5]},
+ {"x":6, "y":2, "matrix": [2, 6]},
+ {"x":7, "y":2, "matrix": [2, 7]},
+ {"x":8, "y":2, "matrix": [2, 8]},
+ {"x":9, "y":2, "matrix": [2, 9]},
+ {"x":10, "y":2, "matrix": [2, 10]},
+ {"x":11, "y":2, "matrix": [2, 11]},
+ {"x":12, "y":2, "matrix": [2, 12]},
+ {"x":13, "y":2, "matrix": [2, 13]},
+ {"x":14, "y":2, "matrix": [2, 14]},
+ {"x":15, "y":2, "matrix": [2, 15]},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
- {"x":14, "y":3},
- {"x":15, "y":3}
+ {"x":0, "y":3, "matrix": [3, 0]},
+ {"x":1, "y":3, "matrix": [3, 1]},
+ {"x":2, "y":3, "matrix": [3, 2]},
+ {"x":3, "y":3, "matrix": [3, 3]},
+ {"x":4, "y":3, "matrix": [3, 4]},
+ {"x":5, "y":3, "matrix": [3, 5]},
+ {"x":6, "y":3, "matrix": [3, 6]},
+ {"x":7, "y":3, "matrix": [3, 7]},
+ {"x":8, "y":3, "matrix": [3, 8]},
+ {"x":9, "y":3, "matrix": [3, 9]},
+ {"x":10, "y":3, "matrix": [3, 10]},
+ {"x":11, "y":3, "matrix": [3, 11]},
+ {"x":12, "y":3, "matrix": [3, 12]},
+ {"x":13, "y":3, "matrix": [3, 13]},
+ {"x":14, "y":3, "matrix": [3, 14]},
+ {"x":15, "y":3, "matrix": [3, 15]}
]
}
}
diff --git a/keyboards/40percentclub/5x5/5x5.c b/keyboards/40percentclub/5x5/5x5.c
deleted file mode 100644
index b31fcd7814..0000000000
--- a/keyboards/40percentclub/5x5/5x5.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "5x5.h"
diff --git a/keyboards/40percentclub/5x5/5x5.h b/keyboards/40percentclub/5x5/5x5.h
deleted file mode 100644
index 182e9e8190..0000000000
--- a/keyboards/40percentclub/5x5/5x5.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-#define ___ KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define LAYOUT_ortho_5x5( \
- K00, K01, K02, K03, K04, \
- K10, K11, K12, K13, K14, \
- K20, K21, K22, K23, K24, \
- K30, K31, K32, K33, K34, \
- K40, K41, K42, K43, K44 \
-) \
-{ \
- { K00, K01, K02, K03, K04, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, K14, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, K24, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, K34, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___}, \
- { K40, K41, K42, K43, K44, ___, ___, ___, ___, ___, ___, ___, ___, ___, ___} \
-}
-
-#define LAYOUT_ortho_5x10( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, ___, ___, ___, ___, ___}, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, ___, ___, ___, ___, ___}, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, ___, ___, ___, ___, ___}, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, ___, ___, ___, ___, ___}, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, ___, ___, ___, ___, ___} \
-}
-
-#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/40percentclub/5x5/config.h b/keyboards/40percentclub/5x5/config.h
index 078344e34b..7caa265c1a 100644
--- a/keyboards/40percentclub/5x5/config.h
+++ b/keyboards/40percentclub/5x5/config.h
@@ -2,23 +2,6 @@
#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 { B2, D1, D0, D4, C6 }
-#define MATRIX_COL_PINS { D7, E6, B4, B5, B6, B7, D6, F7, F6, F5, F4, F1, F0, B3, B1 }
-
-/* COL2ROW, ROW2COL*/
-#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/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json
index 76554d54e4..3ebc123c9b 100644
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -8,182 +8,187 @@
"pid": "0x05B5",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["D7", "E6", "B4", "B5", "B6", "B7", "D6", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B1"],
+ "rows": ["B2", "D1", "D0", "D4", "C6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_5x5", "ortho_5x10", "ortho_5x15"],
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
+ {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
+ {"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},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
+ {"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},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4}
+ {"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}
]
},
"LAYOUT_ortho_5x10": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
+ {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
+ {"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},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
+ {"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},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":7, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4}
+ {"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}
]
},
"LAYOUT_ortho_5x15": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":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},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
- {"x":3, "y":1},
- {"x":4, "y":1},
- {"x":5, "y":1},
- {"x":6, "y":1},
- {"x":7, "y":1},
- {"x":8, "y":1},
- {"x":9, "y":1},
- {"x":10, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1},
- {"x":14, "y":1},
+ {"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},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
+ {"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},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
- {"x":3, "y":3},
- {"x":4, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":9, "y":3},
- {"x":10, "y":3},
- {"x":11, "y":3},
- {"x":12, "y":3},
- {"x":13, "y":3},
- {"x":14, "y":3},
+ {"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},
- {"x":0, "y":4},
- {"x":1, "y":4},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4},
- {"x":5, "y":4},
- {"x":6, "y":4},
- {"x":7, "y":4},
- {"x":8, "y":4},
- {"x":9, "y":4},
- {"x":10, "y":4},
- {"x":11, "y":4},
- {"x":12, "y":4},
- {"x":13, "y":4},
- {"x":14, "y":4}
+ {"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/40percentclub/6lit/config.h b/keyboards/40percentclub/6lit/config.h
index 8fbc9ea06f..20ecf94708 100644
--- a/keyboards/40percentclub/6lit/config.h
+++ b/keyboards/40percentclub/6lit/config.h
@@ -21,22 +21,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/*
- * 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 { D7, E6 }
-#define MATRIX_COL_PINS { F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#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/40percentclub/6lit/info.json b/keyboards/40percentclub/6lit/info.json
index a0892d2a7a..9ddd475570 100644
--- a/keyboards/40percentclub/6lit/info.json
+++ b/keyboards/40percentclub/6lit/info.json
@@ -8,6 +8,11 @@
"pid": "0x0F61",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1"],
+ "rows": ["D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
diff --git a/keyboards/40percentclub/foobar/config.h b/keyboards/40percentclub/foobar/config.h
index 4107b37948..20ecf94708 100644
--- a/keyboards/40percentclub/foobar/config.h
+++ b/keyboards/40percentclub/foobar/config.h
@@ -21,22 +21,6 @@
//#define MASTER_RIGHT
//#define EE_HANDS
-/*
- * 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 { D7, E6, B4 }
-#define MATRIX_COL_PINS { F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#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/40percentclub/foobar/info.json b/keyboards/40percentclub/foobar/info.json
index ecc079f51b..53cda10128 100644
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -8,6 +8,11 @@
"pid": "0x0F00",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
index 3d6c38ec80..5f36081323 100644
--- a/keyboards/40percentclub/gherkin/config.h
+++ b/keyboards/40percentclub/gherkin/config.h
@@ -1,32 +1,7 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
-
-/* 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
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#ifdef RGB_DI_PIN
-# define RGBLIGHT_EFFECT_BREATHING
-# define RGBLIGHT_EFFECT_RAINBOW_MOOD
-# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-# define RGBLIGHT_EFFECT_SNAKE
-# define RGBLIGHT_EFFECT_KNIGHT
-# define RGBLIGHT_EFFECT_CHRISTMAS
-# define RGBLIGHT_EFFECT_STATIC_GRADIENT
-# define RGBLIGHT_EFFECT_RGB_TEST
-# define RGBLIGHT_EFFECT_ALTERNATING
-# define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/40percentclub/gherkin/gherkin.c b/keyboards/40percentclub/gherkin/gherkin.c
deleted file mode 100644
index 2952d842cf..0000000000
--- a/keyboards/40percentclub/gherkin/gherkin.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "gherkin.h"
diff --git a/keyboards/40percentclub/gherkin/gherkin.h b/keyboards/40percentclub/gherkin/gherkin.h
deleted file mode 100644
index 70bffee302..0000000000
--- a/keyboards/40percentclub/gherkin/gherkin.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
- K00, K01, K02, K03, K04, K05, K10, K11, K12, K13 , \
- K14, K15, K20, K21, K22, K23, K24, K25, K30, K31 , \
- K32, K33, K34, K35, K40, K41, K42, K43, K44, K45 \
-) { \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, K21, K22, K23, K24, K25 }, \
- { K30, K31, K32, K33, K34, K35 }, \
- { K40, K41, K42, K43, K44, K45 } \
-}
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
index ee85708f19..808a82d4ce 100644
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -8,6 +8,11 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+ "rows": ["F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5"
},
@@ -16,7 +21,40 @@
"community_layouts": ["ortho_3x10"],
"layouts": {
"LAYOUT_ortho_3x10": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+ "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": [1, 0], "x": 6, "y": 0},
+ {"matrix": [1, 1], "x": 7, "y": 0},
+ {"matrix": [1, 2], "x": 8, "y": 0},
+ {"matrix": [1, 3], "x": 9, "y": 0},
+
+ {"matrix": [1, 4], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [2, 0], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [2, 3], "x": 5, "y": 1},
+ {"matrix": [2, 4], "x": 6, "y": 1},
+ {"matrix": [2, 5], "x": 7, "y": 1},
+ {"matrix": [3, 0], "x": 8, "y": 1},
+ {"matrix": [3, 1], "x": 9, "y": 1},
+
+ {"matrix": [3, 2], "x": 0, "y": 2},
+ {"matrix": [3, 3], "x": 1, "y": 2},
+ {"matrix": [3, 4], "x": 2, "y": 2},
+ {"matrix": [3, 5], "x": 3, "y": 2},
+ {"matrix": [4, 0], "x": 4, "y": 2},
+ {"matrix": [4, 1], "x": 5, "y": 2},
+ {"matrix": [4, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [4, 5], "x": 9, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
index e1477fc069..f6c6117726 100644
--- a/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
@@ -1,8 +1,8 @@
#pragma once
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
#undef RGBLED_NUM
-#define RGB_DI_PIN D2
+#define WS2812_DI_PIN D2
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/gherkin/keymaps/michel/config.h b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
index eadbb23ce2..2105fa65b5 100644
--- a/keyboards/40percentclub/gherkin/keymaps/michel/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/michel/config.h
@@ -1,8 +1,8 @@
#pragma once
-#undef RGB_DI_PIN
+#undef WS2812_DI_PIN
#undef RGBLED_NUM
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
index bde9ec2055..0df91ad925 100644
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
@@ -27,5 +27,4 @@
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
index 243b953f68..589a67f03d 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
@@ -13,8 +13,6 @@
#define PERMISSIVE_HOLD
// makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-#define IGNORE_MOD_TAP_INTERRUPT
- // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys.
#define QUICK_TAP_TERM 0
// makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
diff --git a/keyboards/40percentclub/half_n_half/config.h b/keyboards/40percentclub/half_n_half/config.h
index af2a983fb4..8b4ccf1479 100644
--- a/keyboards/40percentclub/half_n_half/config.h
+++ b/keyboards/40percentclub/half_n_half/config.h
@@ -17,23 +17,6 @@ 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 { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#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/40percentclub/half_n_half/half_n_half.c b/keyboards/40percentclub/half_n_half/half_n_half.c
deleted file mode 100644
index e49e545798..0000000000
--- a/keyboards/40percentclub/half_n_half/half_n_half.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Boy_314
- *
- * 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 "half_n_half.h"
diff --git a/keyboards/40percentclub/half_n_half/half_n_half.h b/keyboards/40percentclub/half_n_half/half_n_half.h
index bc330c9cb7..c9b4e6e739 100644
--- a/keyboards/40percentclub/half_n_half/half_n_half.h
+++ b/keyboards/40percentclub/half_n_half/half_n_half.h
@@ -16,32 +16,6 @@
#pragma once
#include "quantum.h"
-#define ___ KC_NO
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
- L34, R32 \
-) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { ___, ___, ___, ___, L34, ___, ___ }, \
-\
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, R20 }, \
- { ___, ___, ___, ___, R32, ___, ___ } \
-}
#ifdef USE_I2C
#error "I2C not Supported"
diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json
index 6b847361dc..8174e639c2 100644
--- a/keyboards/40percentclub/half_n_half/info.json
+++ b/keyboards/40percentclub/half_n_half/info.json
@@ -8,6 +8,11 @@
"pid": "0x4A1F",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -16,53 +21,57 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"L06", "x":6, "y":0},
- {"label":"R00", "x":7, "y":0},
- {"label":"R01", "x":8, "y":0},
- {"label":"R02", "x":9, "y":0},
- {"label":"R03", "x":10, "y":0},
- {"label":"R04", "x":11, "y":0},
- {"label":"R05", "x":12, "y":0},
- {"label":"R06", "x":13, "y":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": [4, 6], "x": 7, "y": 0},
+ {"matrix": [4, 5], "x": 8, "y": 0},
+ {"matrix": [4, 4], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 2], "x": 11, "y": 0},
+ {"matrix": [4, 1], "x": 12, "y": 0},
+ {"matrix": [4, 0], "x": 13, "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": [5, 6], "x": 7, "y": 1},
+ {"matrix": [5, 5], "x": 8, "y": 1},
+ {"matrix": [5, 4], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 2], "x": 11, "y": 1},
+ {"matrix": [5, 1], "x": 12, "y": 1},
+ {"matrix": [5, 0], "x": 13, "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": [6, 6], "x": 7, "y": 2},
+ {"matrix": [6, 5], "x": 8, "y": 2},
+ {"matrix": [6, 4], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 2], "x": 11, "y": 2},
+ {"matrix": [6, 1], "x": 12, "y": 2},
+ {"matrix": [6, 0], "x": 13, "y": 2},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"L16", "x":6, "y":1},
- {"label":"R10", "x":7, "y":1},
- {"label":"R11", "x":8, "y":1},
- {"label":"R12", "x":9, "y":1},
- {"label":"R13", "x":10, "y":1},
- {"label":"R14", "x":11, "y":1},
- {"label":"R15", "x":12, "y":1},
- {"label":"R16", "x":13, "y":1},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"L26", "x":6, "y":2},
- {"label":"R20", "x":7, "y":2},
- {"label":"R21", "x":8, "y":2},
- {"label":"R22", "x":9, "y":2},
- {"label":"R23", "x":10, "y":2},
- {"label":"R24", "x":11, "y":2},
- {"label":"R25", "x":12, "y":2},
- {"label":"R26", "x":13, "y":2},
-
- {"label":"L34", "x":4, "y":3, "w":2},
- {"label":"R32", "x":8, "y":3, "w":2}
+ {"matrix": [7, 4], "x": 8, "y": 3, "w": 2}
]
}
}
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
index f73fd055cc..be51c48d8a 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
@@ -17,6 +17,5 @@
#pragma once
// place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 200
diff --git a/keyboards/40percentclub/i75/i75.c b/keyboards/40percentclub/i75/i75.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/i75.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 "i75.h"
diff --git a/keyboards/40percentclub/i75/i75.h b/keyboards/40percentclub/i75/i75.h
deleted file mode 100644
index a31c9f6e6f..0000000000
--- a/keyboards/40percentclub/i75/i75.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018
- *
- * 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"
-
-#ifdef KEYBOARD_40percentclub_i75_promicro
- #include "promicro.h"
-#elif KEYBOARD_40percentclub_i75_teensy2
- #include "teensy2.h"
-#endif
diff --git a/keyboards/40percentclub/i75/info.json b/keyboards/40percentclub/i75/info.json
index 3e9d42c28d..8661257d6b 100644
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -7,11 +7,5 @@
"vid": "0x4025",
"pid": "0x0A0C",
"device_version": "1.7.5"
- },
- "community_layouts": ["ortho_5x15"],
- "layouts": {
- "LAYOUT_ortho_5x15": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
- }
}
}
diff --git a/keyboards/40percentclub/i75/promicro/config.h b/keyboards/40percentclub/i75/promicro/config.h
deleted file mode 100644
index 844291c8df..0000000000
--- a/keyboards/40percentclub/i75/promicro/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2018
- *
- * 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
-
-
-/*
- * 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 { B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-#define MATRIX_COL_PINS { B5, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/i75/promicro/info.json b/keyboards/40percentclub/i75/promicro/info.json
index 4369a04103..4c3f44469c 100644
--- a/keyboards/40percentclub/i75/promicro/info.json
+++ b/keyboards/40percentclub/i75/promicro/info.json
@@ -1,4 +1,95 @@
{
+ "matrix_pins": {
+ "cols": ["B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "community_layouts": ["ortho_5x15"],
+ "layouts": {
+ "LAYOUT_ortho_5x15": {
+ "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": [1, 0], "x": 9, "y": 0},
+ {"matrix": [1, 1], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [1, 3], "x": 12, "y": 0},
+ {"matrix": [1, 4], "x": 13, "y": 0},
+ {"matrix": [1, 5], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 7], "x": 1, "y": 1},
+ {"matrix": [1, 8], "x": 2, "y": 1},
+ {"matrix": [2, 0], "x": 3, "y": 1},
+ {"matrix": [2, 1], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [2, 4], "x": 7, "y": 1},
+ {"matrix": [2, 5], "x": 8, "y": 1},
+ {"matrix": [2, 6], "x": 9, "y": 1},
+ {"matrix": [2, 7], "x": 10, "y": 1},
+ {"matrix": [2, 8], "x": 11, "y": 1},
+ {"matrix": [3, 0], "x": 12, "y": 1},
+ {"matrix": [3, 1], "x": 13, "y": 1},
+ {"matrix": [3, 2], "x": 14, "y": 1},
+
+ {"matrix": [3, 3], "x": 0, "y": 2},
+ {"matrix": [3, 4], "x": 1, "y": 2},
+ {"matrix": [3, 5], "x": 2, "y": 2},
+ {"matrix": [3, 6], "x": 3, "y": 2},
+ {"matrix": [3, 7], "x": 4, "y": 2},
+ {"matrix": [3, 8], "x": 5, "y": 2},
+ {"matrix": [4, 0], "x": 6, "y": 2},
+ {"matrix": [4, 1], "x": 7, "y": 2},
+ {"matrix": [4, 2], "x": 8, "y": 2},
+ {"matrix": [4, 3], "x": 9, "y": 2},
+ {"matrix": [4, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [4, 8], "x": 14, "y": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 3},
+ {"matrix": [5, 1], "x": 1, "y": 3},
+ {"matrix": [5, 2], "x": 2, "y": 3},
+ {"matrix": [5, 3], "x": 3, "y": 3},
+ {"matrix": [5, 4], "x": 4, "y": 3},
+ {"matrix": [5, 5], "x": 5, "y": 3},
+ {"matrix": [5, 6], "x": 6, "y": 3},
+ {"matrix": [5, 7], "x": 7, "y": 3},
+ {"matrix": [5, 8], "x": 8, "y": 3},
+ {"matrix": [6, 0], "x": 9, "y": 3},
+ {"matrix": [6, 1], "x": 10, "y": 3},
+ {"matrix": [6, 2], "x": 11, "y": 3},
+ {"matrix": [6, 3], "x": 12, "y": 3},
+ {"matrix": [6, 4], "x": 13, "y": 3},
+ {"matrix": [6, 5], "x": 14, "y": 3},
+
+ {"matrix": [6, 6], "x": 0, "y": 4},
+ {"matrix": [6, 7], "x": 1, "y": 4},
+ {"matrix": [6, 8], "x": 2, "y": 4},
+ {"matrix": [7, 0], "x": 3, "y": 4},
+ {"matrix": [7, 1], "x": 4, "y": 4},
+ {"matrix": [7, 2], "x": 5, "y": 4},
+ {"matrix": [7, 3], "x": 6, "y": 4},
+ {"matrix": [7, 4], "x": 7, "y": 4},
+ {"matrix": [7, 5], "x": 8, "y": 4},
+ {"matrix": [7, 6], "x": 9, "y": 4},
+ {"matrix": [7, 7], "x": 10, "y": 4},
+ {"matrix": [7, 8], "x": 11, "y": 4},
+ {"matrix": [8, 0], "x": 12, "y": 4},
+ {"matrix": [8, 1], "x": 13, "y": 4},
+ {"matrix": [8, 2], "x": 14, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/40percentclub/i75/promicro/promicro.c b/keyboards/40percentclub/i75/promicro/promicro.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 "i75.h"
diff --git a/keyboards/40percentclub/i75/promicro/promicro.h b/keyboards/40percentclub/i75/promicro/promicro.h
deleted file mode 100644
index 29394855a6..0000000000
--- a/keyboards/40percentclub/i75/promicro/promicro.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018
- *
- * 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 "i75.h"
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, \
- K16, K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, \
- K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, K64, K65, \
- K66, K67, K68, K70, K71, K72, K73, K74, K75, K76, K77, K78, K80, K81, K82 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
- { K80, K81, K82 } \
-}
diff --git a/keyboards/40percentclub/i75/teensy2/config.h b/keyboards/40percentclub/i75/teensy2/config.h
deleted file mode 100644
index d8f09b1388..0000000000
--- a/keyboards/40percentclub/i75/teensy2/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2018
- *
- * 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
-
-
-/*
- * 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 { D3, D2, D1, D0, B7, B3, B2, B1, B0 }
-#define MATRIX_COL_PINS { C6, C7, D6, D7, B5, B6, F7, F6, F5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/i75/teensy2/info.json b/keyboards/40percentclub/i75/teensy2/info.json
index 0b2db81c11..cc441a1096 100644
--- a/keyboards/40percentclub/i75/teensy2/info.json
+++ b/keyboards/40percentclub/i75/teensy2/info.json
@@ -1,4 +1,95 @@
{
+ "matrix_pins": {
+ "cols": ["C6", "C7", "D6", "D7", "B5", "B6", "F7", "F6", "F5"],
+ "rows": ["D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "halfkay"
+ "bootloader": "halfkay",
+ "community_layouts": ["ortho_5x15"],
+ "layouts": {
+ "LAYOUT_ortho_5x15": {
+ "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": [1, 0], "x": 9, "y": 0},
+ {"matrix": [1, 1], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [1, 3], "x": 12, "y": 0},
+ {"matrix": [1, 4], "x": 13, "y": 0},
+ {"matrix": [1, 5], "x": 14, "y": 0},
+
+ {"matrix": [1, 6], "x": 0, "y": 1},
+ {"matrix": [1, 7], "x": 1, "y": 1},
+ {"matrix": [1, 8], "x": 2, "y": 1},
+ {"matrix": [2, 0], "x": 3, "y": 1},
+ {"matrix": [2, 1], "x": 4, "y": 1},
+ {"matrix": [2, 2], "x": 5, "y": 1},
+ {"matrix": [2, 3], "x": 6, "y": 1},
+ {"matrix": [2, 4], "x": 7, "y": 1},
+ {"matrix": [2, 5], "x": 8, "y": 1},
+ {"matrix": [2, 6], "x": 9, "y": 1},
+ {"matrix": [2, 7], "x": 10, "y": 1},
+ {"matrix": [2, 8], "x": 11, "y": 1},
+ {"matrix": [3, 0], "x": 12, "y": 1},
+ {"matrix": [3, 1], "x": 13, "y": 1},
+ {"matrix": [3, 2], "x": 14, "y": 1},
+
+ {"matrix": [3, 3], "x": 0, "y": 2},
+ {"matrix": [3, 4], "x": 1, "y": 2},
+ {"matrix": [3, 5], "x": 2, "y": 2},
+ {"matrix": [3, 6], "x": 3, "y": 2},
+ {"matrix": [3, 7], "x": 4, "y": 2},
+ {"matrix": [3, 8], "x": 5, "y": 2},
+ {"matrix": [4, 0], "x": 6, "y": 2},
+ {"matrix": [4, 1], "x": 7, "y": 2},
+ {"matrix": [4, 2], "x": 8, "y": 2},
+ {"matrix": [4, 3], "x": 9, "y": 2},
+ {"matrix": [4, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+ {"matrix": [4, 6], "x": 12, "y": 2},
+ {"matrix": [4, 7], "x": 13, "y": 2},
+ {"matrix": [4, 8], "x": 14, "y": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 3},
+ {"matrix": [5, 1], "x": 1, "y": 3},
+ {"matrix": [5, 2], "x": 2, "y": 3},
+ {"matrix": [5, 3], "x": 3, "y": 3},
+ {"matrix": [5, 4], "x": 4, "y": 3},
+ {"matrix": [5, 5], "x": 5, "y": 3},
+ {"matrix": [5, 6], "x": 6, "y": 3},
+ {"matrix": [5, 7], "x": 7, "y": 3},
+ {"matrix": [5, 8], "x": 8, "y": 3},
+ {"matrix": [6, 0], "x": 9, "y": 3},
+ {"matrix": [6, 1], "x": 10, "y": 3},
+ {"matrix": [6, 2], "x": 11, "y": 3},
+ {"matrix": [6, 3], "x": 12, "y": 3},
+ {"matrix": [6, 4], "x": 13, "y": 3},
+ {"matrix": [6, 5], "x": 14, "y": 3},
+
+ {"matrix": [6, 6], "x": 0, "y": 4},
+ {"matrix": [6, 7], "x": 1, "y": 4},
+ {"matrix": [6, 8], "x": 2, "y": 4},
+ {"matrix": [7, 0], "x": 3, "y": 4},
+ {"matrix": [7, 1], "x": 4, "y": 4},
+ {"matrix": [7, 2], "x": 5, "y": 4},
+ {"matrix": [7, 3], "x": 6, "y": 4},
+ {"matrix": [7, 4], "x": 7, "y": 4},
+ {"matrix": [7, 5], "x": 8, "y": 4},
+ {"matrix": [7, 6], "x": 9, "y": 4},
+ {"matrix": [7, 7], "x": 10, "y": 4},
+ {"matrix": [7, 8], "x": 11, "y": 4},
+ {"matrix": [8, 0], "x": 12, "y": 4},
+ {"matrix": [8, 1], "x": 13, "y": 4},
+ {"matrix": [8, 2], "x": 14, "y": 4}
+ ]
+ }
+ }
}
diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.c b/keyboards/40percentclub/i75/teensy2/teensy2.c
deleted file mode 100644
index 28684e7144..0000000000
--- a/keyboards/40percentclub/i75/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 "i75.h"
diff --git a/keyboards/40percentclub/i75/teensy2/teensy2.h b/keyboards/40percentclub/i75/teensy2/teensy2.h
deleted file mode 100644
index 29394855a6..0000000000
--- a/keyboards/40percentclub/i75/teensy2/teensy2.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2018
- *
- * 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 "i75.h"
-#include "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_ortho_5x15( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, \
- K16, K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, \
- K33, K34, K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, K64, K65, \
- K66, K67, K68, K70, K71, K72, K73, K74, K75, K76, K77, K78, K80, K81, K82 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \
- { K80, K81, K82 } \
-}
diff --git a/keyboards/40percentclub/luddite/config.h b/keyboards/40percentclub/luddite/config.h
index 2848c7a32c..e388bc9705 100644
--- a/keyboards/40percentclub/luddite/config.h
+++ b/keyboards/40percentclub/luddite/config.h
@@ -1,12 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D1, D0, D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -14,7 +7,6 @@
#define LOCKING_RESYNC_ENABLE
/* ws2812 RGB LED */
-#define RGB_DI_PIN B4
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/luddite/info.json b/keyboards/40percentclub/luddite/info.json
index 948ef091bd..6600d6d24d 100644
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -8,10 +8,18 @@
"pid": "0x4C55",
"device_version": "10.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 4
},
+ "ws2812": {
+ "pin": "B4"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["60_ansi"],
diff --git a/keyboards/40percentclub/luddite/luddite.c b/keyboards/40percentclub/luddite/luddite.c
deleted file mode 100644
index 3e720ad571..0000000000
--- a/keyboards/40percentclub/luddite/luddite.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "luddite.h"
diff --git a/keyboards/40percentclub/mf68/config.h b/keyboards/40percentclub/mf68/config.h
index 0a07934e75..b9449c4714 100644
--- a/keyboards/40percentclub/mf68/config.h
+++ b/keyboards/40percentclub/mf68/config.h
@@ -17,23 +17,6 @@ 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 { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4 }
-
-/* 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
/* Locking resynchronize hack */
diff --git a/keyboards/40percentclub/mf68/info.json b/keyboards/40percentclub/mf68/info.json
index 2c8a4c92d6..7218573856 100644
--- a/keyboards/40percentclub/mf68/info.json
+++ b/keyboards/40percentclub/mf68/info.json
@@ -8,6 +8,11 @@
"pid": "0x4D68",
"device_version": "1.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
+ "rows": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"breathing": true
@@ -17,7 +22,84 @@
"community_layouts": ["68_ansi"],
"layouts": {
"LAYOUT_68_ansi": {
- "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":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "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": [1, 0], "x": 9, "y": 0},
+ {"matrix": [1, 1], "x": 10, "y": 0},
+ {"matrix": [1, 2], "x": 11, "y": 0},
+ {"matrix": [1, 3], "x": 12, "y": 0},
+ {"matrix": [1, 4], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0},
+
+ {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 8], "x": 1.5, "y": 1},
+ {"matrix": [2, 0], "x": 2.5, "y": 1},
+ {"matrix": [2, 1], "x": 3.5, "y": 1},
+ {"matrix": [2, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [2, 4], "x": 6.5, "y": 1},
+ {"matrix": [2, 5], "x": 7.5, "y": 1},
+ {"matrix": [2, 6], "x": 8.5, "y": 1},
+ {"matrix": [2, 7], "x": 9.5, "y": 1},
+ {"matrix": [2, 8], "x": 10.5, "y": 1},
+ {"matrix": [3, 0], "x": 11.5, "y": 1},
+ {"matrix": [3, 1], "x": 12.5, "y": 1},
+ {"matrix": [3, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 3], "x": 15.25, "y": 1},
+ {"matrix": [3, 4], "x": 16.25, "y": 1},
+
+ {"matrix": [3, 5], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [3, 6], "x": 1.75, "y": 2},
+ {"matrix": [3, 7], "x": 2.75, "y": 2},
+ {"matrix": [3, 8], "x": 3.75, "y": 2},
+ {"matrix": [4, 0], "x": 4.75, "y": 2},
+ {"matrix": [4, 1], "x": 5.75, "y": 2},
+ {"matrix": [4, 2], "x": 6.75, "y": 2},
+ {"matrix": [4, 3], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 5], "x": 9.75, "y": 2},
+ {"matrix": [4, 6], "x": 10.75, "y": 2},
+ {"matrix": [4, 7], "x": 11.75, "y": 2},
+ {"matrix": [4, 8], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [5, 1], "x": 2.25, "y": 3},
+ {"matrix": [5, 2], "x": 3.25, "y": 3},
+ {"matrix": [5, 3], "x": 4.25, "y": 3},
+ {"matrix": [5, 4], "x": 5.25, "y": 3},
+ {"matrix": [5, 5], "x": 6.25, "y": 3},
+ {"matrix": [5, 6], "x": 7.25, "y": 3},
+ {"matrix": [5, 7], "x": 8.25, "y": 3},
+ {"matrix": [5, 8], "x": 9.25, "y": 3},
+ {"matrix": [6, 0], "x": 10.25, "y": 3},
+ {"matrix": [6, 1], "x": 11.25, "y": 3},
+ {"matrix": [6, 2], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [6, 3], "x": 15.25, "y": 3},
+
+ {"matrix": [6, 4], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [6, 5], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [6, 6], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [6, 7], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [6, 8], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [7, 0], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [7, 1], "x": 12.5, "y": 4, "w": 1.25},
+
+ {"matrix": [7, 2], "x": 14.25, "y": 4},
+ {"matrix": [7, 3], "x": 15.25, "y": 4},
+ {"matrix": [7, 4], "x": 16.25, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
index 8d69a5a8af..c3e359e24e 100644
--- a/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
+++ b/keyboards/40percentclub/mf68/keymaps/delivrance/keymap.c
@@ -138,7 +138,7 @@ void led_blink(void) {
backlight_toggle();
}
-void dynamic_macro_record_start_user(void) {
+void dynamic_macro_record_start_user(int8_t direction) {
led_blink();
}
diff --git a/keyboards/40percentclub/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c
deleted file mode 100644
index 4abee8e0c3..0000000000
--- a/keyboards/40percentclub/mf68/mf68.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "mf68.h"
diff --git a/keyboards/40percentclub/mf68/mf68.h b/keyboards/40percentclub/mf68/mf68.h
deleted file mode 100644
index 71ee4229de..0000000000
--- a/keyboards/40percentclub/mf68/mf68.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_68_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, \
- K17, K18, K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, \
- K35, K36, K37, K38, K40, K41, K42, K43, K44, K45, K46, K47, K48, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K60, K61, K62, K63, \
- K64, K65, K66, K67, K68, K70, K71, K72, K73, K74 \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
- { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
- { K70, K71, K72, K73, K74, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/40percentclub/nano/config.h b/keyboards/40percentclub/nano/config.h
index 39aa83e067..8641d6a37f 100644
--- a/keyboards/40percentclub/nano/config.h
+++ b/keyboards/40percentclub/nano/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/nano/info.json b/keyboards/40percentclub/nano/info.json
index 86c73f1943..ddcf567d83 100644
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -8,6 +8,9 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"matrix_pins": {
diff --git a/keyboards/40percentclub/nano/keymaps/default/rules.mk b/keyboards/40percentclub/nano/keymaps/default/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/40percentclub/nano/keymaps/default/rules.mk
+++ /dev/null
diff --git a/keyboards/40percentclub/nori/config.h b/keyboards/40percentclub/nori/config.h
index 6bdf5db350..57981dd27f 100644
--- a/keyboards/40percentclub/nori/config.h
+++ b/keyboards/40percentclub/nori/config.h
@@ -16,25 +16,7 @@
#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 { D3, D2, D1, D0 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D4, C6, D7, E6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
// enable RGB underglow
-#define RGB_DI_PIN B4
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/nori/info.json b/keyboards/40percentclub/nori/info.json
index fa12a8ef03..b58ee84edc 100644
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -8,117 +8,137 @@
"pid": "0x0A0C",
"device_version": "4.4.4"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D4", "C6", "D7", "E6"],
+ "rows": ["D3", "D2", "D1", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B5"
},
+ "ws2812": {
+ "pin": "B4"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4", "ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "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": [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": [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": [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}
+ ]
},
"LAYOUT_ortho_4x8": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
- { "w": 1, "x": 6, "y": 0 },
- { "w": 1, "x": 7, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
- { "w": 1, "x": 6, "y": 1 },
- { "w": 1, "x": 7, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
- { "w": 1, "x": 6, "y": 2 },
- { "w": 1, "x": 7, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 1, "x": 5, "y": 3 },
- { "w": 1, "x": 6, "y": 3 },
- { "w": 1, "x": 7, "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": [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": [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": [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}
+ ]
},
"LAYOUT_ortho_4x12": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
- { "w": 1, "x": 6, "y": 0 },
- { "w": 1, "x": 7, "y": 0 },
- { "w": 1, "x": 8, "y": 0 },
- { "w": 1, "x": 9, "y": 0 },
- { "w": 1, "x": 10, "y": 0 },
- { "w": 1, "x": 11, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
- { "w": 1, "x": 6, "y": 1 },
- { "w": 1, "x": 7, "y": 1 },
- { "w": 1, "x": 8, "y": 1 },
- { "w": 1, "x": 9, "y": 1 },
- { "w": 1, "x": 10, "y": 1 },
- { "w": 1, "x": 11, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
- { "w": 1, "x": 6, "y": 2 },
- { "w": 1, "x": 7, "y": 2 },
- { "w": 1, "x": 8, "y": 2 },
- { "w": 1, "x": 9, "y": 2 },
- { "w": 1, "x": 10, "y": 2 },
- { "w": 1, "x": 11, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 1, "x": 5, "y": 3 },
- { "w": 1, "x": 6, "y": 3 },
- { "w": 1, "x": 7, "y": 3 },
- { "w": 1, "x": 8, "y": 3 },
- { "w": 1, "x": 9, "y": 3 },
- { "w": 1, "x": 10, "y": 3 },
- { "w": 1, "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}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
index eacfacc5a7..f076ded9ba 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT // MT key must be held longer than tapping term for
- // modifer to be registered
#define RETRO_TAPPING_PER_KEY
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/40percentclub/nori/nori.c b/keyboards/40percentclub/nori/nori.c
deleted file mode 100644
index f60cf98d86..0000000000
--- a/keyboards/40percentclub/nori/nori.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018
- *
- * 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 "nori.h"
diff --git a/keyboards/40percentclub/nori/nori.h b/keyboards/40percentclub/nori/nori.h
deleted file mode 100644
index 768598b7f8..0000000000
--- a/keyboards/40percentclub/nori/nori.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2018
- *
- * 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 ___ KC_NO
-
-#define LAYOUT_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) \
-{ \
- { K00, K01, K02, K03, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { K10, K11, K12, K13, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { K20, K21, K22, K23, ___, ___, ___, ___, ___, ___, ___, ___ }, \
- { K30, K31, K32, K33, ___, ___, ___, ___, ___, ___, ___, ___ } \
-}
-#define LAYOUT_ortho_4x8( \
- K00, K01, K02, K03, K04, K05, K06, K07, \
- K10, K11, K12, K13, K14, K15, K16, K17, \
- K20, K21, K22, K23, K24, K25, K26, K27, \
- K30, K31, K32, K33, K34, K35, K36, K37\
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, ___, ___, ___, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, ___, ___, ___, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, ___, ___, ___, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, ___, ___, ___, ___ } \
-}
-#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/40percentclub/polyandry/info.json b/keyboards/40percentclub/polyandry/info.json
index f5f33e3d97..63420adf86 100644
--- a/keyboards/40percentclub/polyandry/info.json
+++ b/keyboards/40percentclub/polyandry/info.json
@@ -7,27 +7,5 @@
"vid": "0x4025",
"pid": "0x6060",
"device_version": "0.0.1"
- },
- "layouts": {
- "LAYOUT_ortho_4x3": {
- "layout": [
- {"label": "k000", "x": 0, "y": 0},
- {"label": "k001", "x": 1, "y": 0},
- {"label": "k002", "x": 2, "y": 0},
-
- {"label": "k003", "x": 0, "y": 1},
- {"label": "k004", "x": 1, "y": 1},
- {"label": "k005", "x": 2, "y": 1},
-
- {"label": "k006", "x": 0, "y": 2},
- {"label": "k007", "x": 1, "y": 2},
- {"label": "k008", "x": 2, "y": 2},
-
- {"label": "k009", "x": 0, "y": 3},
- {"label": "k010", "x": 1, "y": 3},
- {"label": "k011", "x": 2, "y": 3}
-
- ]
- }
}
}
diff --git a/keyboards/40percentclub/polyandry/polyandry.c b/keyboards/40percentclub/polyandry/polyandry.c
deleted file mode 100644
index 2b4be589b8..0000000000
--- a/keyboards/40percentclub/polyandry/polyandry.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 "polyandry.h"
diff --git a/keyboards/40percentclub/polyandry/polyandry.h b/keyboards/40percentclub/polyandry/polyandry.h
deleted file mode 100644
index 5baf87ba62..0000000000
--- a/keyboards/40percentclub/polyandry/polyandry.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2021
- *
- * 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"
-
-#ifdef KEYBOARD_40percentclub_polyandry_promicro
- #include "promicro.h"
-#elif KEYBOARD_40percentclub_polyandry_teensy2
- #include "teensy2.h"
-#endif
diff --git a/keyboards/40percentclub/polyandry/promicro/config.h b/keyboards/40percentclub/polyandry/promicro/config.h
deleted file mode 100644
index ff148a0b3f..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021
- *
- * 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
- * Direct pins is not used because there is not a shared ground position
- * between all compatible microcontrollers.
-*/
-#define MATRIX_ROW_PINS { D7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, E6, B4, F4, F5, F6, F7, B3, B2 }
-
-/* doesn't really matter lol */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/promicro/info.json b/keyboards/40percentclub/polyandry/promicro/info.json
index 4369a04103..8a8cd98794 100644
--- a/keyboards/40percentclub/polyandry/promicro/info.json
+++ b/keyboards/40percentclub/polyandry/promicro/info.json
@@ -1,4 +1,30 @@
{
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "E6", "B4", "F4", "F5", "F6", "F7", "B3", "B2"],
+ "rows": ["D7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "layouts": {
+ "LAYOUT_ortho_4x3": {
+ "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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1},
+
+ {"matrix": [0, 6], "x": 0, "y": 2},
+ {"matrix": [0, 7], "x": 1, "y": 2},
+ {"matrix": [0, 8], "x": 2, "y": 2},
+
+ {"matrix": [0, 9], "x": 0, "y": 3},
+ {"matrix": [0, 10], "x": 1, "y": 3},
+ {"matrix": [0, 11], "x": 2, "y": 3}
+ ]
+ }
+ }
}
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.c b/keyboards/40percentclub/polyandry/promicro/promicro.c
deleted file mode 100644
index ea1dd51788..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/promicro.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 "promicro.h"
diff --git a/keyboards/40percentclub/polyandry/promicro/promicro.h b/keyboards/40percentclub/polyandry/promicro/promicro.h
deleted file mode 100644
index 0a6f8b36b8..0000000000
--- a/keyboards/40percentclub/polyandry/promicro/promicro.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021
- *
- * 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 "polyandry.h"
-
-#define LAYOUT_ortho_4x3( \
- K000, K001, K002, \
- K003, K004, K005, \
- K006, K007, K008, \
- K009, K010, K011 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \
-}
diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h
deleted file mode 100644
index 8eaeb3167a..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021
- *
- * 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 */
-
-// Note from original contributor (ryjelsum):
-// Untested - don't have teensy2. if some keys do not function or are in wrong place,
-// please check the pin definitions. I may have screwed up. :)
-
-#define MATRIX_ROW_PINS { D3 }
-#define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json
index 0b2db81c11..33fd1d71df 100644
--- a/keyboards/40percentclub/polyandry/teensy2/info.json
+++ b/keyboards/40percentclub/polyandry/teensy2/info.json
@@ -1,4 +1,30 @@
{
+ "matrix_pins": {
+ "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"],
+ "rows": ["D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "halfkay"
+ "bootloader": "halfkay",
+ "layouts": {
+ "LAYOUT_ortho_4x3": {
+ "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": 0, "y": 1},
+ {"matrix": [0, 4], "x": 1, "y": 1},
+ {"matrix": [0, 5], "x": 2, "y": 1},
+
+ {"matrix": [0, 6], "x": 0, "y": 2},
+ {"matrix": [0, 7], "x": 1, "y": 2},
+ {"matrix": [0, 8], "x": 2, "y": 2},
+
+ {"matrix": [0, 9], "x": 0, "y": 3},
+ {"matrix": [0, 10], "x": 1, "y": 3},
+ {"matrix": [0, 11], "x": 2, "y": 3}
+ ]
+ }
+ }
}
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.c b/keyboards/40percentclub/polyandry/teensy2/teensy2.c
deleted file mode 100644
index 33cfb6e553..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 "teensy2.h"
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
deleted file mode 100644
index ce7790434b..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021
- *
- * 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
-
-//NOTE TO FUTURE FROM RYJELSUM (original contributor):
-//This has been unchanged from the promicro.h file.
-//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH.
-//I believe this should still work - but it's not a sure thing.
-
-#include "polyandry.h"
-
-#define LAYOUT_ortho_4x3( \
- K000, K001, K002, \
- K003, K004, K005, \
- K006, K007, K008, \
- K009, K010, K011 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 } \
-}
diff --git a/keyboards/40percentclub/tomato/config.h b/keyboards/40percentclub/tomato/config.h
index 357380e3a7..2199981c7c 100644
--- a/keyboards/40percentclub/tomato/config.h
+++ b/keyboards/40percentclub/tomato/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, D0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
@@ -15,7 +7,6 @@
#define PERMISSIVE_HOLD
/* setup lighting */
-#define RGB_DI_PIN B5
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/40percentclub/tomato/info.json b/keyboards/40percentclub/tomato/info.json
index cbaefde2bd..c881f7c7d1 100644
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -8,12 +8,53 @@
"pid": "0x546F",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B5"
+ },
+ "matrix_pins": {
+ "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+ "rows": ["F7", "B1", "B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_3x10"],
"layouts": {
"LAYOUT_ortho_3x10": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
+ "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": [1, 0], "x": 6, "y": 0},
+ {"matrix": [1, 1], "x": 7, "y": 0},
+ {"matrix": [1, 2], "x": 8, "y": 0},
+ {"matrix": [1, 3], "x": 9, "y": 0},
+
+ {"matrix": [1, 4], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [2, 0], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [2, 3], "x": 5, "y": 1},
+ {"matrix": [2, 4], "x": 6, "y": 1},
+ {"matrix": [2, 5], "x": 7, "y": 1},
+ {"matrix": [3, 0], "x": 8, "y": 1},
+ {"matrix": [3, 1], "x": 9, "y": 1},
+
+ {"matrix": [3, 2], "x": 0, "y": 2},
+ {"matrix": [3, 3], "x": 1, "y": 2},
+ {"matrix": [3, 4], "x": 2, "y": 2},
+ {"matrix": [3, 5], "x": 3, "y": 2},
+ {"matrix": [4, 0], "x": 4, "y": 2},
+ {"matrix": [4, 1], "x": 5, "y": 2},
+ {"matrix": [4, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [4, 5], "x": 9, "y": 2}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/tomato/tomato.c b/keyboards/40percentclub/tomato/tomato.c
deleted file mode 100644
index dbf8bfe12b..0000000000
--- a/keyboards/40percentclub/tomato/tomato.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tomato.h"
diff --git a/keyboards/40percentclub/tomato/tomato.h b/keyboards/40percentclub/tomato/tomato.h
deleted file mode 100644
index 70bffee302..0000000000
--- a/keyboards/40percentclub/tomato/tomato.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_3x10( \
- K00, K01, K02, K03, K04, K05, K10, K11, K12, K13 , \
- K14, K15, K20, K21, K22, K23, K24, K25, K30, K31 , \
- K32, K33, K34, K35, K40, K41, K42, K43, K44, K45 \
-) { \
- { K00, K01, K02, K03, K04, K05 }, \
- { K10, K11, K12, K13, K14, K15 }, \
- { K20, K21, K22, K23, K24, K25 }, \
- { K30, K31, K32, K33, K34, K35 }, \
- { K40, K41, K42, K43, K44, K45 } \
-}
diff --git a/keyboards/40percentclub/ut47/info.json b/keyboards/40percentclub/ut47/info.json
index 055db80471..668f277f40 100644
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/info.json
@@ -12,7 +12,58 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Esc", "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":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}]
+ "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, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 10], "x": 10.25, "y": 1},
+ {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "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, "w": 1.25},
+ {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [3, 9], "x": 9.5, "y": 3},
+ {"matrix": [3, 10], "x": 10.5, "y": 3},
+ {"matrix": [3, 11], "x": 11.5, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
index 4b5ffc4f10..8dc267380a 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/config.h
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
@@ -28,5 +28,5 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN D3 // The pin the LED strip is connected to
+#define WS2812_DI_PIN D3 // The pin the LED strip is connected to
#define RGBLED_NUM 7 // Number of LEDs in your strip
diff --git a/keyboards/40percentclub/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
index 9d46a4679d..d5675e1047 100644
--- a/keyboards/40percentclub/ut47/ut47.c
+++ b/keyboards/40percentclub/ut47/ut47.c
@@ -13,7 +13,7 @@
* 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 "ut47.h"
+#include "quantum.h"
#ifdef LED_ENABLE
#include "uart.h"
diff --git a/keyboards/40percentclub/ut47/ut47.h b/keyboards/40percentclub/ut47/ut47.h
deleted file mode 100644
index f595d3a458..0000000000
--- a/keyboards/40percentclub/ut47/ut47.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2018 Carlos Filoteo
- *
- * 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( \
- 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, K35, K37, K38, K39, K3a, K3b } \
- }