summaryrefslogtreecommitdiff
path: root/keyboards/sirius
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/sirius')
-rw-r--r--keyboards/sirius/uni660/rev1/info.json182
-rw-r--r--keyboards/sirius/uni660/rev1/rev1.h19
-rw-r--r--keyboards/sirius/uni660/rev2/ansi/ansi.h25
-rw-r--r--keyboards/sirius/uni660/rev2/ansi/info.json182
-rw-r--r--keyboards/sirius/uni660/rev2/iso/info.json184
-rw-r--r--keyboards/sirius/uni660/rev2/iso/iso.h25
-rw-r--r--keyboards/sirius/uni660/rev2/rev2.h6
-rw-r--r--keyboards/sirius/unigo66/info.json293
-rw-r--r--keyboards/sirius/unigo66/unigo66.c1
-rw-r--r--keyboards/sirius/unigo66/unigo66.h106
10 files changed, 430 insertions, 593 deletions
diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/info.json
index fa6aa04071..f5b070f87e 100644
--- a/keyboards/sirius/uni660/rev1/info.json
+++ b/keyboards/sirius/uni660/rev1/info.json
@@ -13,98 +13,96 @@
"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": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
-
- {"x": 9.5, "y": 0},
- {"x": 10.5, "y": 0},
- {"x": 11.5, "y": 0},
- {"x": 12.5, "y": 0},
- {"x": 13.5, "y": 0},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0},
- {"x": 16.5, "y": 0},
-
- {"x": 18, "y": 0},
-
- {"x": 0, "y": 1},
-
- {"x": 1.5, "y": 1, "w": 1.5},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 6, "y": 1},
- {"x": 7, "y": 1},
-
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1, "w": 1.5},
-
- {"x": 18, "y": 1},
-
- {"x": 0, "y": 2},
-
- {"x": 1.5, "y": 2, "w": 1.75},
- {"x": 3.25, "y": 2},
- {"x": 4.25, "y": 2},
- {"x": 5.25, "y": 2},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
-
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2, "w": 2.25},
-
- {"x": 0, "y": 3},
-
- {"x": 1.5, "y": 3, "w": 2.25},
- {"x": 3.75, "y": 3},
- {"x": 4.75, "y": 3},
- {"x": 5.75, "y": 3},
- {"x": 6.75, "y": 3},
- {"x": 7.75, "y": 3},
-
- {"x": 9.75, "y": 3},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3},
- {"x": 12.75, "y": 3},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3, "w": 2.25},
-
- {"x": 17, "y": 3},
-
- {"x": 0, "y": 4},
-
- {"x": 1.5, "y": 4, "w": 1.25},
- {"x": 2.75, "y": 4, "w": 1.25},
- {"x": 4, "y": 4, "w": 1.25},
- {"x": 5.25, "y": 4, "w": 2.25},
- {"x": 7.5, "y": 4},
-
- {"x": 9.5, "y": 4, "w": 2.75},
- {"x": 12.25, "y": 4, "w": 1.25},
- {"x": 13.5, "y": 4, "w": 1.25},
- {"x": 14.75, "y": 4, "w": 1.25},
-
- {"x": 16, "y": 4},
- {"x": 17, "y": 4},
- {"x": 18, "y": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [4, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [3, 15], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+ {"matrix": [1, 13], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+ {"matrix": [2, 12], "x": 13.25, "y": 2},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 16, "y": 4},
+ {"matrix": [4, 14], "x": 17, "y": 4},
+ {"matrix": [4, 15], "x": 18, "y": 4}
]
}
}
diff --git a/keyboards/sirius/uni660/rev1/rev1.h b/keyboards/sirius/uni660/rev1/rev1.h
index aea169c219..06a7176fbd 100644
--- a/keyboards/sirius/uni660/rev1/rev1.h
+++ b/keyboards/sirius/uni660/rev1/rev1.h
@@ -41,22 +41,3 @@
#define set_led_cyan PORTF = PORTF & ~(1<<LED_R) | (1<<LED_B) | (1<<LED_G)
#define set_led_white PORTF |= (1<<LED_B) | (1<<LED_R) | (1<<LED_G)
*/
-
-#define XXX KC_NO
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\
- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F,\
- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k2E,\
- k30, k31, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX, k48, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/sirius/uni660/rev2/ansi/ansi.h b/keyboards/sirius/uni660/rev2/ansi/ansi.h
deleted file mode 100644
index 526b3cc724..0000000000
--- a/keyboards/sirius/uni660/rev2/ansi/ansi.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "rev2.h"
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define XXX KC_NO
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\
- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k2F,\
- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, XXX, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX, k48, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/sirius/uni660/rev2/ansi/info.json b/keyboards/sirius/uni660/rev2/ansi/info.json
index 86b69d26ec..bc09b26080 100644
--- a/keyboards/sirius/uni660/rev2/ansi/info.json
+++ b/keyboards/sirius/uni660/rev2/ansi/info.json
@@ -13,98 +13,96 @@
"layouts": {
"LAYOUT_ansi": {
"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": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
-
- {"x": 9.5, "y": 0},
- {"x": 10.5, "y": 0},
- {"x": 11.5, "y": 0},
- {"x": 12.5, "y": 0},
- {"x": 13.5, "y": 0},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0},
- {"x": 16.5, "y": 0},
-
- {"x": 18, "y": 0},
-
- {"x": 0, "y": 1},
-
- {"x": 1.5, "y": 1, "w": 1.5},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 6, "y": 1},
- {"x": 7, "y": 1},
-
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
- {"x": 16, "y": 1, "w": 1.5},
-
- {"x": 18, "y": 1},
-
- {"x": 0, "y": 2},
-
- {"x": 1.5, "y": 2, "w": 1.75},
- {"x": 3.25, "y": 2},
- {"x": 4.25, "y": 2},
- {"x": 5.25, "y": 2},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
-
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2, "w": 2.25},
-
- {"x": 0, "y": 3},
-
- {"x": 1.5, "y": 3, "w": 2.25},
- {"x": 3.75, "y": 3},
- {"x": 4.75, "y": 3},
- {"x": 5.75, "y": 3},
- {"x": 6.75, "y": 3},
- {"x": 7.75, "y": 3},
-
- {"x": 9.75, "y": 3},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3},
- {"x": 12.75, "y": 3},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3, "w": 2.25},
-
- {"x": 17, "y": 3},
-
- {"x": 0, "y": 4},
-
- {"x": 1.5, "y": 4, "w": 1.25},
- {"x": 2.75, "y": 4, "w": 1.25},
- {"x": 4, "y": 4, "w": 1.25},
- {"x": 5.25, "y": 4, "w": 2.25},
- {"x": 7.5, "y": 4},
-
- {"x": 9.5, "y": 4, "w": 2.75},
- {"x": 12.25, "y": 4, "w": 1.25},
- {"x": 13.5, "y": 4, "w": 1.25},
- {"x": 14.75, "y": 4, "w": 1.25},
-
- {"x": 16, "y": 4},
- {"x": 17, "y": 4},
- {"x": 18, "y": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [4, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [3, 15], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+ {"matrix": [1, 13], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 15], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+ {"matrix": [2, 12], "x": 13.25, "y": 2},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 16, "y": 4},
+ {"matrix": [4, 14], "x": 17, "y": 4},
+ {"matrix": [4, 15], "x": 18, "y": 4}
]
}
}
diff --git a/keyboards/sirius/uni660/rev2/iso/info.json b/keyboards/sirius/uni660/rev2/iso/info.json
index 9e9a8f2af8..af369f48da 100644
--- a/keyboards/sirius/uni660/rev2/iso/info.json
+++ b/keyboards/sirius/uni660/rev2/iso/info.json
@@ -13,99 +13,97 @@
"layouts": {
"LAYOUT_iso": {
"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": 5.5, "y": 0},
- {"x": 6.5, "y": 0},
- {"x": 7.5, "y": 0},
-
- {"x": 9.5, "y": 0},
- {"x": 10.5, "y": 0},
- {"x": 11.5, "y": 0},
- {"x": 12.5, "y": 0},
- {"x": 13.5, "y": 0},
- {"x": 14.5, "y": 0},
- {"x": 15.5, "y": 0},
- {"x": 16.5, "y": 0},
-
- {"x": 18, "y": 0},
-
- {"x": 0, "y": 1},
-
- {"x": 1.5, "y": 1, "w": 1.5},
- {"x": 3, "y": 1},
- {"x": 4, "y": 1},
- {"x": 5, "y": 1},
- {"x": 6, "y": 1},
- {"x": 7, "y": 1},
-
- {"x": 9, "y": 1},
- {"x": 10, "y": 1},
- {"x": 11, "y": 1},
- {"x": 12, "y": 1},
- {"x": 13, "y": 1},
- {"x": 14, "y": 1},
- {"x": 15, "y": 1},
-
- {"x": 18, "y": 1},
-
- {"x": 0, "y": 2},
-
- {"x": 1.5, "y": 2, "w": 1.75},
- {"x": 3.25, "y": 2},
- {"x": 4.25, "y": 2},
- {"x": 5.25, "y": 2},
- {"x": 6.25, "y": 2},
- {"x": 7.25, "y": 2},
-
- {"x": 9.25, "y": 2},
- {"x": 10.25, "y": 2},
- {"x": 11.25, "y": 2},
- {"x": 12.25, "y": 2},
- {"x": 13.25, "y": 2},
- {"x": 14.25, "y": 2},
- {"x": 15.25, "y": 2},
- {"x": 16.25, "y": 1, "w": 1.25, "h": 2},
-
- {"x": 0, "y": 3},
-
- {"x": 1.5, "y": 3, "w": 1.25},
- {"x": 2.75, "y": 3},
- {"x": 3.75, "y": 3},
- {"x": 4.75, "y": 3},
- {"x": 5.75, "y": 3},
- {"x": 6.75, "y": 3},
- {"x": 7.75, "y": 3},
-
- {"x": 9.75, "y": 3},
- {"x": 10.75, "y": 3},
- {"x": 11.75, "y": 3},
- {"x": 12.75, "y": 3},
- {"x": 13.75, "y": 3},
- {"x": 14.75, "y": 3, "w": 2.25},
-
- {"x": 17, "y": 3},
-
- {"x": 0, "y": 4},
-
- {"x": 1.5, "y": 4, "w": 1.25},
- {"x": 2.75, "y": 4, "w": 1.25},
- {"x": 4, "y": 4, "w": 1.25},
- {"x": 5.25, "y": 4, "w": 2.25},
- {"x": 7.5, "y": 4},
-
- {"x": 9.5, "y": 4, "w": 2.75},
- {"x": 12.25, "y": 4, "w": 1.25},
- {"x": 13.5, "y": 4, "w": 1.25},
- {"x": 14.75, "y": 4, "w": 1.25},
-
- {"x": 16, "y": 4},
- {"x": 17, "y": 4},
- {"x": 18, "y": 4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [4, 6], "x": 7.5, "y": 0},
+
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [3, 15], "x": 18, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+ {"matrix": [1, 6], "x": 7, "y": 1},
+
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+ {"matrix": [1, 13], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 15], "x": 18, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 3.25, "y": 2},
+ {"matrix": [2, 3], "x": 4.25, "y": 2},
+ {"matrix": [2, 4], "x": 5.25, "y": 2},
+ {"matrix": [2, 5], "x": 6.25, "y": 2},
+ {"matrix": [2, 6], "x": 7.25, "y": 2},
+
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+ {"matrix": [2, 12], "x": 13.25, "y": 2},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+ {"matrix": [1, 15], "x": 15.25, "y": 2},
+ {"matrix": [2, 14], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 7], "x": 2.75, "y": 3},
+ {"matrix": [3, 2], "x": 3.75, "y": 3},
+ {"matrix": [3, 3], "x": 4.75, "y": 3},
+ {"matrix": [3, 4], "x": 5.75, "y": 3},
+ {"matrix": [3, 5], "x": 6.75, "y": 3},
+ {"matrix": [3, 6], "x": 7.75, "y": 3},
+
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 12], "x": 13.75, "y": 3},
+ {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 17, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 7.5, "y": 4},
+
+ {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 16, "y": 4},
+ {"matrix": [4, 14], "x": 17, "y": 4},
+ {"matrix": [4, 15], "x": 18, "y": 4}
]
}
}
diff --git a/keyboards/sirius/uni660/rev2/iso/iso.h b/keyboards/sirius/uni660/rev2/iso/iso.h
deleted file mode 100644
index d9ed905d5b..0000000000
--- a/keyboards/sirius/uni660/rev2/iso/iso.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "rev2.h"
-
-#include "quantum.h"
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-
-#define XXX KC_NO
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k46, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k3F,\
- k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, k1E, k2F,\
- k20, k21, k22, k23, k24, k25, k26, k28, k29, k2A, k2B, k2C, k2D, k1F, k2E, \
- k30, k31, k37, k32, k33, k34, k35, k36, k38, k39, k3A, k3B, k3C, k3D, k3E, \
- k40, k41, k42, k43, k44, k45, k48, k49, k4A, k4C, k4D, k4E, k4F \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, XXX, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
- { k10, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
- { k20, k21, k22, k23, k24, k25, k26, XXX, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX, k48, k49, k4A, XXX, k4C, k4D, k4E, k4F } \
-}
diff --git a/keyboards/sirius/uni660/rev2/rev2.h b/keyboards/sirius/uni660/rev2/rev2.h
index cdd9c4e61b..06a7176fbd 100644
--- a/keyboards/sirius/uni660/rev2/rev2.h
+++ b/keyboards/sirius/uni660/rev2/rev2.h
@@ -2,12 +2,6 @@
#include "quantum.h"
-#if KEYBOARD_sirius_uni660_rev2_iso
-# include "iso.h"
-#elif KEYBOARD_sirius_uni660_rev2_ansi
-# include "ansi.h"
-#endif
-
#define red_led_off writePinHigh(F5)
#define red_led_on writePinLow(F5)
#define blu_led_off writePinHigh(F4)
diff --git a/keyboards/sirius/unigo66/info.json b/keyboards/sirius/unigo66/info.json
index 9954295859..866fd9abbf 100644
--- a/keyboards/sirius/unigo66/info.json
+++ b/keyboards/sirius/unigo66/info.json
@@ -13,144 +13,169 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"label":"1", "x":1.5, "y":0},
- {"label":"2", "x":2.5, "y":0},
- {"label":"3", "x":3.5, "y":0},
- {"label":"4", "x":4.5, "y":0},
- {"label":"5", "x":5.5, "y":0},
- {"label":"-", "x":6.5, "y":0},
- {"label":"=", "x":9.5, "y":0},
- {"label":"6", "x":10.5, "y":0},
- {"label":"7", "x":11.5, "y":0},
- {"label":"8", "x":12.5, "y":0},
- {"label":"9", "x":13.5, "y":0},
- {"label":"0", "x":14.5, "y":0},
- {"label":"Bspc", "x":15.5, "y":0, "w":1.5},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"PgUp", "x":6.5, "y":1, "h":1.5},
- {"label":"[", "x":9.5, "y":1, "h":1.5},
- {"label":"Y", "x":10.5, "y":1},
- {"label":"U", "x":11.5, "y":1},
- {"label":"I", "x":12.5, "y":1},
- {"label":"O", "x":13.5, "y":1},
- {"label":"P", "x":14.5, "y":1},
- {"label":"\\", "x":15.5, "y":1, "w":1.5},
- {"label":"Caps", "x":0, "y":2, "w":1.5},
- {"label":"A", "x":1.5, "y":2},
- {"label":"S", "x":2.5, "y":2},
- {"label":"D", "x":3.5, "y":2},
- {"label":"F", "x":4.5, "y":2},
- {"label":"G", "x":5.5, "y":2},
- {"label":"H", "x":10.5, "y":2},
- {"label":"J", "x":11.5, "y":2},
- {"label":"K", "x":12.5, "y":2},
- {"label":"L", "x":13.5, "y":2},
- {"label":";", "x":14.5, "y":2},
- {"label":"Enter", "x":15.5, "y":2, "w":1.5},
- {"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":"PgDn", "x":6.5, "y":2.5, "h":1.5},
- {"label":"]", "x":9.5, "y":2.5, "h":1.5},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":",", "x":12.5, "y":3},
- {"label":".", "x":13.5, "y":3},
- {"label":"Up", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3, "w":1.5},
- {"label":"Ctrl", "x":0.5, "y":4},
- {"label":"Super", "x":1.5, "y":4},
- {"label":"Alt", "x":2.5, "y":4},
- {"label":"Left", "x":13.5, "y":4},
- {"label":"Down", "x":14.5, "y":4},
- {"label":"Right", "x":15.5, "y":4},
- {"label":"Space", "x":5.5, "y":5},
- {"label":"Ins", "x":6.5, "y":5},
- {"label":"Home", "x":9.5, "y":5},
- {"label":"Space", "x":10.5, "y":5},
- {"label":"Space", "x":5.5, "y":6},
- {"label":"Del", "x":6.5, "y":6},
- {"label":"End", "x":9.5, "y":6},
- {"label":"Space", "x":10.5, "y":6}
+ {"matrix": [2, 9], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [1, 14], "x": 1.5, "y": 0},
+ {"matrix": [1, 15], "x": 2.5, "y": 0},
+ {"matrix": [2, 0], "x": 3.5, "y": 0},
+ {"matrix": [2, 1], "x": 4.5, "y": 0},
+ {"matrix": [2, 2], "x": 5.5, "y": 0},
+ {"matrix": [2, 13], "x": 6.5, "y": 0},
+
+ {"matrix": [2, 14], "x": 9.5, "y": 0},
+ {"matrix": [2, 3], "x": 10.5, "y": 0},
+ {"matrix": [2, 4], "x": 11.5, "y": 0},
+ {"matrix": [2, 5], "x": 12.5, "y": 0},
+ {"matrix": [2, 6], "x": 13.5, "y": 0},
+ {"matrix": [2, 7], "x": 14.5, "y": 0},
+ {"matrix": [2, 10], "x": 15.5, "y": 0, "w": 1.5},
+
+ {"matrix": [2, 11], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 4], "x": 1.5, "y": 1},
+ {"matrix": [1, 10], "x": 2.5, "y": 1},
+ {"matrix": [0, 8], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 7], "x": 5.5, "y": 1},
+ {"matrix": [4, 11], "x": 6.5, "y": 1, "h": 1.5},
+
+ {"matrix": [2, 15], "x": 9.5, "y": 1, "h": 1.5},
+ {"matrix": [1, 12], "x": 10.5, "y": 1},
+ {"matrix": [1, 8], "x": 11.5, "y": 1},
+ {"matrix": [0, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 2], "x": 13.5, "y": 1},
+ {"matrix": [1, 3], "x": 14.5, "y": 1},
+ {"matrix": [3, 1], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 9], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [0, 4], "x": 1.5, "y": 2},
+ {"matrix": [1, 6], "x": 2.5, "y": 2},
+ {"matrix": [0, 7], "x": 3.5, "y": 2},
+ {"matrix": [0, 9], "x": 4.5, "y": 2},
+ {"matrix": [0, 10], "x": 5.5, "y": 2},
+
+ {"matrix": [0, 11], "x": 10.5, "y": 2},
+ {"matrix": [0, 13], "x": 11.5, "y": 2},
+ {"matrix": [0, 14], "x": 12.5, "y": 2},
+ {"matrix": [0, 15], "x": 13.5, "y": 2},
+ {"matrix": [3, 3], "x": 14.5, "y": 2},
+ {"matrix": [3, 4], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [14, 1], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [1, 13], "x": 1.5, "y": 3},
+ {"matrix": [1, 11], "x": 2.5, "y": 3},
+ {"matrix": [0, 6], "x": 3.5, "y": 3},
+ {"matrix": [1, 9], "x": 4.5, "y": 3},
+ {"matrix": [0, 5], "x": 5.5, "y": 3},
+ {"matrix": [4, 14], "x": 6.5, "y": 2.5, "h": 1.5},
+
+ {"matrix": [3, 0], "x": 9.5, "y": 2.5, "h": 1.5},
+ {"matrix": [1, 1], "x": 10.5, "y": 3},
+ {"matrix": [1, 0], "x": 11.5, "y": 3},
+ {"matrix": [3, 6], "x": 12.5, "y": 3},
+ {"matrix": [3, 7], "x": 13.5, "y": 3},
+ {"matrix": [5, 2], "x": 14.5, "y": 3},
+ {"matrix": [14, 5], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [14, 0], "x": 0.5, "y": 4},
+ {"matrix": [14, 3], "x": 1.5, "y": 4},
+ {"matrix": [14, 2], "x": 2.5, "y": 4},
+ {"matrix": [5, 0], "x": 13.5, "y": 4},
+ {"matrix": [5, 1], "x": 14.5, "y": 4},
+ {"matrix": [4, 15], "x": 15.5, "y": 4},
+
+ {"matrix": [2, 12], "x": 5.5, "y": 5},
+ {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+ {"matrix": [4, 10], "x": 9.5, "y": 5},
+ {"matrix": [2, 8], "x": 10.5, "y": 5},
+
+ {"matrix": [14, 6], "x": 5.5, "y": 6},
+ {"matrix": [4, 12], "x": 6.5, "y": 6},
+
+ {"matrix": [4, 13], "x": 9.5, "y": 6},
+ {"matrix": [14, 4], "x": 10.5, "y": 6}
]
},
"LAYOUT_beta_pcb": {
"layout": [
- {"label":"Esc", "x":0, "y":0, "w":1.5},
- {"label":"1", "x":1.5, "y":0},
- {"label":"2", "x":2.5, "y":0},
- {"label":"3", "x":3.5, "y":0},
- {"label":"4", "x":4.5, "y":0},
- {"label":"5", "x":5.5, "y":0},
- {"label":"-", "x":6.5, "y":0},
- {"label":"=", "x":9.5, "y":0},
- {"label":"6", "x":10.5, "y":0},
- {"label":"7", "x":11.5, "y":0},
- {"label":"8", "x":12.5, "y":0},
- {"label":"9", "x":13.5, "y":0},
- {"label":"0", "x":14.5, "y":0},
- {"label":"Bspc", "x":15.5, "y":0, "w":1.5},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"PgUp", "x":6.5, "y":1, "h":1.5},
- {"label":"[", "x":9.5, "y":1, "h":1.5},
- {"label":"Y", "x":10.5, "y":1},
- {"label":"U", "x":11.5, "y":1},
- {"label":"I", "x":12.5, "y":1},
- {"label":"O", "x":13.5, "y":1},
- {"label":"P", "x":14.5, "y":1},
- {"label":"\\", "x":15.5, "y":1, "w":1.5},
- {"label":"Caps", "x":0, "y":2, "w":1.5},
- {"label":"A", "x":1.5, "y":2},
- {"label":"S", "x":2.5, "y":2},
- {"label":"D", "x":3.5, "y":2},
- {"label":"F", "x":4.5, "y":2},
- {"label":"G", "x":5.5, "y":2},
- {"label":"H", "x":10.5, "y":2},
- {"label":"J", "x":11.5, "y":2},
- {"label":"K", "x":12.5, "y":2},
- {"label":"L", "x":13.5, "y":2},
- {"label":";", "x":14.5, "y":2},
- {"label":"Enter", "x":15.5, "y":2, "w":1.5},
- {"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":"PgDn", "x":6.5, "y":2.5, "h":1.5},
- {"label":"]", "x":9.5, "y":2.5, "h":1.5},
- {"label":"N", "x":10.5, "y":3},
- {"label":"M", "x":11.5, "y":3},
- {"label":",", "x":12.5, "y":3},
- {"label":".", "x":13.5, "y":3},
- {"label":"Up", "x":14.5, "y":3},
- {"label":"Shift", "x":15.5, "y":3, "w":1.5},
- {"label":"Ctrl", "x":0.5, "y":4},
- {"label":"Super", "x":1.5, "y":4},
- {"label":"Alt", "x":2.5, "y":4},
- {"label":"Left", "x":13.5, "y":4},
- {"label":"Down", "x":14.5, "y":4},
- {"label":"Right", "x":15.5, "y":4},
- {"label":"Space", "x":5.5, "y":5, "h":2},
- {"label":"Ins", "x":6.5, "y":5},
- {"label":"Home", "x":9.5, "y":5},
- {"label":"Space", "x":10.5, "y":5, "h":2},
- {"label":"Del", "x":6.5, "y":6},
- {"label":"End", "x":9.5, "y":6}
+ {"matrix": [1, 13], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [1, 14], "x": 1.5, "y": 0},
+ {"matrix": [3, 0], "x": 2.5, "y": 0},
+ {"matrix": [2, 15], "x": 3.5, "y": 0},
+ {"matrix": [4, 5], "x": 4.5, "y": 0},
+ {"matrix": [3, 11], "x": 5.5, "y": 0},
+ {"matrix": [14, 6], "x": 6.5, "y": 0},
+
+ {"matrix": [14, 2], "x": 9.5, "y": 0},
+ {"matrix": [3, 10], "x": 10.5, "y": 0},
+ {"matrix": [3, 9], "x": 11.5, "y": 0},
+ {"matrix": [1, 4], "x": 12.5, "y": 0},
+ {"matrix": [0, 4], "x": 13.5, "y": 0},
+ {"matrix": [0, 9], "x": 14.5, "y": 0},
+ {"matrix": [0, 7], "x": 15.5, "y": 0, "w": 1.5},
+
+ {"matrix": [2, 9], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 5], "x": 1.5, "y": 1},
+ {"matrix": [3, 12], "x": 2.5, "y": 1},
+ {"matrix": [3, 13], "x": 3.5, "y": 1},
+ {"matrix": [3, 14], "x": 4.5, "y": 1},
+ {"matrix": [3, 15], "x": 5.5, "y": 1},
+ {"matrix": [5, 8], "x": 6.5, "y": 1, "h": 1.5},
+
+ {"matrix": [5, 0], "x": 9.5, "y": 1, "h": 1.5},
+ {"matrix": [2, 12], "x": 10.5, "y": 1},
+ {"matrix": [1, 1], "x": 11.5, "y": 1},
+ {"matrix": [0, 5], "x": 12.5, "y": 1},
+ {"matrix": [5, 5], "x": 13.5, "y": 1},
+ {"matrix": [1, 0], "x": 14.5, "y": 1},
+ {"matrix": [0, 6], "x": 15.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 1], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [5, 15], "x": 1.5, "y": 2},
+ {"matrix": [5, 14], "x": 2.5, "y": 2},
+ {"matrix": [6, 1], "x": 3.5, "y": 2},
+ {"matrix": [2, 10], "x": 4.5, "y": 2},
+ {"matrix": [3, 8], "x": 5.5, "y": 2},
+
+ {"matrix": [4, 12], "x": 10.5, "y": 2},
+ {"matrix": [5, 7], "x": 11.5, "y": 2},
+ {"matrix": [5, 3], "x": 12.5, "y": 2},
+ {"matrix": [5, 11], "x": 13.5, "y": 2},
+ {"matrix": [5, 10], "x": 14.5, "y": 2},
+ {"matrix": [0, 8], "x": 15.5, "y": 2, "w": 1.5},
+
+ {"matrix": [3, 5], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [5, 13], "x": 1.5, "y": 3},
+ {"matrix": [1, 7], "x": 2.5, "y": 3},
+ {"matrix": [1, 11], "x": 3.5, "y": 3},
+ {"matrix": [1, 10], "x": 4.5, "y": 3},
+ {"matrix": [5, 2], "x": 5.5, "y": 3},
+ {"matrix": [5, 6], "x": 6.5, "y": 2.5, "h": 1.5},
+
+ {"matrix": [5, 1], "x": 9.5, "y": 2.5, "h": 1.5},
+ {"matrix": [4, 13], "x": 10.5, "y": 3},
+ {"matrix": [2, 3], "x": 11.5, "y": 3},
+ {"matrix": [1, 12], "x": 12.5, "y": 3},
+ {"matrix": [1, 3], "x": 13.5, "y": 3},
+ {"matrix": [2, 14], "x": 14.5, "y": 3},
+ {"matrix": [0, 12], "x": 15.5, "y": 3, "w": 1.5},
+
+ {"matrix": [5, 12], "x": 0.5, "y": 4},
+ {"matrix": [0, 10], "x": 1.5, "y": 4},
+ {"matrix": [0, 15], "x": 2.5, "y": 4},
+
+ {"matrix": [3, 6], "x": 13.5, "y": 4},
+ {"matrix": [0, 14], "x": 14.5, "y": 4},
+ {"matrix": [3, 7], "x": 15.5, "y": 4},
+
+ {"matrix": [14, 4], "x": 5.5, "y": 5, "h": 2},
+ {"matrix": [4, 9], "x": 6.5, "y": 5},
+
+ {"matrix": [4, 11], "x": 9.5, "y": 5},
+ {"matrix": [14, 0], "x": 10.5, "y": 5, "h": 2},
+
+ {"matrix": [14, 5], "x": 6.5, "y": 6},
+
+ {"matrix": [14, 1], "x": 9.5, "y": 6}
]
}
}
diff --git a/keyboards/sirius/unigo66/unigo66.c b/keyboards/sirius/unigo66/unigo66.c
deleted file mode 100644
index 6a2d2632bd..0000000000
--- a/keyboards/sirius/unigo66/unigo66.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "unigo66.h"
diff --git a/keyboards/sirius/unigo66/unigo66.h b/keyboards/sirius/unigo66/unigo66.h
deleted file mode 100644
index 62af132789..0000000000
--- a/keyboards/sirius/unigo66/unigo66.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-Copyright 2017 Balz Guenat <balz.guenat@gmail.com>
-
-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( \
- K29,K1E,K1F,K20,K21,K22,K2D, K2E,K23,K24,K25,K26,K27,K2A,\
- K2B,K14,K1A,K08,K15,K17,K4B, K2F,K1C,K18,K0C,K12,K13,K31,\
- K39,K04,K16,K07,K09,K0A, K0B,K0D,K0E,K0F,K33,K34,\
- KE1,K1D,K1B,K06,K19,K05,K4E, K30,K11,K10,K36,K37,K52,KE5,\
- KE0,KE3,KE2, K50,K51,K4F,\
- K2C,K49, K4A,K28, \
- KE6,K4C, K4D,KE4 \
-) { \
- { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \
- K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, /* 08-0F */ \
- { K10, K11, K12, K13, K14, K15, K16, K17, /* 10-17 */ \
- K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, /* 18-1F */ \
- { K20, K21, K22, K23, K24, K25, K26, K27, /* 20-27 */ \
- K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, /* 28-2F */ \
- { K30, K31, KC_NO, K33, K34, KC_NO, K36, K37, /* 30-37 */ \
- KC_NO, K39, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 38-3F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 40-47 */ \
- KC_NO, K49, K4A, K4B, K4C, K4D, K4E, K4F }, /* 48-4F */ \
- { K50, K51, K52, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 50-57 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 58-5F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 60-67 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 68-6F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 78-7F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \
- { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KC_NO, /* E0-E7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
-}
-
-#define LAYOUT_beta_pcb( \
- K1E, K1F, K30, K2F, K45, K3B, KE6, KE2, K3A, K39, K14, K04, K09, K07, \
- K29, K15, K3C, K3D, K3E, K3F, K58, K50, K2C, K11, K05, K55, K10, K06, \
- K31, K5F, K5E, K61, K2A, K38, K4C, K57, K53, K5B, K5A, K08, \
- K35, K5D, K17, K1B, K1A, K52, K56, K51, K4D, K23, K1C, K13, K2E, K0C, \
- K5C, K0A, K0F, K36, K0E, K37, \
- KE4, K49, K4B, KE0, \
- KE5, KE1\
-) { \
- { KC_NO, KC_NO, KC_NO, KC_NO, K04, K05, K06, K07, /* 00-07 */ \
- K08, K09, K0A, KC_NO, K0C, KC_NO, K0E, K0F }, /* 08-0F */ \
- { K10, K11, KC_NO, K13, K14, K15, KC_NO, K17, /* 10-17 */ \
- KC_NO, KC_NO, K1A, K1B, K1C, K1E, K1F, KC_NO }, /* 18-1F */ \
- { KC_NO, KC_NO, KC_NO, K23, KC_NO, KC_NO, KC_NO, KC_NO, /* 20-27 */ \
- KC_NO, K29, K2A, KC_NO, K2C, KC_NO, K2E, K2F }, /* 28-2F */ \
- { K30, K31, KC_NO, KC_NO, KC_NO, K35, K36, K37, /* 30-37 */ \
- K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, /* 38-3F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K45, KC_NO, KC_NO, /* 40-47 */ \
- KC_NO, K49, KC_NO, K4B, K4C, K4D, KC_NO, KC_NO }, /* 48-4F */ \
- { K50, K51, K52, K53, KC_NO, K55, K56, K57, /* 50-57 */ \
- K58, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F }, /* 58-5F */ \
- { KC_NO, K61, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 60-67 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 68-6F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 70-77 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 78-7F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 80-87 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 88-8F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* 90-97 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* 98-9F */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* A0-A7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* A8-AF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* B0-B7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* B8-BF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* C0-C7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* C8-CF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* D0-D7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* D8-DF */ \
- { KE0, KE1, KE2, KC_NO, KE4, KE5, KE6, KC_NO, /* E0-E7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* E8-EF */ \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* F0-F7 */ \
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, /* F8-FF */ \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 17:40:16 +0000