summaryrefslogtreecommitdiff
path: root/keyboards/cipulot
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-08 20:50:50 +1000
committerGitHub <noreply@github.com>2023-04-08 20:50:50 +1000
commit441988ef3895171d640e807205e7978ff9755acd (patch)
tree782bedef13507dc8e1a448ff753272586d33af78 /keyboards/cipulot
parentfd6449e42cf326bdf17eab118639faa6b0359eb7 (diff)
Move `default` layouts to data driven (#20349)
Diffstat (limited to 'keyboards/cipulot')
-rw-r--r--keyboards/cipulot/kallos/info.json505
-rw-r--r--keyboards/cipulot/kallos/kallos.h35
2 files changed, 94 insertions, 446 deletions
diff --git a/keyboards/cipulot/kallos/info.json b/keyboards/cipulot/kallos/info.json
index 40eb07f80e..f9fd74acfe 100644
--- a/keyboards/cipulot/kallos/info.json
+++ b/keyboards/cipulot/kallos/info.json
@@ -21,417 +21,100 @@
"layouts": {
"LAYOUT_default": {
"layout": [
- {
- "label": "0,0",
- "x": 0,
- "y": 0
- },
- {
- "label": "0,1",
- "x": 1.25,
- "y": 0
- },
- {
- "label": "0,2",
- "x": 2.25,
- "y": 0
- },
- {
- "label": "0,3",
- "x": 3.25,
- "y": 0
- },
- {
- "label": "0,4",
- "x": 4.25,
- "y": 0
- },
- {
- "label": "0,5",
- "x": 5.5,
- "y": 0
- },
- {
- "label": "0,6",
- "x": 6.5,
- "y": 0
- },
- {
- "label": "0,7",
- "x": 7.5,
- "y": 0
- },
- {
- "label": "0,8",
- "x": 8.5,
- "y": 0
- },
- {
- "label": "0,9",
- "x": 9.75,
- "y": 0
- },
- {
- "label": "0,10",
- "x": 10.75,
- "y": 0
- },
- {
- "label": "0,11",
- "x": 11.75,
- "y": 0
- },
- {
- "label": "0,12",
- "x": 12.75,
- "y": 0
- },
- {
- "label": "0,13",
- "x": 14,
- "y": 0
- },
- {
- "label": "0,14",
- "x": 15.25,
- "y": 0
- },
- {
- "label": "1,0",
- "x": 0,
- "y": 1.25
- },
- {
- "label": "1,1",
- "x": 1,
- "y": 1.25
- },
- {
- "label": "1,2",
- "x": 2,
- "y": 1.25
- },
- {
- "label": "1,3",
- "x": 3,
- "y": 1.25
- },
- {
- "label": "1,4",
- "x": 4,
- "y": 1.25
- },
- {
- "label": "1,5",
- "x": 5,
- "y": 1.25
- },
- {
- "label": "1,6",
- "x": 6,
- "y": 1.25
- },
- {
- "label": "1,7",
- "x": 7,
- "y": 1.25
- },
- {
- "label": "1,8",
- "x": 8,
- "y": 1.25
- },
- {
- "label": "1,9",
- "x": 9,
- "y": 1.25
- },
- {
- "label": "1,10",
- "x": 10,
- "y": 1.25
- },
- {
- "label": "1,11",
- "x": 11,
- "y": 1.25
- },
- {
- "label": "1,12",
- "x": 12,
- "y": 1.25
- },
- {
- "label": "1,13",
- "x": 13,
- "y": 1.25
- },
- {
- "label": "1,14",
- "x": 14,
- "y": 1.25
- },
- {
- "label": "2,14",
- "x": 15.25,
- "y": 1.25
- },
- {
- "label": "2,0",
- "x": 0,
- "y": 2.25,
- "w": 1.5
- },
- {
- "label": "2,1",
- "x": 1.5,
- "y": 2.25
- },
- {
- "label": "2,2",
- "x": 2.5,
- "y": 2.25
- },
- {
- "label": "2,3",
- "x": 3.5,
- "y": 2.25
- },
- {
- "label": "2,4",
- "x": 4.5,
- "y": 2.25
- },
- {
- "label": "2,5",
- "x": 5.5,
- "y": 2.25
- },
- {
- "label": "2,6",
- "x": 6.5,
- "y": 2.25
- },
- {
- "label": "2,7",
- "x": 7.5,
- "y": 2.25
- },
- {
- "label": "2,8",
- "x": 8.5,
- "y": 2.25
- },
- {
- "label": "2,9",
- "x": 9.5,
- "y": 2.25
- },
- {
- "label": "2,10",
- "x": 10.5,
- "y": 2.25
- },
- {
- "label": "2,11",
- "x": 11.5,
- "y": 2.25
- },
- {
- "label": "2,12",
- "x": 12.5,
- "y": 2.25
- },
- {
- "label": "2,13",
- "x": 13.5,
- "y": 2.25,
- "w": 1.5
- },
- {
- "label": "3,14",
- "x": 15.25,
- "y": 2.25
- },
- {
- "label": "3,0",
- "x": 0,
- "y": 3.25,
- "w": 1.75
- },
- {
- "label": "3,1",
- "x": 1.75,
- "y": 3.25
- },
- {
- "label": "3,2",
- "x": 2.75,
- "y": 3.25
- },
- {
- "label": "3,3",
- "x": 3.75,
- "y": 3.25
- },
- {
- "label": "3,4",
- "x": 4.75,
- "y": 3.25
- },
- {
- "label": "3,5",
- "x": 5.75,
- "y": 3.25
- },
- {
- "label": "3,6",
- "x": 6.75,
- "y": 3.25
- },
- {
- "label": "3,7",
- "x": 7.75,
- "y": 3.25
- },
- {
- "label": "3,8",
- "x": 8.75,
- "y": 3.25
- },
- {
- "label": "3,9",
- "x": 9.75,
- "y": 3.25
- },
- {
- "label": "3,10",
- "x": 10.75,
- "y": 3.25
- },
- {
- "label": "3,11",
- "x": 11.75,
- "y": 3.25
- },
- {
- "label": "3,13",
- "x": 12.75,
- "y": 3.25,
- "w": 2.25
- },
- {
- "label": "4,0",
- "x": 0,
- "y": 4.25,
- "w": 2.25
- },
- {
- "label": "4,1",
- "x": 2.25,
- "y": 4.25
- },
- {
- "label": "4,2",
- "x": 3.25,
- "y": 4.25
- },
- {
- "label": "4,3",
- "x": 4.25,
- "y": 4.25
- },
- {
- "label": "4,4",
- "x": 5.25,
- "y": 4.25
- },
- {
- "label": "4,5",
- "x": 6.25,
- "y": 4.25
- },
- {
- "label": "4,6",
- "x": 7.25,
- "y": 4.25
- },
- {
- "label": "4,7",
- "x": 8.25,
- "y": 4.25
- },
- {
- "label": "4,8",
- "x": 9.25,
- "y": 4.25
- },
- {
- "label": "4,9",
- "x": 10.25,
- "y": 4.25
- },
- {
- "label": "4,10",
- "x": 11.25,
- "y": 4.25
- },
- {
- "label": "4,12",
- "x": 12.25,
- "y": 4.25,
- "w": 1.75
- },
- {
- "label": "4,13",
- "x": 14.25,
- "y": 4.5
- },
- {
- "label": "5,0",
- "x": 0,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,1",
- "x": 2.13,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,6",
- "x": 3.38,
- "y": 5.25,
- "w": 6.25
- },
- {
- "label": "5,9",
- "x": 9.63,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,10",
- "x": 11.75,
- "y": 5.25,
- "w": 1.25
- },
- {
- "label": "5,12",
- "x": 13.25,
- "y": 5.5
- },
- {
- "label": "5,13",
- "x": 14.25,
- "y": 5.5
- },
- {
- "label": "5,14",
- "x": 15.25,
- "y": 5.5
- }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 13], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25},
+ {"matrix": [1, 14], "x": 14, "y": 1.25},
+
+ {"matrix": [2, 14], "x": 15.25, "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": [3, 14], "x": 15.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [4, 13], "x": 14.25, "y": 4.5},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 2.13, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.38, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 9], "x": 9.63, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 10], "x": 11.75, "y": 5.25, "w": 1.25},
+
+ {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.5}
]
}
}
diff --git a/keyboards/cipulot/kallos/kallos.h b/keyboards/cipulot/kallos/kallos.h
deleted file mode 100644
index bf71b6becf..0000000000
--- a/keyboards/cipulot/kallos/kallos.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Cipulot
- *
- * 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_default( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k214, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k314, \
- k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, \
- k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k412, k413, \
- k500, k501, k506, k509, k510, k512, k513, k514 \
-) { \
- { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \
- { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114 }, \
- { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214 }, \
- { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, k314 }, \
- { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, KC_NO, k412, k413, KC_NO }, \
- { k500, k501, KC_NO, KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, k509, k510, KC_NO, k512, k513, k514 } \
-}