summaryrefslogtreecommitdiff
path: root/keyboards/ealdin
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ealdin')
-rw-r--r--keyboards/ealdin/quadrant/config.h10
-rw-r--r--keyboards/ealdin/quadrant/info.json398
-rw-r--r--keyboards/ealdin/quadrant/quadrant.c2
-rw-r--r--keyboards/ealdin/quadrant/quadrant.h103
4 files changed, 389 insertions, 124 deletions
diff --git a/keyboards/ealdin/quadrant/config.h b/keyboards/ealdin/quadrant/config.h
index f4954fcd11..fd41a6969d 100644
--- a/keyboards/ealdin/quadrant/config.h
+++ b/keyboards/ealdin/quadrant/config.h
@@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B2, F7, B3, B6, B1 }
-#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -42,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ealdin/quadrant/info.json b/keyboards/ealdin/quadrant/info.json
index d8b388c331..eec8bc9579 100644
--- a/keyboards/ealdin/quadrant/info.json
+++ b/keyboards/ealdin/quadrant/info.json
@@ -8,29 +8,407 @@
"pid": "0x5154",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "F6", "F5", "F4"],
+ "rows": ["B2", "F7", "B3", "B6", "B1"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D5", "pin_b": "F1"}
]
},
+ "ws2812": {
+ "pin": "C7"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["ortho_5x14"],
"layouts": {
"LAYOUT_ortho_5x14": {
- "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":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":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":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":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}]
- },
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+ {"matrix": [4, 5], "x": 5, "y": 0},
+ {"matrix": [4, 6], "x": 6, "y": 0},
+ {"matrix": [4, 7], "x": 7, "y": 0},
+ {"matrix": [4, 8], "x": 8, "y": 0},
+ {"matrix": [4, 9], "x": 9, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 0},
+ {"matrix": [4, 11], "x": 11, "y": 0},
+ {"matrix": [4, 12], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [3, 1], "x": 1, "y": 1},
+ {"matrix": [3, 2], "x": 2, "y": 1},
+ {"matrix": [3, 3], "x": 3, "y": 1},
+ {"matrix": [3, 4], "x": 4, "y": 1},
+ {"matrix": [3, 5], "x": 5, "y": 1},
+ {"matrix": [3, 6], "x": 6, "y": 1},
+ {"matrix": [3, 7], "x": 7, "y": 1},
+ {"matrix": [3, 8], "x": 8, "y": 1},
+ {"matrix": [3, 9], "x": 9, "y": 1},
+ {"matrix": [3, 10], "x": 10, "y": 1},
+ {"matrix": [3, 11], "x": 11, "y": 1},
+ {"matrix": [3, 12], "x": 12, "y": 1},
+ {"matrix": [3, 13], "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": [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": [1, 0], "x": 0, "y": 3},
+ {"matrix": [1, 1], "x": 1, "y": 3},
+ {"matrix": [1, 2], "x": 2, "y": 3},
+ {"matrix": [1, 3], "x": 3, "y": 3},
+ {"matrix": [1, 4], "x": 4, "y": 3},
+ {"matrix": [1, 5], "x": 5, "y": 3},
+ {"matrix": [1, 6], "x": 6, "y": 3},
+ {"matrix": [1, 7], "x": 7, "y": 3},
+ {"matrix": [1, 8], "x": 8, "y": 3},
+ {"matrix": [1, 9], "x": 9, "y": 3},
+ {"matrix": [1, 10], "x": 10, "y": 3},
+ {"matrix": [1, 11], "x": 11, "y": 3},
+ {"matrix": [1, 12], "x": 12, "y": 3},
+ {"matrix": [1, 13], "x": 13, "y": 3},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [0, 1], "x": 1, "y": 4},
+ {"matrix": [0, 2], "x": 2, "y": 4},
+ {"matrix": [0, 3], "x": 3, "y": 4},
+ {"matrix": [0, 4], "x": 4, "y": 4},
+ {"matrix": [0, 5], "x": 5, "y": 4},
+ {"matrix": [0, 6], "x": 6, "y": 4},
+ {"matrix": [0, 7], "x": 7, "y": 4},
+ {"matrix": [0, 8], "x": 8, "y": 4},
+ {"matrix": [0, 9], "x": 9, "y": 4},
+ {"matrix": [0, 10], "x": 10, "y": 4},
+ {"matrix": [0, 11], "x": 11, "y": 4},
+ {"matrix": [0, 12], "x": 12, "y": 4},
+ {"matrix": [0, 13], "x": 13, "y": 4}
+ ]
+ },
"LAYOUT_ortho_5x14_1x2uC": {
- "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":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":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":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":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, "w":2}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
- },
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+ {"matrix": [4, 5], "x": 5, "y": 0},
+ {"matrix": [4, 6], "x": 6, "y": 0},
+ {"matrix": [4, 7], "x": 7, "y": 0},
+ {"matrix": [4, 8], "x": 8, "y": 0},
+ {"matrix": [4, 9], "x": 9, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 0},
+ {"matrix": [4, 11], "x": 11, "y": 0},
+ {"matrix": [4, 12], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [3, 1], "x": 1, "y": 1},
+ {"matrix": [3, 2], "x": 2, "y": 1},
+ {"matrix": [3, 3], "x": 3, "y": 1},
+ {"matrix": [3, 4], "x": 4, "y": 1},
+ {"matrix": [3, 5], "x": 5, "y": 1},
+ {"matrix": [3, 6], "x": 6, "y": 1},
+ {"matrix": [3, 7], "x": 7, "y": 1},
+ {"matrix": [3, 8], "x": 8, "y": 1},
+ {"matrix": [3, 9], "x": 9, "y": 1},
+ {"matrix": [3, 10], "x": 10, "y": 1},
+ {"matrix": [3, 11], "x": 11, "y": 1},
+ {"matrix": [3, 12], "x": 12, "y": 1},
+ {"matrix": [3, 13], "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": [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": [1, 0], "x": 0, "y": 3},
+ {"matrix": [1, 1], "x": 1, "y": 3},
+ {"matrix": [1, 2], "x": 2, "y": 3},
+ {"matrix": [1, 3], "x": 3, "y": 3},
+ {"matrix": [1, 4], "x": 4, "y": 3},
+ {"matrix": [1, 5], "x": 5, "y": 3},
+ {"matrix": [1, 6], "x": 6, "y": 3},
+ {"matrix": [1, 7], "x": 7, "y": 3},
+ {"matrix": [1, 8], "x": 8, "y": 3},
+ {"matrix": [1, 9], "x": 9, "y": 3},
+ {"matrix": [1, 10], "x": 10, "y": 3},
+ {"matrix": [1, 11], "x": 11, "y": 3},
+ {"matrix": [1, 12], "x": 12, "y": 3},
+ {"matrix": [1, 13], "x": 13, "y": 3},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [0, 1], "x": 1, "y": 4},
+ {"matrix": [0, 2], "x": 2, "y": 4},
+ {"matrix": [0, 3], "x": 3, "y": 4},
+ {"matrix": [0, 4], "x": 4, "y": 4},
+ {"matrix": [0, 5], "x": 5, "y": 4},
+ {"matrix": [0, 7], "x": 6, "y": 4, "w": 2},
+ {"matrix": [0, 8], "x": 8, "y": 4},
+ {"matrix": [0, 9], "x": 9, "y": 4},
+ {"matrix": [0, 10], "x": 10, "y": 4},
+ {"matrix": [0, 11], "x": 11, "y": 4},
+ {"matrix": [0, 12], "x": 12, "y": 4},
+ {"matrix": [0, 13], "x": 13, "y": 4}
+ ]
+ },
"LAYOUT_ortho_5x14_1x2uL": {
- "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":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":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":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":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"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}]
- },
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+ {"matrix": [4, 5], "x": 5, "y": 0},
+ {"matrix": [4, 6], "x": 6, "y": 0},
+ {"matrix": [4, 7], "x": 7, "y": 0},
+ {"matrix": [4, 8], "x": 8, "y": 0},
+ {"matrix": [4, 9], "x": 9, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 0},
+ {"matrix": [4, 11], "x": 11, "y": 0},
+ {"matrix": [4, 12], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [3, 1], "x": 1, "y": 1},
+ {"matrix": [3, 2], "x": 2, "y": 1},
+ {"matrix": [3, 3], "x": 3, "y": 1},
+ {"matrix": [3, 4], "x": 4, "y": 1},
+ {"matrix": [3, 5], "x": 5, "y": 1},
+ {"matrix": [3, 6], "x": 6, "y": 1},
+ {"matrix": [3, 7], "x": 7, "y": 1},
+ {"matrix": [3, 8], "x": 8, "y": 1},
+ {"matrix": [3, 9], "x": 9, "y": 1},
+ {"matrix": [3, 10], "x": 10, "y": 1},
+ {"matrix": [3, 11], "x": 11, "y": 1},
+ {"matrix": [3, 12], "x": 12, "y": 1},
+ {"matrix": [3, 13], "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": [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": [1, 0], "x": 0, "y": 3},
+ {"matrix": [1, 1], "x": 1, "y": 3},
+ {"matrix": [1, 2], "x": 2, "y": 3},
+ {"matrix": [1, 3], "x": 3, "y": 3},
+ {"matrix": [1, 4], "x": 4, "y": 3},
+ {"matrix": [1, 5], "x": 5, "y": 3},
+ {"matrix": [1, 6], "x": 6, "y": 3},
+ {"matrix": [1, 7], "x": 7, "y": 3},
+ {"matrix": [1, 8], "x": 8, "y": 3},
+ {"matrix": [1, 9], "x": 9, "y": 3},
+ {"matrix": [1, 10], "x": 10, "y": 3},
+ {"matrix": [1, 11], "x": 11, "y": 3},
+ {"matrix": [1, 12], "x": 12, "y": 3},
+ {"matrix": [1, 13], "x": 13, "y": 3},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [0, 1], "x": 1, "y": 4},
+ {"matrix": [0, 2], "x": 2, "y": 4},
+ {"matrix": [0, 3], "x": 3, "y": 4},
+ {"matrix": [0, 4], "x": 4, "y": 4},
+ {"matrix": [0, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [0, 7], "x": 7, "y": 4},
+ {"matrix": [0, 8], "x": 8, "y": 4},
+ {"matrix": [0, 9], "x": 9, "y": 4},
+ {"matrix": [0, 10], "x": 10, "y": 4},
+ {"matrix": [0, 11], "x": 11, "y": 4},
+ {"matrix": [0, 12], "x": 12, "y": 4},
+ {"matrix": [0, 13], "x": 13, "y": 4}
+ ]
+ },
"LAYOUT_ortho_5x14_1x2uR": {
- "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":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":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":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":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, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
- },
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+ {"matrix": [4, 5], "x": 5, "y": 0},
+ {"matrix": [4, 6], "x": 6, "y": 0},
+ {"matrix": [4, 7], "x": 7, "y": 0},
+ {"matrix": [4, 8], "x": 8, "y": 0},
+ {"matrix": [4, 9], "x": 9, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 0},
+ {"matrix": [4, 11], "x": 11, "y": 0},
+ {"matrix": [4, 12], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [3, 1], "x": 1, "y": 1},
+ {"matrix": [3, 2], "x": 2, "y": 1},
+ {"matrix": [3, 3], "x": 3, "y": 1},
+ {"matrix": [3, 4], "x": 4, "y": 1},
+ {"matrix": [3, 5], "x": 5, "y": 1},
+ {"matrix": [3, 6], "x": 6, "y": 1},
+ {"matrix": [3, 7], "x": 7, "y": 1},
+ {"matrix": [3, 8], "x": 8, "y": 1},
+ {"matrix": [3, 9], "x": 9, "y": 1},
+ {"matrix": [3, 10], "x": 10, "y": 1},
+ {"matrix": [3, 11], "x": 11, "y": 1},
+ {"matrix": [3, 12], "x": 12, "y": 1},
+ {"matrix": [3, 13], "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": [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": [1, 0], "x": 0, "y": 3},
+ {"matrix": [1, 1], "x": 1, "y": 3},
+ {"matrix": [1, 2], "x": 2, "y": 3},
+ {"matrix": [1, 3], "x": 3, "y": 3},
+ {"matrix": [1, 4], "x": 4, "y": 3},
+ {"matrix": [1, 5], "x": 5, "y": 3},
+ {"matrix": [1, 6], "x": 6, "y": 3},
+ {"matrix": [1, 7], "x": 7, "y": 3},
+ {"matrix": [1, 8], "x": 8, "y": 3},
+ {"matrix": [1, 9], "x": 9, "y": 3},
+ {"matrix": [1, 10], "x": 10, "y": 3},
+ {"matrix": [1, 11], "x": 11, "y": 3},
+ {"matrix": [1, 12], "x": 12, "y": 3},
+ {"matrix": [1, 13], "x": 13, "y": 3},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [0, 1], "x": 1, "y": 4},
+ {"matrix": [0, 2], "x": 2, "y": 4},
+ {"matrix": [0, 3], "x": 3, "y": 4},
+ {"matrix": [0, 4], "x": 4, "y": 4},
+ {"matrix": [0, 5], "x": 5, "y": 4},
+ {"matrix": [0, 6], "x": 6, "y": 4},
+ {"matrix": [0, 8], "x": 7, "y": 4, "w": 2},
+ {"matrix": [0, 9], "x": 9, "y": 4},
+ {"matrix": [0, 10], "x": 10, "y": 4},
+ {"matrix": [0, 11], "x": 11, "y": 4},
+ {"matrix": [0, 12], "x": 12, "y": 4},
+ {"matrix": [0, 13], "x": 13, "y": 4}
+ ]
+ },
"LAYOUT_ortho_5x14_2x2u": {
- "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":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":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":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":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4, "w":2}, {"x":7, "y":4, "w":2}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
- }
+ "layout": [
+ {"matrix": [4, 0], "x": 0, "y": 0},
+ {"matrix": [4, 1], "x": 1, "y": 0},
+ {"matrix": [4, 2], "x": 2, "y": 0},
+ {"matrix": [4, 3], "x": 3, "y": 0},
+ {"matrix": [4, 4], "x": 4, "y": 0},
+ {"matrix": [4, 5], "x": 5, "y": 0},
+ {"matrix": [4, 6], "x": 6, "y": 0},
+ {"matrix": [4, 7], "x": 7, "y": 0},
+ {"matrix": [4, 8], "x": 8, "y": 0},
+ {"matrix": [4, 9], "x": 9, "y": 0},
+ {"matrix": [4, 10], "x": 10, "y": 0},
+ {"matrix": [4, 11], "x": 11, "y": 0},
+ {"matrix": [4, 12], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+
+ {"matrix": [3, 0], "x": 0, "y": 1},
+ {"matrix": [3, 1], "x": 1, "y": 1},
+ {"matrix": [3, 2], "x": 2, "y": 1},
+ {"matrix": [3, 3], "x": 3, "y": 1},
+ {"matrix": [3, 4], "x": 4, "y": 1},
+ {"matrix": [3, 5], "x": 5, "y": 1},
+ {"matrix": [3, 6], "x": 6, "y": 1},
+ {"matrix": [3, 7], "x": 7, "y": 1},
+ {"matrix": [3, 8], "x": 8, "y": 1},
+ {"matrix": [3, 9], "x": 9, "y": 1},
+ {"matrix": [3, 10], "x": 10, "y": 1},
+ {"matrix": [3, 11], "x": 11, "y": 1},
+ {"matrix": [3, 12], "x": 12, "y": 1},
+ {"matrix": [3, 13], "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": [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": [1, 0], "x": 0, "y": 3},
+ {"matrix": [1, 1], "x": 1, "y": 3},
+ {"matrix": [1, 2], "x": 2, "y": 3},
+ {"matrix": [1, 3], "x": 3, "y": 3},
+ {"matrix": [1, 4], "x": 4, "y": 3},
+ {"matrix": [1, 5], "x": 5, "y": 3},
+ {"matrix": [1, 6], "x": 6, "y": 3},
+ {"matrix": [1, 7], "x": 7, "y": 3},
+ {"matrix": [1, 8], "x": 8, "y": 3},
+ {"matrix": [1, 9], "x": 9, "y": 3},
+ {"matrix": [1, 10], "x": 10, "y": 3},
+ {"matrix": [1, 11], "x": 11, "y": 3},
+ {"matrix": [1, 12], "x": 12, "y": 3},
+ {"matrix": [1, 13], "x": 13, "y": 3},
+
+ {"matrix": [0, 0], "x": 0, "y": 4},
+ {"matrix": [0, 1], "x": 1, "y": 4},
+ {"matrix": [0, 2], "x": 2, "y": 4},
+ {"matrix": [0, 3], "x": 3, "y": 4},
+ {"matrix": [0, 4], "x": 4, "y": 4},
+ {"matrix": [0, 6], "x": 5, "y": 4, "w": 2},
+ {"matrix": [0, 8], "x": 7, "y": 4, "w": 2},
+ {"matrix": [0, 9], "x": 9, "y": 4},
+ {"matrix": [0, 10], "x": 10, "y": 4},
+ {"matrix": [0, 11], "x": 11, "y": 4},
+ {"matrix": [0, 12], "x": 12, "y": 4},
+ {"matrix": [0, 13], "x": 13, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/ealdin/quadrant/quadrant.c b/keyboards/ealdin/quadrant/quadrant.c
index a5aff62dae..f98cafd750 100644
--- a/keyboards/ealdin/quadrant/quadrant.c
+++ b/keyboards/ealdin/quadrant/quadrant.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 "quadrant.h"
+#include "quantum.h"
// Rotary encoder functions:
diff --git a/keyboards/ealdin/quadrant/quadrant.h b/keyboards/ealdin/quadrant/quadrant.h
deleted file mode 100644
index 8c6f5215e8..0000000000
--- a/keyboards/ealdin/quadrant/quadrant.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright 2020 Ealdin Keyboards
- *
- * 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"
-
-/* 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 ___ KC_NO
-#define LAYOUT_ortho_5x14( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \
-}
-
-#define LAYOUT_ortho_5x14_1x2uC( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k40, k41, k42, k43, k44, k45, ___, k47, k48, k49, k4a, k4b, k4c, k4d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \
-}
-
-#define LAYOUT_ortho_5x14_1x2uL( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k46, k47, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k40, k41, k42, k43, k44, __, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \
-}
-
-#define LAYOUT_ortho_5x14_1x2uR( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k46, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k40, k41, k42, k43, k44, k45, k46, ___, k48, k49, k4a, k4b, k4c, k4d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \
-}
-
-#define LAYOUT_ortho_5x14_2x2u( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k46, k48, k49, k4a, k4b, k4c, k4d \
-) \
-{ \
- { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d } \
-}