diff options
Diffstat (limited to 'keyboards/sirius/uni660')
-rw-r--r-- | keyboards/sirius/uni660/rev2/ansi/ansi.h | 25 | ||||
-rw-r--r-- | keyboards/sirius/uni660/rev2/ansi/info.json | 182 | ||||
-rw-r--r-- | keyboards/sirius/uni660/rev2/iso/info.json | 184 | ||||
-rw-r--r-- | keyboards/sirius/uni660/rev2/iso/iso.h | 25 | ||||
-rw-r--r-- | keyboards/sirius/uni660/rev2/rev2.h | 6 |
5 files changed, 181 insertions, 241 deletions
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) |