summaryrefslogtreecommitdiff
path: root/keyboards/nightly_boards
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-05 15:50:56 +1000
committerGitHub <noreply@github.com>2023-04-05 15:50:56 +1000
commit09a2b70a661323aa7ea023341bb1e9dcd3c75e24 (patch)
treee97fa9446ae698496ea4b2944f525f888fa24c7e /keyboards/nightly_boards
parent6847dba8af551aa0f1afbd74f77a8c49ad28e33b (diff)
Move Alice and Ergodox layouts to data driven (#20340)
Diffstat (limited to 'keyboards/nightly_boards')
-rw-r--r--keyboards/nightly_boards/alter/rev1/info.json150
-rw-r--r--keyboards/nightly_boards/alter/rev1/rev1.h48
2 files changed, 79 insertions, 119 deletions
diff --git a/keyboards/nightly_boards/alter/rev1/info.json b/keyboards/nightly_boards/alter/rev1/info.json
index d59acbf6e2..2491b10711 100644
--- a/keyboards/nightly_boards/alter/rev1/info.json
+++ b/keyboards/nightly_boards/alter/rev1/info.json
@@ -21,79 +21,87 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["alice_split_bs"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_alice_split_bs"
+ },
"layouts": {
"LAYOUT_alice_split_bs": {
- "layout": [
- {"x":0.5, "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":11.25, "y":0},
- {"x":12.25, "y":0},
- {"x":13.25, "y":0},
- {"x":14.25, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
- {"x":17.25, "y":0},
- {"x":18.25, "y":0},
-
- {"x":0.25, "y":1},
- {"x":1.75, "y":1, "w":1.5},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":11, "y":1},
- {"x":12, "y":1},
- {"x":13, "y":1},
- {"x":14, "y":1},
- {"x":15, "y":1},
- {"x":16, "y":1},
- {"x":17, "y":1},
- {"x":18, "y":1, "w":1.5},
-
- {"x":0, "y":2},
- {"x":1.5, "y":2, "w":1.75},
- {"x":3.25, "y":2},
- {"x":4.5, "y":2},
- {"x":5.5, "y":2},
- {"x":6.5, "y":2},
- {"x":7.5, "y":2},
- {"x":11.25, "y":2},
- {"x":12.25, "y":2},
- {"x":13.25, "y":2},
- {"x":14.25, "y":2},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "y":2, "w":2.25},
-
- {"x":1.25, "y":3, "w":2.25},
- {"x":3.5, "y":3},
- {"x":5, "y":3},
- {"x":6, "y":3},
- {"x":7, "y":3},
- {"x":8, "y":3},
- {"x":10.75, "y":3},
- {"x":11.75, "y":3},
- {"x":12.75, "y":3},
- {"x":13.75, "y":3},
- {"x":15.25, "y":3},
- {"x":16.25, "y":3},
- {"x":17.25, "y":3, "w":1.75},
- {"x":19, "y":3},
-
- {"x":1.25, "y":4, "w":1.5},
- {"x":5, "y":4, "w":1.5},
- {"x":6.5, "y":4, "w":2},
- {"x":8.5, "y":4, "w":1.25},
- {"x":10.5, "y":4, "w":2.75},
- {"x":13.25, "y":4, "w":1.5},
- {"x":18.25, "y":4, "w":1.5}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0.5, "y": 0},
+ {"matrix": [1, 0], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [1, 1], "x": 4, "y": 0},
+ {"matrix": [0, 2], "x": 5, "y": 0},
+ {"matrix": [1, 2], "x": 6, "y": 0},
+ {"matrix": [0, 3], "x": 7, "y": 0},
+ {"matrix": [1, 3], "x": 8, "y": 0},
+
+ {"matrix": [0, 4], "x": 11.25, "y": 0},
+ {"matrix": [1, 4], "x": 12.25, "y": 0},
+ {"matrix": [0, 5], "x": 13.25, "y": 0},
+ {"matrix": [1, 5], "x": 14.25, "y": 0},
+ {"matrix": [0, 6], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0},
+ {"matrix": [1, 7], "x": 17.25, "y": 0},
+ {"matrix": [0, 7], "x": 18.25, "y": 0},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 1},
+ {"matrix": [3, 0], "x": 1.75, "y": 1, "w": 1.5},
+ {"matrix": [2, 1], "x": 3.25, "y": 1},
+ {"matrix": [3, 1], "x": 4.25, "y": 1},
+ {"matrix": [2, 2], "x": 5.25, "y": 1},
+ {"matrix": [3, 2], "x": 6.25, "y": 1},
+ {"matrix": [2, 3], "x": 7.25, "y": 1},
+
+ {"matrix": [2, 4], "x": 11, "y": 1},
+ {"matrix": [3, 4], "x": 12, "y": 1},
+ {"matrix": [2, 5], "x": 13, "y": 1},
+ {"matrix": [3, 5], "x": 14, "y": 1},
+ {"matrix": [2, 6], "x": 15, "y": 1},
+ {"matrix": [3, 6], "x": 16, "y": 1},
+ {"matrix": [2, 7], "x": 17, "y": 1},
+ {"matrix": [3, 7], "x": 18, "y": 1, "w": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [5, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 2], "x": 4.5, "y": 2},
+ {"matrix": [5, 2], "x": 5.5, "y": 2},
+ {"matrix": [4, 3], "x": 6.5, "y": 2},
+ {"matrix": [5, 3], "x": 7.5, "y": 2},
+
+ {"matrix": [4, 4], "x": 11.25, "y": 2},
+ {"matrix": [5, 4], "x": 12.25, "y": 2},
+ {"matrix": [4, 5], "x": 13.25, "y": 2},
+ {"matrix": [5, 5], "x": 14.25, "y": 2},
+ {"matrix": [4, 6], "x": 15.5, "y": 2},
+ {"matrix": [5, 6], "x": 16.5, "y": 2},
+ {"matrix": [4, 7], "x": 17.5, "y": 2, "w": 2.25},
+
+ {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [7, 1], "x": 3.5, "y": 3},
+ {"matrix": [6, 2], "x": 5, "y": 3},
+ {"matrix": [7, 2], "x": 6, "y": 3},
+ {"matrix": [6, 3], "x": 7, "y": 3},
+ {"matrix": [7, 3], "x": 8, "y": 3},
+
+ {"matrix": [6, 4], "x": 10.75, "y": 3},
+ {"matrix": [7, 4], "x": 11.75, "y": 3},
+ {"matrix": [6, 5], "x": 12.75, "y": 3},
+ {"matrix": [7, 5], "x": 13.75, "y": 3},
+ {"matrix": [6, 6], "x": 15.25, "y": 3},
+ {"matrix": [7, 6], "x": 16.25, "y": 3},
+ {"matrix": [6, 7], "x": 17.25, "y": 3, "w": 1.75},
+ {"matrix": [7, 7], "x": 19, "y": 3},
+
+ {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 6.5, "y": 4, "w": 2},
+ {"matrix": [8, 3], "x": 8.5, "y": 4, "w": 1.25},
+ {"matrix": [8, 4], "x": 10.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 5], "x": 13.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 7], "x": 18.25, "y": 4, "w": 1.5}
+ ]
}
}
}
diff --git a/keyboards/nightly_boards/alter/rev1/rev1.h b/keyboards/nightly_boards/alter/rev1/rev1.h
deleted file mode 100644
index 8fbbc71aaf..0000000000
--- a/keyboards/nightly_boards/alter/rev1/rev1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2020 Neil Brian Ramirez
- *
- * 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 is 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_alice_split_bs( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K17, K07, \
- K20, K30, K21, K31, K22, K32, K23, K24, K34, K25, K35, K26, K36, K27, K37, \
- K40, K50, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \
- K70, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, K77, \
- K90, K82, K92, K83, K84, K95, K87 \
-) { \
- { 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, KC_NO, K34, K35, K36, K37 }, \
- { K40, KC_NO, K42, K43, K44, K45, K46, K47 }, \
- { K50, K51, K52, K53, K54, K55, K56, KC_NO }, \
- { KC_NO, KC_NO, K62, K63, K64, K65, K66, K67 }, \
- { K70, K71, K72, K73, K74, K75, K76, K77 }, \
- { KC_NO, KC_NO, K82, K83, K84, KC_NO, KC_NO, K87 }, \
- { K90, KC_NO, K92, KC_NO, KC_NO, K95, KC_NO, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_alice_split_bs