From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 12 Apr 2023 13:42:51 +1000
Subject: Move single `LAYOUT`s to data driven (#20365)
---
keyboards/misonoworks/karina/info.json | 79 +++++++++++++++++-----------------
keyboards/misonoworks/karina/karina.h | 33 --------------
2 files changed, 40 insertions(+), 72 deletions(-)
delete mode 100644 keyboards/misonoworks/karina/karina.h
(limited to 'keyboards/misonoworks/karina')
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 803f31a18e..5ebaf68692 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -27,49 +27,50 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Encoder 1", "x":0, "y":0},
- {"label":"Encoder 2", "x":10, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
- {"label":"Q", "x":0.5, "y":1},
- {"label":"W", "x":1.5, "y":1},
- {"label":"E", "x":2.5, "y":1},
- {"label":"R", "x":3.5, "y":1},
- {"label":"T", "x":4.5, "y":1},
- {"label":"Y", "x":5.5, "y":1},
- {"label":"U", "x":6.5, "y":1},
- {"label":"I", "x":7.5, "y":1},
- {"label":"O", "x":8.5, "y":1},
- {"label":"P", "x":9.5, "y":1},
+ {"matrix": [2, 10], "x": 10, "y": 0},
- {"label":"Tab", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":"Enter", "x":10, "y":2},
+ {"matrix": [0, 1], "x": 0.5, "y": 1},
+ {"matrix": [0, 2], "x": 1.5, "y": 1},
+ {"matrix": [0, 3], "x": 2.5, "y": 1},
+ {"matrix": [0, 4], "x": 3.5, "y": 1},
+ {"matrix": [0, 5], "x": 4.5, "y": 1},
+ {"matrix": [0, 6], "x": 5.5, "y": 1},
+ {"matrix": [0, 7], "x": 6.5, "y": 1},
+ {"matrix": [0, 8], "x": 7.5, "y": 1},
+ {"matrix": [0, 9], "x": 8.5, "y": 1},
+ {"matrix": [0, 10], "x": 9.5, "y": 1},
- {"label":"Shift", "x":0, "y":3, "w":1.5},
- {"label":"Z", "x":1.5, "y":3},
- {"label":"X", "x":2.5, "y":3},
- {"label":"C", "x":3.5, "y":3},
- {"label":"V", "x":4.5, "y":3},
- {"label":"B", "x":5.5, "y":3},
- {"label":"N", "x":6.5, "y":3},
- {"label":"M", "x":7.5, "y":3},
- {"label":"<", "x":8.5, "y":3},
- {"label":">", "x":9.5, "y":3, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
- {"label":"Alt", "x":0, "y":4, "w":1.75},
- {"label":"MO(1)", "x":1.75, "y":4, "w":1.25},
- {"label":"Space", "x":3, "y":4, "w":2.75},
- {"label":"Backspace", "x":5.75, "y":4, "w":2.25},
- {"label":"MO(2)", "x":8, "y":4, "w":1.25},
- {"label":"Control", "x":9.25, "y":4, "w":1.75}
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [2, 5], "x": 5.5, "y": 3},
+ {"matrix": [2, 6], "x": 6.5, "y": 3},
+ {"matrix": [2, 7], "x": 7.5, "y": 3},
+ {"matrix": [2, 8], "x": 8.5, "y": 3},
+ {"matrix": [2, 9], "x": 9.5, "y": 3, "w": 1.5},
+
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [3, 3], "x": 3, "y": 4, "w": 2.75},
+ {"matrix": [3, 6], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [3, 8], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.25, "y": 4, "w": 1.75}
]
}
}
diff --git a/keyboards/misonoworks/karina/karina.h b/keyboards/misonoworks/karina/karina.h
deleted file mode 100644
index 2baeb5db5c..0000000000
--- a/keyboards/misonoworks/karina/karina.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 MisonoWorks
-
-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( \
- K000, K210, \
- K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, \
- K300, K301, K303, K306, K308, K309 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
- { K300, K301, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \
-}
--
cgit v1.2.3
[cgit] Unable to lock slot /tmp/cgit/e0100000.lock: Permission denied (13)