summaryrefslogtreecommitdiff
path: root/keyboards/reviung
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/reviung')
-rwxr-xr-xkeyboards/reviung/reviung34/info.json148
-rwxr-xr-xkeyboards/reviung/reviung34/reviung34.h52
2 files changed, 81 insertions, 119 deletions
diff --git a/keyboards/reviung/reviung34/info.json b/keyboards/reviung/reviung34/info.json
index 973a2e517b..e273b714ff 100755
--- a/keyboards/reviung/reviung34/info.json
+++ b/keyboards/reviung/reviung34/info.json
@@ -24,77 +24,91 @@
"layouts": {
"LAYOUT_reviung34": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":6, "y":0},
- {"label":"K06", "x":7, "y":0},
- {"label":"K07", "x":8, "y":0},
- {"label":"K08", "x":9, "y":0},
- {"label":"K35", "x":10, "y":0},
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1},
- {"label":"K15", "x":6, "y":1},
- {"label":"K16", "x":7, "y":1},
- {"label":"K17", "x":8, "y":1},
- {"label":"K18", "x":9, "y":1},
- {"label":"K36", "x":10, "y":1},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K24", "x":4, "y":2},
- {"label":"K25", "x":6, "y":2},
- {"label":"K26", "x":7, "y":2},
- {"label":"K27", "x":8, "y":2},
- {"label":"K28", "x":9, "y":2},
- {"label":"K37", "x":10, "y":2},
- {"label":"K32", "x":2, "y":3},
- {"label":"K33", "x":3, "y":3},
- {"label":"K34", "x":4, "y":3},
- {"label":"K38", "x":6, "y":3, "w":2}
+ {"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": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [3, 5], "x": 10, "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": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [3, 6], "x": 10, "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": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [3, 7], "x": 10, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+
+ {"matrix": [3, 8], "x": 6, "y": 3, "w": 2}
]
},
"LAYOUT_reviung34_2u": {
"layout": [
- {"label":"K00", "x":0, "y":0},
- {"label":"K01", "x":1, "y":0},
- {"label":"K02", "x":2, "y":0},
- {"label":"K03", "x":3, "y":0},
- {"label":"K04", "x":4, "y":0},
- {"label":"K05", "x":6, "y":0},
- {"label":"K06", "x":7, "y":0},
- {"label":"K07", "x":8, "y":0},
- {"label":"K08", "x":9, "y":0},
- {"label":"K35", "x":10, "y":0},
- {"label":"K10", "x":0, "y":1},
- {"label":"K11", "x":1, "y":1},
- {"label":"K12", "x":2, "y":1},
- {"label":"K13", "x":3, "y":1},
- {"label":"K14", "x":4, "y":1},
- {"label":"K15", "x":6, "y":1},
- {"label":"K16", "x":7, "y":1},
- {"label":"K17", "x":8, "y":1},
- {"label":"K18", "x":9, "y":1},
- {"label":"K36", "x":10, "y":1},
- {"label":"K20", "x":0, "y":2},
- {"label":"K21", "x":1, "y":2},
- {"label":"K22", "x":2, "y":2},
- {"label":"K23", "x":3, "y":2},
- {"label":"K24", "x":4, "y":2},
- {"label":"K25", "x":6, "y":2},
- {"label":"K26", "x":7, "y":2},
- {"label":"K27", "x":8, "y":2},
- {"label":"K28", "x":9, "y":2},
- {"label":"K37", "x":10, "y":2},
- {"label":"K32", "x":2, "y":3},
- {"label":"K34", "x":3, "y":3, "w":2},
- {"label":"K38", "x":6, "y":3, "w":2}
+ {"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": 6, "y": 0},
+ {"matrix": [0, 6], "x": 7, "y": 0},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0},
+ {"matrix": [3, 5], "x": 10, "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": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [3, 6], "x": 10, "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": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [3, 7], "x": 10, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 4], "x": 3, "y": 3, "w": 2},
+
+ {"matrix": [3, 8], "x": 6, "y": 3, "w": 2}
]
}
}
diff --git a/keyboards/reviung/reviung34/reviung34.h b/keyboards/reviung/reviung34/reviung34.h
deleted file mode 100755
index 1ab783ec36..0000000000
--- a/keyboards/reviung/reviung34/reviung34.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright 2019 gtips
- *
- * 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 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_reviung34( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K35, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K36, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K37, \
- K32, K33, K34, K38 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, K38 } \
-}
-
-#define LAYOUT_reviung34_2u( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K35, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K36, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K37, \
- K32, K34, K38 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
- { KC_NO, KC_NO, K32, KC_NO, K34, K35, K36, K37, K38 } \
-}