aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-06-26 07:11:39 +1000
committerGitHub <noreply@github.com>2020-06-25 22:11:39 +0100
commitc2dd19de514eda3cf00cecdee76b21cfd0d6e2e6 (patch)
treebf505a4302801ee9eed2013c0c35b2087cbe6d1e
parent6d88794960df06059dfa5805b99e271e14270cf2 (diff)
downloadqmk_firmware-c2dd19de514eda3cf00cecdee76b21cfd0d6e2e6.tar.gz
qmk_firmware-c2dd19de514eda3cf00cecdee76b21cfd0d6e2e6.zip
Fix error_log complaint about Helix boards (#9528)
Diffstat
-rw-r--r--keyboards/helix/helix.h4
-rw-r--r--keyboards/helix/info.json13
-rw-r--r--keyboards/helix/pico/info.json77
-rw-r--r--keyboards/helix/pico/pico.h87
-rw-r--r--keyboards/helix/rev1/info.json89
-rw-r--r--keyboards/helix/rev1/rev1.h296
-rw-r--r--keyboards/helix/rev2/info.json93
-rw-r--r--keyboards/helix/rev2/rev2.h204
8 files changed, 512 insertions, 351 deletions
diff --git a/keyboards/helix/helix.h b/keyboards/helix/helix.h
index 7dac2455d..d3d3b0416 100644
--- a/keyboards/helix/helix.h
+++ b/keyboards/helix/helix.h
@@ -1,5 +1,7 @@
1#pragma once 1#pragma once
2 2
3#include "quantum.h"
4
3#ifdef KEYBOARD_helix_rev1 5#ifdef KEYBOARD_helix_rev1
4 #include "rev1.h" 6 #include "rev1.h"
5#endif 7#endif
@@ -9,5 +11,3 @@
9#ifdef KEYBOARD_helix_pico 11#ifdef KEYBOARD_helix_pico
10 #include "pico.h" 12 #include "pico.h"
11#endif 13#endif
12
13#include "quantum.h"
diff --git a/keyboards/helix/info.json b/keyboards/helix/info.json
deleted file mode 100644
index 6cd13d98e..000000000
--- a/keyboards/helix/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
1{
2 "keyboard_name": "Helix",
3 "url": "https://github.com/MakotoKurauchi/helix",
4 "maintainer": "MakotoKurauchi",
5 "width": 15,
6 "height": 5,
7 "layouts": {
8 "LAYOUT": {
9 "key_count": 64,
10 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
11 }
12 }
13}
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/info.json
index f4e50b95c..a82a8f2ec 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/info.json
@@ -1,13 +1,70 @@
1{ 1{
2 "keyboard_name": "HelixPico", 2 "keyboard_name": "HelixPico",
3 "url": "https://github.com/MakotoKurauchi/helix", 3 "url": "https://github.com/MakotoKurauchi/helix",
4 "maintainer": "MakotoKurauchi", 4 "maintainer": "MakotoKurauchi",
5 "width": 15, 5 "width": 15,
6 "height": 4, 6 "height": 4,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "key_count": 50, 9 "layout": [
10 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}] 10 {"x": 0, "y": 0},
11 {"x": 1, "y": 0},
12 {"x": 2, "y": 0},
13 {"x": 3, "y": 0},
14 {"x": 4, "y": 0},
15 {"x": 5, "y": 0},
16
17 {"x": 9, "y": 0},
18 {"x": 10, "y": 0},
19 {"x": 11, "y": 0},
20 {"x": 12, "y": 0},
21 {"x": 13, "y": 0},
22 {"x": 14, "y": 0},
23
24 {"x": 0, "y": 1},
25 {"x": 1, "y": 1},
26 {"x": 2, "y": 1},
27 {"x": 3, "y": 1},
28 {"x": 4, "y": 1},
29 {"x": 5, "y": 1},
30
31 {"x": 9, "y": 1},
32 {"x": 10, "y": 1},
33 {"x": 11, "y": 1},
34 {"x": 12, "y": 1},
35 {"x": 13, "y": 1},
36 {"x": 14, "y": 1},
37
38 {"x": 0, "y": 2},
39 {"x": 1, "y": 2},
40 {"x": 2, "y": 2},
41 {"x": 3, "y": 2},
42 {"x": 4, "y": 2},
43 {"x": 5, "y": 2},
44
45 {"x": 9, "y": 2},
46 {"x": 10, "y": 2},
47 {"x": 11, "y": 2},
48 {"x": 12, "y": 2},
49 {"x": 13, "y": 2},
50 {"x": 14, "y": 2},
51
52 {"x": 0, "y": 3},
53 {"x": 1, "y": 3},
54 {"x": 2, "y": 3},
55 {"x": 3, "y": 3},
56 {"x": 4, "y": 3},
57 {"x": 5, "y": 3},
58 {"x": 6, "y": 3},
59
60 {"x": 8, "y": 3},
61 {"x": 9, "y": 3},
62 {"x": 10, "y": 3},
63 {"x": 11, "y": 3},
64 {"x": 12, "y": 3},
65 {"x": 13, "y": 3},
66 {"x": 14, "y": 3}
67 ]
68 }
11 } 69 }
12 }
13} 70}
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
index 303fe315e..60a5078ed 100644
--- a/keyboards/helix/pico/pico.h
+++ b/keyboards/helix/pico/pico.h
@@ -1,8 +1,6 @@
1#pragma once 1#pragma once
2 2
3#include "../helix.h" 3#include "helix.h"
4
5#include "quantum.h"
6 4
7#ifndef SPLIT_KEYBOARD 5#ifndef SPLIT_KEYBOARD
8 extern bool is_helix_master(void); 6 extern bool is_helix_master(void);
@@ -16,54 +14,51 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to
16#define has_usb() is_keyboard_master() 14#define has_usb() is_keyboard_master()
17 15
18#ifndef FLIP_HALF 16#ifndef FLIP_HALF
19// Standard Keymap 17 // Standard Keymap
20// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 18 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
21#define LAYOUT( \ 19#define LAYOUT( \
22 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 20 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
23 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 21 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
24 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 22 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
25 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ 23 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
26 ) \ 24) { \
27 { \ 25 { L00, L01, L02, L03, L04, L05, KC_NO }, \
28 { L00, L01, L02, L03, L04, L05, KC_NO }, \ 26 { L10, L11, L12, L13, L14, L15, KC_NO }, \
29 { L10, L11, L12, L13, L14, L15, KC_NO }, \ 27 { L20, L21, L22, L23, L24, L25, KC_NO }, \
30 { L20, L21, L22, L23, L24, L25, KC_NO }, \ 28 { L30, L31, L32, L33, L34, L35, L36 }, \
31 { L30, L31, L32, L33, L34, L35, L36 }, \ 29 { R05, R04, R03, R02, R01, R00, KC_NO }, \
32 { R05, R04, R03, R02, R01, R00, KC_NO }, \ 30 { R15, R14, R13, R12, R11, R10, KC_NO }, \
33 { R15, R14, R13, R12, R11, R10, KC_NO }, \ 31 { R25, R24, R23, R22, R21, R20, KC_NO }, \
34 { R25, R24, R23, R22, R21, R20, KC_NO }, \ 32 { R35, R34, R33, R32, R31, R30, R36 }, \
35 { R35, R34, R33, R32, R31, R30, R36 }, \ 33}
36 }
37#else 34#else
38// Keymap with right side flipped 35 // Keymap with right side flipped
39// (TRRS jack on both halves are to the right) 36 // (TRRS jack on both halves are to the right)
40#define LAYOUT( \ 37 #define LAYOUT( \
41 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 38 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
42 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 39 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
43 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 40 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
44 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ 41 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
45 ) \ 42 ) { \
46 { \ 43 { L00, L01, L02, L03, L04, L05, KC_NO }, \
47 { L00, L01, L02, L03, L04, L05, KC_NO }, \ 44 { L10, L11, L12, L13, L14, L15, KC_NO }, \
48 { L10, L11, L12, L13, L14, L15, KC_NO }, \ 45 { L20, L21, L22, L23, L24, L25, KC_NO }, \
49 { L20, L21, L22, L23, L24, L25, KC_NO }, \ 46 { L30, L31, L32, L33, L34, L35, L36 }, \
50 { L30, L31, L32, L33, L34, L35, L36 }, \ 47 { KC_NO, R00, R01, R02, R03, R04, R05 }, \
51 { KC_NO, R00, R01, R02, R03, R04, R05 }, \ 48 { KC_NO, R10, R11, R12, R13, R14, R15 }, \
52 { KC_NO, R10, R11, R12, R13, R14, R15 }, \ 49 { KC_NO, R20, R21, R22, R23, R24, R25 }, \
53 { KC_NO, R20, R21, R22, R23, R24, R25 }, \ 50 { R36, R30, R31, R32, R33, R34, R35 }, \
54 { R36, R30, R31, R32, R33, R34, R35 }, \ 51 }
55 }
56#endif 52#endif
57 53
58#define LAYOUT_kc( \ 54#define LAYOUT_kc( \
59 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 55 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
60 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 56 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
61 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 57 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
62 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ 58 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
63 ) \ 59) LAYOUT( \
64 LAYOUT( \ 60 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
65 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ 61 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
66 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ 62 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
67 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ 63 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
68 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \ 64)
69 )
diff --git a/keyboards/helix/rev1/info.json b/keyboards/helix/rev1/info.json
index 505401cee..6811e764d 100644
--- a/keyboards/helix/rev1/info.json
+++ b/keyboards/helix/rev1/info.json
@@ -1,13 +1,82 @@
1{ 1{
2 "keyboard_name": "Helix rev. 1", 2 "keyboard_name": "Helix rev. 1",
3 "url": "https://github.com/MakotoKurauchi/helix", 3 "url": "https://github.com/MakotoKurauchi/helix",
4 "maintainer": "MakotoKurauchi", 4 "maintainer": "MakotoKurauchi",
5 "width": 13, 5 "width": 13,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "key_count": 60, 9 "layout": [
10 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}] 10 {"x": 0, "y": 0},
11 {"x": 1, "y": 0},
12 {"x": 2, "y": 0},
13 {"x": 3, "y": 0},
14 {"x": 4, "y": 0},
15 {"x": 5, "y": 0},
16
17 {"x": 7, "y": 0},
18 {"x": 8, "y": 0},
19 {"x": 9, "y": 0},
20 {"x": 10, "y": 0},
21 {"x": 11, "y": 0},
22 {"x": 12, "y": 0},
23
24 {"x": 0, "y": 1},
25 {"x": 1, "y": 1},
26 {"x": 2, "y": 1},
27 {"x": 3, "y": 1},
28 {"x": 4, "y": 1},
29 {"x": 5, "y": 1},
30
31 {"x": 7, "y": 1},
32 {"x": 8, "y": 1},
33 {"x": 9, "y": 1},
34 {"x": 10, "y": 1},
35 {"x": 11, "y": 1},
36 {"x": 12, "y": 1},
37
38 {"x": 0, "y": 2},
39 {"x": 1, "y": 2},
40 {"x": 2, "y": 2},
41 {"x": 3, "y": 2},
42 {"x": 4, "y": 2},
43 {"x": 5, "y": 2},
44
45 {"x": 7, "y": 2},
46 {"x": 8, "y": 2},
47 {"x": 9, "y": 2},
48 {"x": 10, "y": 2},
49 {"x": 11, "y": 2},
50 {"x": 12, "y": 2},
51
52 {"x": 0, "y": 3},
53 {"x": 1, "y": 3},
54 {"x": 2, "y": 3},
55 {"x": 3, "y": 3},
56 {"x": 4, "y": 3},
57 {"x": 5, "y": 3},
58
59 {"x": 7, "y": 3},
60 {"x": 8, "y": 3},
61 {"x": 9, "y": 3},
62 {"x": 10, "y": 3},
63 {"x": 11, "y": 3},
64 {"x": 12, "y": 3},
65
66 {"x": 0, "y": 4},
67 {"x": 1, "y": 4},
68 {"x": 2, "y": 4},
69 {"x": 3, "y": 4},
70 {"x": 4, "y": 4},
71 {"x": 5, "y": 4},
72
73 {"x": 7, "y": 4},
74 {"x": 8, "y": 4},
75 {"x": 9, "y": 4},
76 {"x": 10, "y": 4},
77 {"x": 11, "y": 4},
78 {"x": 12, "y": 4}
79 ]
80 }
11 } 81 }
12 }
13} 82}
diff --git a/keyboards/helix/rev1/rev1.h b/keyboards/helix/rev1/rev1.h
index b505845ad..b3a525554 100644
--- a/keyboards/helix/rev1/rev1.h
+++ b/keyboards/helix/rev1/rev1.h
@@ -1,180 +1,168 @@
1#pragma once 1#pragma once
2 2
3#include "../helix.h" 3#include "helix.h"
4
5#include "quantum.h"
6 4
7#ifdef USE_I2C 5#ifdef USE_I2C
8#include <stddef.h> 6#include <stddef.h>
9#ifdef __AVR__ 7#ifdef __AVR__
10 #include <avr/io.h> 8 #include <avr/io.h>
11 #include <avr/interrupt.h> 9 #include <avr/interrupt.h>
12#endif 10#endif
13#endif 11#endif
14 12
15#if MATRIX_ROWS == 6 // HELIX_ROWS == 3 13#if MATRIX_ROWS == 6 // HELIX_ROWS == 3
16 #ifndef FLIP_HALF 14 #ifndef FLIP_HALF
17 // Standard Keymap 15 // Standard Keymap
18 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 16 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
19 #define LAYOUT( \ 17 #define LAYOUT( \
20 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 18 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
21 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 19 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
22 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \ 20 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
23 ) \ 21 ) { \
24 { \ 22 { L00, L01, L02, L03, L04, L05 }, \
25 { L00, L01, L02, L03, L04, L05 }, \ 23 { L10, L11, L12, L13, L14, L15 }, \
26 { L10, L11, L12, L13, L14, L15 }, \ 24 { L20, L21, L22, L23, L24, L25 }, \
27 { L20, L21, L22, L23, L24, L25 }, \ 25 { R05, R04, R03, R02, R01, R00 }, \
28 { R05, R04, R03, R02, R01, R00 }, \ 26 { R15, R14, R13, R12, R11, R10 }, \
29 { R15, R14, R13, R12, R11, R10 }, \ 27 { R25, R24, R23, R22, R21, R20 } \
30 { R25, R24, R23, R22, R21, R20 }, \ 28 }
31 } 29 #else
32 #else 30 // Keymap with right side flipped
33 // Keymap with right side flipped 31 // (TRRS jack on both halves are to the right)
34 // (TRRS jack on both halves are to the right) 32 #define LAYOUT( \
35 #define LAYOUT( \ 33 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
36 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 34 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
37 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 35 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
38 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \ 36 ) { \
39 ) \ 37 { L00, L01, L02, L03, L04, L05 }, \
40 { \ 38 { L10, L11, L12, L13, L14, L15 }, \
41 { L00, L01, L02, L03, L04, L05 }, \ 39 { L20, L21, L22, L23, L24, L25 }, \
42 { L10, L11, L12, L13, L14, L15 }, \ 40 { R00, R01, R02, R03, R04, R05 }, \
43 { L20, L21, L22, L23, L24, L25 }, \ 41 { R10, R11, R12, R13, R14, R15 }, \
44 { R00, R01, R02, R03, R04, R05 }, \ 42 { R20, R21, R22, R23, R24, R25 } \
45 { R10, R11, R12, R13, R14, R15 }, \ 43 }
46 { R20, R21, R22, R23, R24, R25 }, \ 44 #endif
47 }
48 #endif
49#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4 45#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
50 #ifndef FLIP_HALF 46 #ifndef FLIP_HALF
51 // Standard Keymap 47 // Standard Keymap
52 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 48 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
53 #define LAYOUT( \ 49 #define LAYOUT( \
54 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 50 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
55 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 51 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
56 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 52 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
57 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ 53 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
58 ) \ 54 ) { \
59 { \ 55 { L00, L01, L02, L03, L04, L05 }, \
60 { L00, L01, L02, L03, L04, L05 }, \ 56 { L10, L11, L12, L13, L14, L15 }, \
61 { L10, L11, L12, L13, L14, L15 }, \ 57 { L20, L21, L22, L23, L24, L25 }, \
62 { L20, L21, L22, L23, L24, L25 }, \ 58 { L30, L31, L32, L33, L34, L35 }, \
63 { L30, L31, L32, L33, L34, L35 }, \ 59 { R05, R04, R03, R02, R01, R00 }, \
64 { R05, R04, R03, R02, R01, R00 }, \ 60 { R15, R14, R13, R12, R11, R10 }, \
65 { R15, R14, R13, R12, R11, R10 }, \ 61 { R25, R24, R23, R22, R21, R20 }, \
66 { R25, R24, R23, R22, R21, R20 }, \ 62 { R35, R34, R33, R32, R31, R30 } \
67 { R35, R34, R33, R32, R31, R30 } \ 63 }
68 } 64 #else
69 #else 65 // Keymap with right side flipped
70 // Keymap with right side flipped 66 // (TRRS jack on both halves are to the right)
71 // (TRRS jack on both halves are to the right) 67 #define LAYOUT( \
72 #define LAYOUT( \ 68 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
73 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 69 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
74 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 70 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
75 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 71 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
76 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ 72 ) { \
77 ) \ 73 { L00, L01, L02, L03, L04, L05 }, \
78 { \ 74 { L10, L11, L12, L13, L14, L15 }, \
79 { L00, L01, L02, L03, L04, L05 }, \ 75 { L20, L21, L22, L23, L24, L25 }, \
80 { L10, L11, L12, L13, L14, L15 }, \ 76 { L30, L31, L32, L33, L34, L35 }, \
81 { L20, L21, L22, L23, L24, L25 }, \ 77 { R00, R01, R02, R03, R04, R05 }, \
82 { L30, L31, L32, L33, L34, L35 }, \ 78 { R10, R11, R12, R13, R14, R15 }, \
83 { R00, R01, R02, R03, R04, R05 }, \ 79 { R20, R21, R22, R23, R24, R25 }, \
84 { R10, R11, R12, R13, R14, R15 }, \ 80 { R30, R31, R32, R33, R34, R35 } \
85 { R20, R21, R22, R23, R24, R25 }, \ 81 }
86 { R30, R31, R32, R33, R34, R35 } \ 82 #endif
87 }
88 #endif
89#elif MATRIX_ROWS == 10 // HELIX_ROWS == 5 83#elif MATRIX_ROWS == 10 // HELIX_ROWS == 5
90 #ifndef FLIP_HALF 84 #ifndef FLIP_HALF
91 // Standard Keymap 85 // Standard Keymap
92 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 86 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
93 #define LAYOUT( \ 87#define LAYOUT( \
94 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
95 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
96 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
97 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
98 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
99 ) \
100 { \
101 { L00, L01, L02, L03, L04, L05 }, \
102 { L10, L11, L12, L13, L14, L15 }, \
103 { L20, L21, L22, L23, L24, L25 }, \
104 { L30, L31, L32, L33, L34, L35 }, \
105 { L40, L41, L42, L43, L44, L45 }, \
106 { R05, R04, R03, R02, R01, R00 }, \
107 { R15, R14, R13, R12, R11, R10 }, \
108 { R25, R24, R23, R22, R21, R20 }, \
109 { R35, R34, R33, R32, R31, R30 }, \
110 { R45, R44, R43, R42, R41, R40 } \
111 }
112 #else
113 // Keymap with right side flipped
114 // (TRRS jack on both halves are to the right)
115 #define LAYOUT( \
116 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 88 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
117 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 89 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
118 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 90 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
119 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ 91 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
120 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ 92 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
121 ) \ 93) { \
122 { \ 94 { L00, L01, L02, L03, L04, L05 }, \
123 { L00, L01, L02, L03, L04, L05 }, \ 95 { L10, L11, L12, L13, L14, L15 }, \
124 { L10, L11, L12, L13, L14, L15 }, \ 96 { L20, L21, L22, L23, L24, L25 }, \
125 { L20, L21, L22, L23, L24, L25 }, \ 97 { L30, L31, L32, L33, L34, L35 }, \
126 { L30, L31, L32, L33, L34, L35 }, \ 98 { L40, L41, L42, L43, L44, L45 }, \
127 { L40, L41, L42, L43, L44, L45 }, \ 99 { R05, R04, R03, R02, R01, R00 }, \
128 { R00, R01, R02, R03, R04, R05 }, \ 100 { R15, R14, R13, R12, R11, R10 }, \
129 { R10, R11, R12, R13, R14, R15 }, \ 101 { R25, R24, R23, R22, R21, R20 }, \
130 { R20, R21, R22, R23, R24, R25 }, \ 102 { R35, R34, R33, R32, R31, R30 }, \
131 { R30, R31, R32, R33, R34, R35 }, \ 103 { R45, R44, R43, R42, R41, R40 } \
132 { R40, R41, R42, R43, R44, R45 } \ 104}
133 } 105 #else
134 #endif 106 // Keymap with right side flipped
107 // (TRRS jack on both halves are to the right)
108 #define LAYOUT( \
109 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
110 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
111 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
112 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
113 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
114 ) { \
115 { L00, L01, L02, L03, L04, L05 }, \
116 { L10, L11, L12, L13, L14, L15 }, \
117 { L20, L21, L22, L23, L24, L25 }, \
118 { L30, L31, L32, L33, L34, L35 }, \
119 { L40, L41, L42, L43, L44, L45 }, \
120 { R00, R01, R02, R03, R04, R05 }, \
121 { R10, R11, R12, R13, R14, R15 }, \
122 { R20, R21, R22, R23, R24, R25 }, \
123 { R30, R31, R32, R33, R34, R35 }, \
124 { R40, R41, R42, R43, R44, R45 } \
125 }
126 #endif
135#else 127#else
136 #error "expected HELIX_ROWS 3 or 4 or 5" 128 #error "expected HELIX_ROWS 3 or 4 or 5"
137#endif 129#endif
138 130
139// Used to create a keymap using only KC_ prefixed keys 131// Used to create a keymap using only KC_ prefixed keys
140#if MATRIX_ROWS == 6 // HELIX_ROWS == 3 132#if MATRIX_ROWS == 6 // HELIX_ROWS == 3
141 #define LAYOUT_kc( \ 133 #define LAYOUT_kc( \
142 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 134 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
143 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 135 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
144 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \ 136 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \
145 ) \ 137 ) LAYOUT( \
146 LAYOUT( \ 138 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
147 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ 139 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
148 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ 140 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 \
149 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25 \
150 ) 141 )
151#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4 142#elif MATRIX_ROWS == 8 // HELIX_ROWS == 4
152 #define LAYOUT_kc( \ 143 #define LAYOUT_kc( \
153 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 144 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
154 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 145 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
155 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 146 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
156 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ 147 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
157 ) \ 148 ) LAYOUT( \
158 LAYOUT( \ 149 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
159 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ 150 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
160 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ 151 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
161 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ 152 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
162 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
163 ) 153 )
164#else 154#else // HELIX_ROWS == 5
165 #define LAYOUT_kc( \ 155 #define LAYOUT_kc( \
166 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 156 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
167 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 157 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
168 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 158 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
169 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ 159 L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
170 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ 160 L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \
171 ) \ 161 ) LAYOUT( \
172 LAYOUT( \ 162 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
173 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ 163 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
174 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ 164 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
175 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ 165 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
176 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \ 166 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
177 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
178 ) 167 )
179#endif 168#endif
180
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/rev2/info.json
index 236aa3688..7d9341c58 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/rev2/info.json
@@ -1,13 +1,86 @@
1{ 1{
2 "keyboard_name": "Helix rev. 2", 2 "keyboard_name": "Helix rev. 2",
3 "url": "https://github.com/MakotoKurauchi/helix", 3 "url": "https://github.com/MakotoKurauchi/helix",
4 "maintainer": "MakotoKurauchi", 4 "maintainer": "MakotoKurauchi",
5 "width": 15, 5 "width": 15,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT": {
9 "key_count": 64, 9 "layout": [
10 "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] 10 {"x": 0, "y": 0},
11 {"x": 1, "y": 0},
12 {"x": 2, "y": 0},
13 {"x": 3, "y": 0},
14 {"x": 4, "y": 0},
15 {"x": 5, "y": 0},
16
17 {"x": 9, "y": 0},
18 {"x": 10, "y": 0},
19 {"x": 11, "y": 0},
20 {"x": 12, "y": 0},
21 {"x": 13, "y": 0},
22 {"x": 14, "y": 0},
23
24 {"x": 0, "y": 1},
25 {"x": 1, "y": 1},
26 {"x": 2, "y": 1},
27 {"x": 3, "y": 1},
28 {"x": 4, "y": 1},
29 {"x": 5, "y": 1},
30
31 {"x": 9, "y": 1},
32 {"x": 10, "y": 1},
33 {"x": 11, "y": 1},
34 {"x": 12, "y": 1},
35 {"x": 13, "y": 1},
36 {"x": 14, "y": 1},
37
38 {"x": 0, "y": 2},
39 {"x": 1, "y": 2},
40 {"x": 2, "y": 2},
41 {"x": 3, "y": 2},
42 {"x": 4, "y": 2},
43 {"x": 5, "y": 2},
44
45 {"x": 9, "y": 2},
46 {"x": 10, "y": 2},
47 {"x": 11, "y": 2},
48 {"x": 12, "y": 2},
49 {"x": 13, "y": 2},
50 {"x": 14, "y": 2},
51
52 {"x": 0, "y": 3},
53 {"x": 1, "y": 3},
54 {"x": 2, "y": 3},
55 {"x": 3, "y": 3},
56 {"x": 4, "y": 3},
57 {"x": 5, "y": 3},
58 {"x": 6, "y": 3},
59
60 {"x": 8, "y": 3},
61 {"x": 9, "y": 3},
62 {"x": 10, "y": 3},
63 {"x": 11, "y": 3},
64 {"x": 12, "y": 3},
65 {"x": 13, "y": 3},
66 {"x": 14, "y": 3},
67
68 {"x": 0, "y": 4},
69 {"x": 1, "y": 4},
70 {"x": 2, "y": 4},
71 {"x": 3, "y": 4},
72 {"x": 4, "y": 4},
73 {"x": 5, "y": 4},
74 {"x": 6, "y": 4},
75
76 {"x": 8, "y": 4},
77 {"x": 9, "y": 4},
78 {"x": 10, "y": 4},
79 {"x": 11, "y": 4},
80 {"x": 12, "y": 4},
81 {"x": 13, "y": 4},
82 {"x": 14, "y": 4}
83 ]
84 }
11 } 85 }
12 }
13} 86}
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
index 8b82a4a6e..42f215fdf 100644
--- a/keyboards/helix/rev2/rev2.h
+++ b/keyboards/helix/rev2/rev2.h
@@ -1,12 +1,10 @@
1#pragma once 1#pragma once
2 2
3#include "../helix.h" 3#include "helix.h"
4
5#include "quantum.h"
6 4
7#ifndef SPLIT_KEYBOARD 5#ifndef SPLIT_KEYBOARD
8 extern bool is_helix_master(void); 6 extern bool is_helix_master(void);
9 #define is_keyboard_master() is_helix_master() 7 #define is_keyboard_master() is_helix_master()
10#endif 8#endif
11 9
12// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'. 10// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
@@ -16,120 +14,114 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to
16#define has_usb() is_keyboard_master() 14#define has_usb() is_keyboard_master()
17 15
18#if MATRIX_ROWS == 8 // HELIX_ROWS == 4 16#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
19#ifndef FLIP_HALF 17 #ifndef FLIP_HALF
20// Standard Keymap 18 // Standard Keymap
21// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) 19 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
20 #define LAYOUT( \
21 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
22 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
23 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
24 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
25 ) { \
26 { L00, L01, L02, L03, L04, L05, KC_NO }, \
27 { L10, L11, L12, L13, L14, L15, KC_NO }, \
28 { L20, L21, L22, L23, L24, L25, KC_NO }, \
29 { L30, L31, L32, L33, L34, L35, L36 }, \
30 { R05, R04, R03, R02, R01, R00, KC_NO }, \
31 { R15, R14, R13, R12, R11, R10, KC_NO }, \
32 { R25, R24, R23, R22, R21, R20, KC_NO }, \
33 { R35, R34, R33, R32, R31, R30, R36 } \
34 }
35 #else
36 // Keymap with right side flipped
37 // (TRRS jack on both halves are to the right)
38 #define LAYOUT( \
39 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
40 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
41 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
42 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
43 ) { \
44 { L00, L01, L02, L03, L04, L05, KC_NO }, \
45 { L10, L11, L12, L13, L14, L15, KC_NO }, \
46 { L20, L21, L22, L23, L24, L25, KC_NO }, \
47 { L30, L31, L32, L33, L34, L35, L36 }, \
48 { KC_NO, R00, R01, R02, R03, R04, R05 }, \
49 { KC_NO, R10, R11, R12, R13, R14, R15 }, \
50 { KC_NO, R20, R21, R22, R23, R24, R25 }, \
51 { R36, R30, R31, R32, R33, R34, R35 } \
52 }
53 #endif
54#else // HELIX_ROWS == 5
55 #ifndef FLIP_HALF
56 // Standard Keymap
57 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
22#define LAYOUT( \ 58#define LAYOUT( \
23 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 59 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
24 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 60 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
25 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 61 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
26 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ 62 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
27 ) \ 63 L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
28 { \ 64) { \
29 { L00, L01, L02, L03, L04, L05, KC_NO }, \ 65 { L00, L01, L02, L03, L04, L05, KC_NO }, \
30 { L10, L11, L12, L13, L14, L15, KC_NO }, \ 66 { L10, L11, L12, L13, L14, L15, KC_NO }, \
31 { L20, L21, L22, L23, L24, L25, KC_NO }, \ 67 { L20, L21, L22, L23, L24, L25, KC_NO }, \
32 { L30, L31, L32, L33, L34, L35, L36 }, \ 68 { L30, L31, L32, L33, L34, L35, L36 }, \
69 { L40, L41, L42, L43, L44, L45, L46 }, \
33 { R05, R04, R03, R02, R01, R00, KC_NO }, \ 70 { R05, R04, R03, R02, R01, R00, KC_NO }, \
34 { R15, R14, R13, R12, R11, R10, KC_NO }, \ 71 { R15, R14, R13, R12, R11, R10, KC_NO }, \
35 { R25, R24, R23, R22, R21, R20, KC_NO }, \ 72 { R25, R24, R23, R22, R21, R20, KC_NO }, \
36 { R35, R34, R33, R32, R31, R30, R36 }, \ 73 { R35, R34, R33, R32, R31, R30, R36 }, \
37 } 74 { R45, R44, R43, R42, R41, R40, R46 } \
38#else 75}
39// Keymap with right side flipped 76 #else
40// (TRRS jack on both halves are to the right) 77 // Keymap with right side flipped
41#define LAYOUT( \ 78 // (TRRS jack on both halves are to the right)
42 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 79 #define LAYOUT( \
43 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 80 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
44 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 81 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
45 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ 82 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
46 ) \ 83 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
47 { \ 84 L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
48 { L00, L01, L02, L03, L04, L05, KC_NO }, \ 85 ) { \
49 { L10, L11, L12, L13, L14, L15, KC_NO }, \ 86 { L00, L01, L02, L03, L04, L05, KC_NO }, \
50 { L20, L21, L22, L23, L24, L25, KC_NO }, \ 87 { L10, L11, L12, L13, L14, L15, KC_NO }, \
51 { L30, L31, L32, L33, L34, L35, L36 }, \ 88 { L20, L21, L22, L23, L24, L25, KC_NO }, \
52 { KC_NO, R00, R01, R02, R03, R04, R05 }, \ 89 { L30, L31, L32, L33, L34, L35, L36 }, \
53 { KC_NO, R10, R11, R12, R13, R14, R15 }, \ 90 { L40, L41, L42, L43, L44, L45, L46 }, \
54 { KC_NO, R20, R21, R22, R23, R24, R25 }, \ 91 { KC_NO, R00, R01, R02, R03, R04, R05 }, \
55 { R36, R30, R31, R32, R33, R34, R35 }, \ 92 { KC_NO, R10, R11, R12, R13, R14, R15 }, \
56 } 93 { KC_NO, R20, R21, R22, R23, R24, R25 }, \
57#endif 94 { R36, R30, R31, R32, R33, R34, R35 }, \
58#else 95 { R46, R40, R41, R42, R43, R44, R45 } \
59 #ifndef FLIP_HALF 96 }
60 // Standard Keymap 97 #endif
61 // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
62 #define LAYOUT( \
63 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
64 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
65 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
66 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
67 L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
68 ) \
69 { \
70 { L00, L01, L02, L03, L04, L05, KC_NO }, \
71 { L10, L11, L12, L13, L14, L15, KC_NO }, \
72 { L20, L21, L22, L23, L24, L25, KC_NO }, \
73 { L30, L31, L32, L33, L34, L35, L36 }, \
74 { L40, L41, L42, L43, L44, L45, L46 }, \
75 { R05, R04, R03, R02, R01, R00, KC_NO }, \
76 { R15, R14, R13, R12, R11, R10, KC_NO }, \
77 { R25, R24, R23, R22, R21, R20, KC_NO }, \
78 { R35, R34, R33, R32, R31, R30, R36 }, \
79 { R45, R44, R43, R42, R41, R40, R46 } \
80 }
81 #else
82 // Keymap with right side flipped
83 // (TRRS jack on both halves are to the right)
84 #define LAYOUT( \
85 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
86 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
87 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
88 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
89 L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
90 ) \
91 { \
92 { L00, L01, L02, L03, L04, L05, KC_NO }, \
93 { L10, L11, L12, L13, L14, L15, KC_NO }, \
94 { L20, L21, L22, L23, L24, L25, KC_NO }, \
95 { L30, L31, L32, L33, L34, L35, L36 }, \
96 { L40, L41, L42, L43, L44, L45, L46 }, \
97 { KC_NO, R00, R01, R02, R03, R04, R05 }, \
98 { KC_NO, R10, R11, R12, R13, R14, R15 }, \
99 { KC_NO, R20, R21, R22, R23, R24, R25 }, \
100 { R36, R30, R31, R32, R33, R34, R35 }, \
101 { R46, R40, R41, R42, R43, R44, R45 } \
102 }
103 #endif
104#endif 98#endif
105 99
106// Used to create a keymap using only KC_ prefixed keys 100// Used to create a keymap using only KC_ prefixed keys
107#if MATRIX_ROWS == 8 // HELIX_ROWS == 4 101#if MATRIX_ROWS == 8 // HELIX_ROWS == 4
108 #define LAYOUT_kc( \ 102 #define LAYOUT_kc( \
109 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 103 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
110 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 104 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
111 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 105 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
112 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ 106 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
113 ) \ 107 ) LAYOUT( \
114 LAYOUT( \ 108 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
115 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ 109 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
116 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ 110 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
117 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ 111 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
118 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
119 ) 112 )
120#else 113#else // HELIX_ROWS == 5
121 #define LAYOUT_kc( \ 114 #define LAYOUT_kc( \
122 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ 115 L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
123 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ 116 L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
124 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ 117 L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
125 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \ 118 L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \
126 L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \ 119 L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \
127 ) \ 120 ) LAYOUT( \
128 LAYOUT( \ 121 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
129 KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \ 122 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
130 KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \ 123 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
131 KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \ 124 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \
132 KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L36, KC_##R36, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35, \ 125 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
133 KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##L46, KC_##R46, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
134 ) 126 )
135#endif 127#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 07:08:26 +0000