diff options
Diffstat (limited to 'keyboards/nightly_boards')
| -rw-r--r-- | keyboards/nightly_boards/alter_lite/alter_lite.h | 41 | ||||
| -rw-r--r-- | keyboards/nightly_boards/alter_lite/info.json | 140 | ||||
| -rw-r--r-- | keyboards/nightly_boards/conde60/conde60.h | 42 | ||||
| -rw-r--r-- | keyboards/nightly_boards/conde60/info.json | 141 | ||||
| -rw-r--r-- | keyboards/nightly_boards/jisoo/info.json | 185 | ||||
| -rw-r--r-- | keyboards/nightly_boards/jisoo/jisoo.h | 43 | ||||
| -rw-r--r-- | keyboards/nightly_boards/ph_arisu/info.json | 84 | ||||
| -rw-r--r-- | keyboards/nightly_boards/ph_arisu/ph_arisu.h | 22 |
8 files changed, 326 insertions, 372 deletions
diff --git a/keyboards/nightly_boards/alter_lite/alter_lite.h b/keyboards/nightly_boards/alter_lite/alter_lite.h deleted file mode 100644 index a268512dae..0000000000 --- a/keyboards/nightly_boards/alter_lite/alter_lite.h +++ /dev/null @@ -1,41 +0,0 @@ - /* Copyright 2020 DeskDaily - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K21, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K41, K44, K45, K46, K48, K4B, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, KC_NO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, KC_NO, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ - { KC_NO, K31, KC_NO, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { KC_NO, K41, KC_NO, KC_NO, K44, K45, K46, KC_NO, K48, KC_NO, KC_NO, K4B, KC_NO, KC_NO, K4E, KC_NO }, \ -} diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json index 10f3c03843..4fe29568a0 100644 --- a/keyboards/nightly_boards/alter_lite/info.json +++ b/keyboards/nightly_boards/alter_lite/info.json @@ -24,76 +24,84 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.5, "y":0}, - {"x":1.75, "y":0.1}, - {"x":2.75, "y":0.1}, - {"x":3.75, "y":0.1}, - {"x":4.75, "y":0.1}, - {"x":5.75, "y":0.1}, - {"x":6.75, "y":0.1}, - {"x":7.75, "y":0.1}, - {"x":11.25, "y":0.1}, - {"x":12.25, "y":0.1}, - {"x":13.25, "y":0.1}, - {"x":14.25, "y":0.1}, - {"x":15.25, "y":0.1}, - {"x":16.25, "y":0.1}, - {"x":17.25, "y":0.1}, - {"x":18.25, "y":0.1}, + {"label": "K00", "matrix": [0, 0], "x": 0.5, "y": 0}, - {"x":0.25, "y":1}, - {"x":1.5, "y":1.1, "w":1.5}, - {"x":3, "y":1.1}, - {"x":4.25, "y":1.1}, - {"x":5.25, "y":1.1}, - {"x":6.25, "y":1.1}, - {"x":7.25, "y":1.1}, - {"x":10.75, "y":1.1}, - {"x":11.75, "y":1.1}, - {"x":12.75, "y":1.1}, - {"x":13.75, "y":1.1}, - {"x":15, "y":1.1}, - {"x":16, "y":1.1}, - {"x":17, "y":1.1}, - {"x":18, "y":1.1, "w":1.5}, + {"label": "K01", "matrix": [0, 1], "x": 1.75, "y": 0.1}, + {"label": "K02", "matrix": [0, 2], "x": 2.75, "y": 0.1}, + {"label": "K03", "matrix": [0, 3], "x": 3.75, "y": 0.1}, + {"label": "K04", "matrix": [0, 4], "x": 4.75, "y": 0.1}, + {"label": "K05", "matrix": [0, 5], "x": 5.75, "y": 0.1}, + {"label": "K06", "matrix": [0, 6], "x": 6.75, "y": 0.1}, + {"label": "K07", "matrix": [0, 7], "x": 7.75, "y": 0.1}, - {"x":0, "y":2}, - {"x":1.25, "y":2.1, "w":1.75}, - {"x":3, "y":2.1}, - {"x":4.5, "y":2.1}, - {"x":5.5, "y":2.1}, - {"x":6.5, "y":2.1}, - {"x":7.5, "y":2.1}, - {"x":11, "y":2.1}, - {"x":12, "y":2.1}, - {"x":13, "y":2.1}, - {"x":14, "y":2.1}, - {"x":15.5, "y":2.1}, - {"x":16.5, "y":2.1}, - {"x":17.5, "y":2.1, "w":2.25}, + {"label": "K08", "matrix": [0, 8], "x": 11.25, "y": 0.1}, + {"label": "K09", "matrix": [0, 9], "x": 12.25, "y": 0.1}, + {"label": "K0A", "matrix": [0, 10], "x": 13.25, "y": 0.1}, + {"label": "K0B", "matrix": [0, 11], "x": 14.25, "y": 0.1}, + {"label": "K0C", "matrix": [0, 12], "x": 15.25, "y": 0.1}, + {"label": "K0D", "matrix": [0, 13], "x": 16.25, "y": 0.1}, + {"label": "K0E", "matrix": [0, 14], "x": 17.25, "y": 0.1}, + {"label": "K0F", "matrix": [0, 15], "x": 18.25, "y": 0.1}, - {"x":1, "y":3.1, "w":2.25}, - {"x":3.25, "y":3.1}, - {"x":5, "y":3.1}, - {"x":6, "y":3.1}, - {"x":7, "y":3.1}, - {"x":8, "y":3.1}, - {"x":10.5, "y":3.1}, - {"x":11.5, "y":3.1}, - {"x":12.5, "y":3.1}, - {"x":13.5, "y":3.1}, - {"x":15.25, "y":3.1}, - {"x":16.25, "y":3.1}, - {"x":17.25, "y":3.1, "w":1.75}, - {"x":19, "y":3.1}, + {"label": "K10", "matrix": [1, 0], "x": 0.25, "y": 1}, - {"x":1, "y":4.1, "w":1.5}, - {"x":4.75, "y":4.1, "w":1.5}, - {"x":6.25, "y":4.1, "w":2}, - {"x":8.25, "y":4.1, "w":1.25}, - {"x":10.5, "y":4.1, "w":2.75}, - {"x":13.25, "y":4.1, "w":1.5}, - {"x":18.25, "y":4.1, "w":1.5} + {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1.1, "w": 1.5}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1.1}, + {"label": "K13", "matrix": [1, 3], "x": 4.25, "y": 1.1}, + {"label": "K14", "matrix": [1, 4], "x": 5.25, "y": 1.1}, + {"label": "K15", "matrix": [1, 5], "x": 6.25, "y": 1.1}, + {"label": "K16", "matrix": [1, 6], "x": 7.25, "y": 1.1}, + + {"label": "K18", "matrix": [1, 8], "x": 10.75, "y": 1.1}, + {"label": "K19", "matrix": [1, 9], "x": 11.75, "y": 1.1}, + {"label": "K1A", "matrix": [1, 10], "x": 12.75, "y": 1.1}, + {"label": "K1B", "matrix": [1, 11], "x": 13.75, "y": 1.1}, + {"label": "K1C", "matrix": [1, 12], "x": 15, "y": 1.1}, + {"label": "K1D", "matrix": [1, 13], "x": 16, "y": 1.1}, + {"label": "K1E", "matrix": [1, 14], "x": 17, "y": 1.1}, + {"label": "K1F", "matrix": [1, 15], "x": 18, "y": 1.1, "w": 1.5}, + + {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "K21", "matrix": [2, 1], "x": 1.25, "y": 2.1, "w": 1.75}, + {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2.1}, + {"label": "K24", "matrix": [2, 4], "x": 4.5, "y": 2.1}, + {"label": "K25", "matrix": [2, 5], "x": 5.5, "y": 2.1}, + {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2.1}, + {"label": "K27", "matrix": [2, 7], "x": 7.5, "y": 2.1}, + + {"label": "K28", "matrix": [2, 8], "x": 11, "y": 2.1}, + {"label": "K29", "matrix": [2, 9], "x": 12, "y": 2.1}, + {"label": "K2A", "matrix": [2, 10], "x": 13, "y": 2.1}, + {"label": "K2B", "matrix": [2, 11], "x": 14, "y": 2.1}, + {"label": "K2C", "matrix": [2, 12], "x": 15.5, "y": 2.1}, + {"label": "K2D", "matrix": [2, 13], "x": 16.5, "y": 2.1}, + {"label": "K2F", "matrix": [2, 15], "x": 17.5, "y": 2.1, "w": 2.25}, + + {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3.1, "w": 2.25}, + {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3.1}, + {"label": "K34", "matrix": [3, 4], "x": 5, "y": 3.1}, + {"label": "K35", "matrix": [3, 5], "x": 6, "y": 3.1}, + {"label": "K36", "matrix": [3, 6], "x": 7, "y": 3.1}, + {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.1}, + + {"label": "K38", "matrix": [3, 8], "x": 10.5, "y": 3.1}, + {"label": "K39", "matrix": [3, 9], "x": 11.5, "y": 3.1}, + {"label": "K3A", "matrix": [3, 10], "x": 12.5, "y": 3.1}, + {"label": "K3B", "matrix": [3, 11], "x": 13.5, "y": 3.1}, + {"label": "K3C", "matrix": [3, 12], "x": 15.25, "y": 3.1}, + {"label": "K3D", "matrix": [3, 13], "x": 16.25, "y": 3.1}, + {"label": "K3E", "matrix": [3, 14], "x": 17.25, "y": 3.1, "w": 1.75}, + {"label": "K3F", "matrix": [3, 15], "x": 19, "y": 3.1}, + + {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4.1, "w": 1.5}, + {"label": "K44", "matrix": [4, 4], "x": 4.75, "y": 4.1, "w": 1.5}, + {"label": "K45", "matrix": [4, 5], "x": 6.25, "y": 4.1, "w": 2}, + {"label": "K46", "matrix": [4, 6], "x": 8.25, "y": 4.1, "w": 1.25}, + + {"label": "K48", "matrix": [4, 8], "x": 10.5, "y": 4.1, "w": 2.75}, + {"label": "K4B", "matrix": [4, 11], "x": 13.25, "y": 4.1, "w": 1.5}, + {"label": "K4E", "matrix": [4, 14], "x": 18.25, "y": 4.1, "w": 1.5} ] } } diff --git a/keyboards/nightly_boards/conde60/conde60.h b/keyboards/nightly_boards/conde60/conde60.h deleted file mode 100644 index e660946a77..0000000000 --- a/keyboards/nightly_boards/conde60/conde60.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2022 DeskDaily - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K44, K46, K47, K49, K4B, K4C, K4D \ -) { \ - { 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, KC_NO, K44, KC_NO, K46, K47, KC_NO, K49, KC_NO, K4B, K4C, K4D }, \ -} diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 3fda17eb2c..9688c39ff0 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -21,76 +21,77 @@ "layouts": { "LAYOUT": { "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, "w":1.5}, - {"x":1.5, "y":1}, - {"x":2.5, "y":1}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1}, - {"x":5.5, "y":1}, - {"x":6.5, "y":1}, - {"x":7.5, "y":1}, - {"x":8.5, "y":1}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1, "w":1.5}, - - {"x":0, "y":2, "w":1.75}, - {"x":1.75, "y":2}, - {"x":2.75, "y":2}, - {"x":3.75, "y":2}, - {"x":4.75, "y":2}, - {"x":5.75, "y":2}, - {"x":6.75, "y":2}, - {"x":7.75, "y":2}, - {"x":8.75, "y":2}, - {"x":9.75, "y":2}, - {"x":10.75, "y":2}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2, "w":2.25}, - - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3}, - {"x":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3, "w":1.75}, - {"x":14, "y":3}, - - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":2.25}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4}, - {"x":8.25, "y":4, "w":2.75}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5}] + {"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": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] } } }
\ No newline at end of file diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json index 9c2ea85453..d155c918b5 100644 --- a/keyboards/nightly_boards/jisoo/info.json +++ b/keyboards/nightly_boards/jisoo/info.json @@ -17,93 +17,104 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0}, - {"x":15, "y":0}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.25}, - {"x":15, "y":1.25}, - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - {"x":15, "y":2.25}, - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - {"x":15, "y":3.25}, - {"x":0, "y":4.25, "w":1.25}, - {"x":1.25, "y":4.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":1.75}, - {"x":14, "y":4.25}, - {"x":15, "y":4.25}, - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":2}, - {"x":5.75, "y":5.25}, - {"x":6.75, "y":5.25}, - {"x":7.75, "y":5.25, "w":2.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":13, "y":5.25}, - {"x":14, "y":5.25}, - {"x":15, "y":5.25} - ] + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.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.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [1, 15], "x": 15, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3.25}, + {"matrix": [3, 7], "x": 6.75, "y": 3.25}, + {"matrix": [3, 8], "x": 7.75, "y": 3.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3.25}, + {"matrix": [3, 12], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 15, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2}, + {"matrix": [5, 6], "x": 5.75, "y": 5.25}, + {"matrix": [5, 7], "x": 6.75, "y": 5.25}, + {"matrix": [5, 9], "x": 7.75, "y": 5.25, "w": 2.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 11.25, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 13], "x": 13, "y": 5.25}, + {"matrix": [5, 14], "x": 14, "y": 5.25}, + {"matrix": [5, 15], "x": 15, "y": 5.25} + ] } } + }
\ No newline at end of file diff --git a/keyboards/nightly_boards/jisoo/jisoo.h b/keyboards/nightly_boards/jisoo/jisoo.h deleted file mode 100644 index 6d822bb42f..0000000000 --- a/keyboards/nightly_boards/jisoo/jisoo.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2022 DeskDaily - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, K4F, \ - K50, K51, K52, K54, K56, K57, K59, K5A, K5C, K5D, K5E, K5F \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, 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, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ - { K50, K51, K52, KC_NO, K54, KC_NO, K56, K57, KC_NO, K59, K5A, KC_NO, K5C, K5D, K5E, K5F }, \ -} diff --git a/keyboards/nightly_boards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/info.json index 640760fd10..43cd5ad1a0 100644 --- a/keyboards/nightly_boards/ph_arisu/info.json +++ b/keyboards/nightly_boards/ph_arisu/info.json @@ -17,7 +17,89 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":8.5, "y":0}, {"label":"0,4", "x":9.5, "y":0}, {"label":"1,4", "x":10.5, "y":0}, {"label":"0,5", "x":11.5, "y":0}, {"label":"1,5", "x":12.5, "y":0}, {"label":"0,6", "x":13.5, "y":0}, {"label":"1,6", "x":14.5, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"2,7", "x":16.8, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":8, "y":1}, {"label":"3,3", "x":9, "y":1}, {"label":"2,4", "x":10, "y":1}, {"label":"3,4", "x":11, "y":1}, {"label":"2,5", "x":12, "y":1}, {"label":"3,5", "x":13, "y":1}, {"label":"2,6", "x":14, "y":1}, {"label":"3,6", "x":15, "y":1, "w":1.5}, {"label":"4,7", "x":16.8, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":8.25, "y":2}, {"label":"5,3", "x":9.25, "y":2}, {"label":"4,4", "x":10.25, "y":2}, {"label":"5,4", "x":11.25, "y":2}, {"label":"4,5", "x":12.25, "y":2}, {"label":"5,5", "x":13.25, "y":2}, {"label":"4,6", "x":14.25, "y":2, "w":2.25}, {"label":"6,7", "x":16.8, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"7,0", "x":2.25, "y":3}, {"label":"6,1", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":8.75, "y":3}, {"label":"7,3", "x":9.75, "y":3}, {"label":"6,4", "x":10.75, "y":3}, {"label":"7,4", "x":11.75, "y":3}, {"label":"6,5", "x":12.75, "y":3}, {"label":"7,5", "x":13.75, "y":3, "w":1.75}, {"label":"7,6", "x":15.75, "y":3.25}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":2.75, "y":4, "w":1.5}, {"label":"8,2", "x":4.25, "y":4, "w":2}, {"label":"9,2", "x":6.25, "y":4, "w":1.25}, {"label":"9,3", "x":8.25, "y":4, "w":2.75}, {"label":"9,4", "x":11, "y":4, "w":1.5}, {"label":"8,6", "x":14.75, "y":4.25}, {"label":"9,6", "x":15.75, "y":4.25}, {"label":"8,7", "x":16.75, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + + {"matrix": [1, 3], "x": 8.5, "y": 0}, + {"matrix": [0, 4], "x": 9.5, "y": 0}, + {"matrix": [1, 4], "x": 10.5, "y": 0}, + {"matrix": [0, 5], "x": 11.5, "y": 0}, + {"matrix": [1, 5], "x": 12.5, "y": 0}, + {"matrix": [0, 6], "x": 13.5, "y": 0}, + {"matrix": [1, 6], "x": 14.5, "y": 0}, + {"matrix": [0, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 7], "x": 16.8, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + + {"matrix": [2, 3], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [2, 4], "x": 10, "y": 1}, + {"matrix": [3, 4], "x": 11, "y": 1}, + {"matrix": [2, 5], "x": 12, "y": 1}, + {"matrix": [3, 5], "x": 13, "y": 1}, + {"matrix": [2, 6], "x": 14, "y": 1}, + {"matrix": [3, 6], "x": 15, "y": 1, "w": 1.5}, + + {"matrix": [4, 7], "x": 16.8, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + + {"matrix": [4, 3], "x": 8.25, "y": 2}, + {"matrix": [5, 3], "x": 9.25, "y": 2}, + {"matrix": [4, 4], "x": 10.25, "y": 2}, + {"matrix": [5, 4], "x": 11.25, "y": 2}, + {"matrix": [4, 5], "x": 12.25, "y": 2}, + {"matrix": [5, 5], "x": 13.25, "y": 2}, + {"matrix": [4, 6], "x": 14.25, "y": 2, "w": 2.25}, + + {"matrix": [6, 7], "x": 16.8, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + + {"matrix": [6, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 3], "x": 9.75, "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, "w": 1.75}, + + {"matrix": [7, 6], "x": 15.75, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 1], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 6.25, "y": 4, "w": 1.25}, + + {"matrix": [9, 3], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [8, 6], "x": 14.75, "y": 4.25}, + {"matrix": [9, 6], "x": 15.75, "y": 4.25}, + {"matrix": [8, 7], "x": 16.75, "y": 4.25} + ] } } } diff --git a/keyboards/nightly_boards/ph_arisu/ph_arisu.h b/keyboards/nightly_boards/ph_arisu/ph_arisu.h deleted file mode 100644 index 85e5a93810..0000000000 --- a/keyboards/nightly_boards/ph_arisu/ph_arisu.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K027, \ - K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K047, \ - K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K067, \ - K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, \ - K080, K081, K082, K092, K093, K094, K086, K096, K087 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007 }, \ - { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \ - { K020, K021, K022, K023, K024, K025, K026, K027 }, \ - { K030, K031, K032, K033, K034, K035, K036, KC_NO }, \ - { K040, K041, K042, K043, K044, K045, K046, K047 }, \ - { K050, K051, K052, K053, K054, K055, KC_NO, KC_NO }, \ - { K060, K061, K062, K063, K064, K065, KC_NO, K067 }, \ - { K070, K071, K072, K073, K074, K075, K076, KC_NO }, \ - { K080, K081, K082, KC_NO, KC_NO, KC_NO, K086, K087 }, \ - { KC_NO, KC_NO, K092, K093, K094, KC_NO, K096, KC_NO } \ -} |