Skip to content

Commit 658df0e

Browse files
sunakusunaku
committed
GH-62: fix Engram satellite keys to match diagram
1 parent 7fabfe5 commit 658df0e

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎keymap.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@
339339
#define KEY_RH_C5R5 P
340340
#define KEY_RH_C6R5 RSFT
341341
#define KEY_LH_C6R6 0
342-
#define KEY_LH_C5R6 FSLH
342+
#define KEY_LH_C5R6 AT
343343
#define KEY_LH_C4R6 LBKT
344344
#define KEY_LH_C3R6 RBKT
345-
#define KEY_LH_C2R6 AT
345+
#define KEY_LH_C2R6 FSLH
346346
#define LAY_LH_C2R6 LAYER_Emoji
347347
#define KEY_LH_T4 BACKSPACE
348348
#define LAY_LH_T4 LAYER_Cursor
@@ -3182,22 +3182,22 @@ behaviors {
31823182
retro-tap; // tap on standalone hold
31833183
};
31843184
#ifdef LAYER_Engram
3185-
crumb_engram_AT: crumb_layer_access_engram_AT {
3185+
crumb_engram_FSLH: crumb_layer_access_engram_FSLH {
31863186
compatible = "zmk,behavior-hold-tap";
31873187
flavor = THUMB_HOLDING_TYPE;
31883188
tapping-term-ms = <THUMB_HOLDING_TIME>;
31893189
quick-tap-ms = <THUMB_REPEAT_DECAY>; // enable repeat
31903190
#binding-cells = <2>;
3191-
bindings = <&mo>, <&engram_AT>;
3191+
bindings = <&mo>, <&engram_FSLH>;
31923192
retro-tap; // tap on standalone hold
31933193
};
3194-
thumb_engram_AT: thumb_layer_access_engram_AT {
3194+
thumb_engram_FSLH: thumb_layer_access_engram_FSLH {
31953195
compatible = "zmk,behavior-hold-tap";
31963196
flavor = THUMB_HOLDING_TYPE;
31973197
tapping-term-ms = <THUMB_HOLDING_TIME>;
31983198
quick-tap-ms = <THUMB_REPEAT_DECAY>; // enable repeat
31993199
#binding-cells = <2>;
3200-
bindings = <&mo>, <&engram_AT>;
3200+
bindings = <&mo>, <&engram_FSLH>;
32013201
};
32023202
#endif
32033203
space: thumb_layer_access_spacebar {

‎keymap.dtsi.erb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,22 +1016,22 @@ behaviors {
10161016
retro-tap; // tap on standalone hold
10171017
};
10181018
#ifdef LAYER_Engram
1019-
crumb_engram_AT: crumb_layer_access_engram_AT {
1019+
crumb_engram_FSLH: crumb_layer_access_engram_FSLH {
10201020
compatible = "zmk,behavior-hold-tap";
10211021
flavor = THUMB_HOLDING_TYPE;
10221022
tapping-term-ms = <THUMB_HOLDING_TIME>;
10231023
quick-tap-ms = <THUMB_REPEAT_DECAY>; // enable repeat
10241024
#binding-cells = <2>;
1025-
bindings = <&mo>, <&engram_AT>;
1025+
bindings = <&mo>, <&engram_FSLH>;
10261026
retro-tap; // tap on standalone hold
10271027
};
1028-
thumb_engram_AT: thumb_layer_access_engram_AT {
1028+
thumb_engram_FSLH: thumb_layer_access_engram_FSLH {
10291029
compatible = "zmk,behavior-hold-tap";
10301030
flavor = THUMB_HOLDING_TYPE;
10311031
tapping-term-ms = <THUMB_HOLDING_TIME>;
10321032
quick-tap-ms = <THUMB_REPEAT_DECAY>; // enable repeat
10331033
#binding-cells = <2>;
1034-
bindings = <&mo>, <&engram_AT>;
1034+
bindings = <&mo>, <&engram_FSLH>;
10351035
};
10361036
#endif
10371037
space: thumb_layer_access_spacebar {

‎keymap.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎keymap.zmk‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,10 +1224,10 @@
12241224
#define KEY_RH_C5R5 P
12251225
#define KEY_RH_C6R5 RSFT
12261226
#define KEY_LH_C6R6 0
1227-
#define KEY_LH_C5R6 FSLH
1227+
#define KEY_LH_C5R6 AT
12281228
#define KEY_LH_C4R6 LBKT
12291229
#define KEY_LH_C3R6 RBKT
1230-
#define KEY_LH_C2R6 AT
1230+
#define KEY_LH_C2R6 FSLH
12311231
#define LAY_LH_C2R6 LAYER_Emoji
12321232
#define KEY_LH_T4 BACKSPACE
12331233
#define LAY_LH_T4 LAYER_Cursor
@@ -4067,22 +4067,22 @@ behaviors {
40674067
retro-tap; // tap on standalone hold
40684068
};
40694069
#ifdef LAYER_Engram
4070-
crumb_engram_AT: crumb_layer_access_engram_AT {
4070+
crumb_engram_FSLH: crumb_layer_access_engram_FSLH {
40714071
compatible = "zmk,behavior-hold-tap";
40724072
flavor = THUMB_HOLDING_TYPE;
40734073
tapping-term-ms = <THUMB_HOLDING_TIME>;
40744074
quick-tap-ms = <THUMB_REPEAT_DECAY>; // enable repeat
40754075
#binding-cells = <2>;
4076-
bindings = <&mo>, <&engram_AT>;
4076+
bindings = <&mo>, <&engram_FSLH>;
40774077
retro-tap; // tap on standalone hold
40784078
};
4079-
thumb_engram_AT: thumb_layer_access_engram_AT {
4079+
thumb_engram_FSLH: thumb_layer_access_engram_FSLH {
40804080
compatible = "zmk,behavior-hold-tap";
40814081
flavor = THUMB_HOLDING_TYPE;
40824082
tapping-term-ms = <THUMB_HOLDING_TIME>;
40834083
quick-tap-ms = <THUMB_REPEAT_DECAY>; // enable repeat
40844084
#binding-cells = <2>;
4085-
bindings = <&mo>, <&engram_AT>;
4085+
bindings = <&mo>, <&engram_FSLH>;
40864086
};
40874087
#endif
40884088
space: thumb_layer_access_spacebar {
@@ -10894,12 +10894,12 @@ macros {
1089410894

1089510895
layer_Engram {
1089610896
bindings = <
10897-
&none &none &none &none &none &none &none &none &none &none
10898-
&none &engram_N1 &engram_N2 &engram_N3 &engram_N4 &engram_N5 &engram_N6 &engram_N7 &engram_N8 &engram_N9 &engram_N0 &none
10899-
&none &kp B &kp Y &kp O &kp U &engram_SQT &engram_DQT &kp L &kp D &kp W &kp V &kp Z
10900-
&engram_HASH &LeftPinky (C, LAYER_Engram) &LeftRingy (I, LAYER_Engram) &LeftMiddy (E, LAYER_Engram) &LeftIndex (A, LAYER_Engram) &engram_COMMA &engram_DOT &RightIndex (H, LAYER_Engram) &RightMiddy (T, LAYER_Engram) &RightRingy (S, LAYER_Engram) &RightPinky (N, LAYER_Engram) &kp Q
10901-
&sticky_key_modtap LSFT LSFT &kp G &kp X &kp J &kp K &kp MINUS &thumb LAYER_Function ESC &parang_left &parang_right &kp _HOME &kp _END &thumb LAYER_System ENTER &engram_QMARK &kp R &kp M &kp F &kp P &sticky_key_modtap RSFT RSFT
10902-
&magic LAYER_Magic 0 &engram_FSLH &kp LBKT &kp RBKT &thumb_engram_AT LAYER_Emoji 0 &thumb LAYER_Cursor BACKSPACE &thumb LAYER_Number DELETE &mo LAYER_Lower &thumb LAYER_Lower INSERT &thumb LAYER_Mouse TAB &space LAYER_Symbol SPACE &thumb LAYER_World PAGE_UP &msc MOUSE_SCROLL_UP &msc MOUSE_SCROLL_DOWN &kp PG_DN &magic LAYER_Magic 0
10897+
&none &none &none &none &none &none &none &none &none &none
10898+
&none &engram_N1 &engram_N2 &engram_N3 &engram_N4 &engram_N5 &engram_N6 &engram_N7 &engram_N8 &engram_N9 &engram_N0 &none
10899+
&none &kp B &kp Y &kp O &kp U &engram_SQT &engram_DQT &kp L &kp D &kp W &kp V &kp Z
10900+
&engram_HASH &LeftPinky (C, LAYER_Engram) &LeftRingy (I, LAYER_Engram) &LeftMiddy (E, LAYER_Engram) &LeftIndex (A, LAYER_Engram) &engram_COMMA &engram_DOT &RightIndex (H, LAYER_Engram) &RightMiddy (T, LAYER_Engram) &RightRingy (S, LAYER_Engram) &RightPinky (N, LAYER_Engram) &kp Q
10901+
&sticky_key_modtap LSFT LSFT &kp G &kp X &kp J &kp K &kp MINUS &thumb LAYER_Function ESC &parang_left &parang_right &kp _HOME &kp _END &thumb LAYER_System ENTER &engram_QMARK &kp R &kp M &kp F &kp P &sticky_key_modtap RSFT RSFT
10902+
&magic LAYER_Magic 0 &engram_AT &kp LBKT &kp RBKT &thumb_engram_FSLH LAYER_Emoji 0 &thumb LAYER_Cursor BACKSPACE &thumb LAYER_Number DELETE &mo LAYER_Lower &thumb LAYER_Lower INSERT &thumb LAYER_Mouse TAB &space LAYER_Symbol SPACE &thumb LAYER_World PAGE_UP &msc MOUSE_SCROLL_UP &msc MOUSE_SCROLL_DOWN &kp PG_DN &magic LAYER_Magic 0
1090310903
>;
1090410904
};
1090510905

0 commit comments

Comments
 (0)