diff options
Diffstat (limited to 'keyboards/ai03/orbit')
-rw-r--r-- | keyboards/ai03/orbit/info.json | 138 | ||||
-rw-r--r-- | keyboards/ai03/orbit/orbit.h | 29 |
2 files changed, 70 insertions, 97 deletions
diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index 981f3cd685..6a4ee1abf3 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -30,81 +30,83 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.63}, - {"x":1, "y":0.38}, - {"x":2, "y":0.38}, - {"x":3, "y":0.13}, - {"x":4, "y":0}, - {"x":5, "y":0.13}, - {"x":6, "y":0.25}, - {"x":9, "y":0.25}, - {"x":10, "y":0.13}, - {"x":11, "y":0}, - {"x":12, "y":0.13}, - {"x":13, "y":0.38}, - {"x":14, "y":0.38}, - {"x":15, "y":0.63}, + {"matrix": [0, 0], "x": 0, "y": 0.63}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0.38}, + {"matrix": [0, 3], "x": 3, "y": 0.13}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.13}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, - {"x":0, "y":1.63}, - {"x":1, "y":1.38}, - {"x":2, "y":1.38}, - {"x":3, "y":1.13}, - {"x":4, "y":1}, - {"x":5, "y":1.13}, - {"x":6, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.13}, - {"x":11, "y":1}, - {"x":12, "y":1.13}, - {"x":13, "y":1.38}, - {"x":14, "y":1.38}, - {"x":15, "y":1.63}, + {"matrix": [5, 0], "x": 9, "y": 0.25}, + {"matrix": [5, 1], "x": 10, "y": 0.13}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0.13}, + {"matrix": [5, 4], "x": 13, "y": 0.38}, + {"matrix": [5, 5], "x": 14, "y": 0.38}, + {"matrix": [5, 6], "x": 15, "y": 0.63}, - {"x":0, "y":2.63}, - {"x":1, "y":2.38}, - {"x":2, "y":2.38}, - {"x":3, "y":2.13}, - {"x":4, "y":2}, - {"x":5, "y":2.13}, - {"x":6, "y":2.25}, - {"x":9, "y":2.25}, - {"x":10, "y":2.13}, - {"x":11, "y":2}, - {"x":12, "y":2.13}, - {"x":13, "y":2.38}, - {"x":14, "y":2.38}, - {"x":15, "y":2.63}, + {"matrix": [1, 0], "x": 0, "y": 1.63}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1.38}, + {"matrix": [1, 3], "x": 3, "y": 1.13}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.13}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"x":0, "y":3.63}, - {"x":1, "y":3.38}, - {"x":2, "y":3.38}, - {"x":3, "y":3.13}, - {"x":4, "y":3}, - {"x":5, "y":3.13}, - {"x":6, "y":3.25}, - {"x":9, "y":3.25}, - {"x":10, "y":3.13}, - {"x":11, "y":3}, - {"x":12, "y":3.13}, - {"x":13, "y":3.38}, - {"x":14, "y":3.38}, - {"x":15, "y":3.63}, + {"matrix": [6, 0], "x": 9, "y": 1.25}, + {"matrix": [6, 1], "x": 10, "y": 1.13}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1.13}, + {"matrix": [6, 4], "x": 13, "y": 1.38}, + {"matrix": [6, 5], "x": 14, "y": 1.38}, + {"matrix": [6, 6], "x": 15, "y": 1.63}, - {"x":1, "y":4.38}, - {"x":2, "y":4.38}, - {"x":3, "y":4.13}, - {"x":4, "y":4}, + {"matrix": [2, 0], "x": 0, "y": 2.63}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2.38}, + {"matrix": [2, 3], "x": 3, "y": 2.13}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.13}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, - {"x":5.5, "y":4.25}, - {"x":6.5, "y":4.5, "h":1.5}, + {"matrix": [7, 0], "x": 9, "y": 2.25}, + {"matrix": [7, 1], "x": 10, "y": 2.13}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2.13}, + {"matrix": [7, 4], "x": 13, "y": 2.38}, + {"matrix": [7, 5], "x": 14, "y": 2.38}, + {"matrix": [7, 6], "x": 15, "y": 2.63}, - {"x":8.5, "y":4.5, "h":1.5}, - {"x":9.5, "y":4.25}, + {"matrix": [3, 0], "x": 0, "y": 3.63}, + {"matrix": [3, 1], "x": 1, "y": 3.38}, + {"matrix": [3, 2], "x": 2, "y": 3.38}, + {"matrix": [3, 3], "x": 3, "y": 3.13}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.13}, + {"matrix": [3, 6], "x": 6, "y": 3.25}, - {"x":11, "y":4}, - {"x":12, "y":4.13}, - {"x":13, "y":4.38}, - {"x":14, "y":4.38} + {"matrix": [8, 0], "x": 9, "y": 3.25}, + {"matrix": [8, 1], "x": 10, "y": 3.13}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3.13}, + {"matrix": [8, 4], "x": 13, "y": 3.38}, + {"matrix": [8, 5], "x": 14, "y": 3.38}, + {"matrix": [8, 6], "x": 15, "y": 3.63}, + + {"matrix": [4, 1], "x": 1, "y": 4.38}, + {"matrix": [4, 2], "x": 2, "y": 4.38}, + {"matrix": [4, 3], "x": 3, "y": 4.13}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4.25}, + {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5}, + + {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5}, + {"matrix": [9, 1], "x": 9.5, "y": 4.25}, + {"matrix": [9, 2], "x": 11, "y": 4}, + {"matrix": [9, 3], "x": 12, "y": 4.13}, + {"matrix": [9, 4], "x": 13, "y": 4.38}, + {"matrix": [9, 5], "x": 14, "y": 4.38} ] } } diff --git a/keyboards/ai03/orbit/orbit.h b/keyboards/ai03/orbit/orbit.h index 7f3b1aca32..7b9c238ad4 100644 --- a/keyboards/ai03/orbit/orbit.h +++ b/keyboards/ai03/orbit/orbit.h @@ -18,35 +18,6 @@ #include "quantum.h" -#define XXX KC_NO - -/* 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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { XXX, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, XXX } \ -} - void led_toggle(uint8_t id, bool on); void set_all_leds(bool leds[6]); void set_layer_indicators(uint8_t layer); |