summaryrefslogtreecommitdiff
path: root/keyboards/unikeyboard
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/unikeyboard')
-rw-r--r--keyboards/unikeyboard/divergetm2/divergetm2.h62
-rw-r--r--keyboards/unikeyboard/divergetm2/info.json102
2 files changed, 56 insertions, 108 deletions
diff --git a/keyboards/unikeyboard/divergetm2/divergetm2.h b/keyboards/unikeyboard/divergetm2/divergetm2.h
deleted file mode 100644
index c3d9ab650f..0000000000
--- a/keyboards/unikeyboard/divergetm2/divergetm2.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright 2018 Christon DeWan (xton)
- * Copyright 2017 IslandMan93
- *
- * 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"
-
-#ifndef FLIP_HALF
-// Standard Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, KC_NO }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, KC_NO } \
- }
-#else
-// Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, R31, R32, R33, R34, R35 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, KC_NO }, \
- { R00, R01, R02, R03, R04, R05 }, \
- { R10, R11, R12, R13, R14, R15 }, \
- { R20, R21, R22, R23, R24, R25 }, \
- { KC_NO, R31, R32, R33, R34, R35 } \
- }
-#endif
-
-#define LAYOUT_ortho_4x12_2x2u LAYOUT
diff --git a/keyboards/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
index d97d10d118..9533371de1 100644
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ b/keyboards/unikeyboard/divergetm2/info.json
@@ -18,55 +18,65 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "layout_aliases": {
+ "LAYOUT_ortho_4x12_2x2u": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"L00", "x":0, "y":0},
- {"label":"L01", "x":1, "y":0},
- {"label":"L02", "x":2, "y":0},
- {"label":"L03", "x":3, "y":0},
- {"label":"L04", "x":4, "y":0},
- {"label":"L05", "x":5, "y":0},
- {"label":"R00", "x":7, "y":0},
- {"label":"R01", "x":8, "y":0},
- {"label":"R02", "x":9, "y":0},
- {"label":"R03", "x":10, "y":0},
- {"label":"R04", "x":11, "y":0},
- {"label":"R05", "x":12, "y":0},
- {"label":"L10", "x":0, "y":1},
- {"label":"L11", "x":1, "y":1},
- {"label":"L12", "x":2, "y":1},
- {"label":"L13", "x":3, "y":1},
- {"label":"L14", "x":4, "y":1},
- {"label":"L15", "x":5, "y":1},
- {"label":"R10", "x":7, "y":1},
- {"label":"R11", "x":8, "y":1},
- {"label":"R12", "x":9, "y":1},
- {"label":"R13", "x":10, "y":1},
- {"label":"R14", "x":11, "y":1},
- {"label":"R15", "x":12, "y":1},
- {"label":"L20", "x":0, "y":2},
- {"label":"L21", "x":1, "y":2},
- {"label":"L22", "x":2, "y":2},
- {"label":"L23", "x":3, "y":2},
- {"label":"L24", "x":4, "y":2},
- {"label":"L25", "x":5, "y":2},
- {"label":"R20", "x":7, "y":2},
- {"label":"R21", "x":8, "y":2},
- {"label":"R22", "x":9, "y":2},
- {"label":"R23", "x":10, "y":2},
- {"label":"R24", "x":11, "y":2},
- {"label":"R25", "x":12, "y":2},
- {"label":"L30", "x":0, "y":3},
- {"label":"L31", "x":1, "y":3},
- {"label":"L32", "x":2, "y":3},
- {"label":"L33", "x":3, "y":3},
- {"label":"L34", "x":4, "y":3, "w":2},
- {"label":"R31", "x":7, "y":3, "w":2},
- {"label":"R32", "x":9, "y":3},
- {"label":"R33", "x":10, "y":3},
- {"label":"R34", "x":11, "y":3},
- {"label":"R35", "x":12, "y":3}
+ {"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": [4, 5], "x": 7, "y": 0},
+ {"matrix": [4, 4], "x": 8, "y": 0},
+ {"matrix": [4, 3], "x": 9, "y": 0},
+ {"matrix": [4, 2], "x": 10, "y": 0},
+ {"matrix": [4, 1], "x": 11, "y": 0},
+ {"matrix": [4, 0], "x": 12, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [5, 5], "x": 7, "y": 1},
+ {"matrix": [5, 4], "x": 8, "y": 1},
+ {"matrix": [5, 3], "x": 9, "y": 1},
+ {"matrix": [5, 2], "x": 10, "y": 1},
+ {"matrix": [5, 1], "x": 11, "y": 1},
+ {"matrix": [5, 0], "x": 12, "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": [6, 5], "x": 7, "y": 2},
+ {"matrix": [6, 4], "x": 8, "y": 2},
+ {"matrix": [6, 3], "x": 9, "y": 2},
+ {"matrix": [6, 2], "x": 10, "y": 2},
+ {"matrix": [6, 1], "x": 11, "y": 2},
+ {"matrix": [6, 0], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+ {"matrix": [7, 4], "x": 7, "y": 3, "w": 2},
+ {"matrix": [7, 3], "x": 9, "y": 3},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 12, "y": 3}
]
}
}