1 files changed, 41 insertions, 46 deletions
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 @@
 #pragma once
-#include "../helix.h"
+#include "helix.h"
-#include "quantum.h"
 #ifndef SPLIT_KEYBOARD
  extern bool is_helix_master(void);
@@ -16,54 +14,51 @@ extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to
 #define has_usb() is_keyboard_master()
 #ifndef FLIP_HALF
-// Standard Keymap
+  // Standard Keymap
-// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
+  // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left)
 #define LAYOUT( \
-        L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
+    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
+    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-        L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35  \
+    L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35  \
-        ) \
+) { \
-        { \
+    { L00, L01, L02, L03, L04, L05, KC_NO }, \
-                { L00, L01, L02, L03, L04, L05, KC_NO }, \
+    { L10, L11, L12, L13, L14, L15, KC_NO }, \
-                { L10, L11, L12, L13, L14, L15, KC_NO }, \
+    { L20, L21, L22, L23, L24, L25, KC_NO }, \
-                { L20, L21, L22, L23, L24, L25, KC_NO }, \
+    { L30, L31, L32, L33, L34, L35, L36 }, \
-                { L30, L31, L32, L33, L34, L35, L36 }, \
+    { R05, R04, R03, R02, R01, R00, KC_NO }, \
-                { R05, R04, R03, R02, R01, R00, KC_NO }, \
+    { R15, R14, R13, R12, R11, R10, KC_NO }, \
-                { R15, R14, R13, R12, R11, R10, KC_NO }, \
+    { R25, R24, R23, R22, R21, R20, KC_NO }, \
-                { R25, R24, R23, R22, R21, R20, KC_NO }, \
+    { R35, R34, R33, R32, R31, R30, R36 }, \
-                { R35, R34, R33, R32, R31, R30, R36 }, \
+}
-        }
 #else
-// Keymap with right side flipped
+    // Keymap with right side flipped
-// (TRRS jack on both halves are to the right)
+    // (TRRS jack on both halves are to the right)
-#define LAYOUT( \
+    #define LAYOUT( \
-        L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
+        L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-        L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
+        L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-        L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
+        L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-        L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35  \
+        L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35  \
-        ) \
+    ) { \
-        { \
+        { L00, L01, L02, L03, L04, L05, KC_NO }, \
-                { L00, L01, L02, L03, L04, L05, KC_NO }, \
+        { L10, L11, L12, L13, L14, L15, KC_NO }, \
-                { L10, L11, L12, L13, L14, L15, KC_NO }, \
+        { L20, L21, L22, L23, L24, L25, KC_NO }, \
-                { L20, L21, L22, L23, L24, L25, KC_NO }, \
+        { L30, L31, L32, L33, L34, L35, L36 }, \
-                { L30, L31, L32, L33, L34, L35, L36 }, \
+        { KC_NO, R00, R01, R02, R03, R04, R05 }, \
-                { KC_NO, R00, R01, R02, R03, R04, R05 }, \
+        { KC_NO, R10, R11, R12, R13, R14, R15 }, \
-                { KC_NO, R10, R11, R12, R13, R14, R15 }, \
+        { KC_NO, R20, R21, R22, R23, R24, R25 }, \
-                { KC_NO, R20, R21, R22, R23, R24, R25 }, \
+        { R36, R30, R31, R32, R33, R34, R35 }, \
-                { R36, R30, R31, R32, R33, R34, R35 }, \
+  }
-        }
 #endif
-#define LAYOUT_kc(                                                      \
+#define LAYOUT_kc( \
    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
    L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \
-    ) \
+) LAYOUT( \
-    LAYOUT( \
+    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-      KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
+    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-      KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
+    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-      KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
+    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 \
-      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 \
+)
-    )

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	)