Skip to content

Commit 2b511d6

Browse files
zcheezchee
committed
dev
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
1 parent 0c97574 commit 2b511d6

File tree

7 files changed

+56
-11
lines changed

7 files changed

+56
-11
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ endif
1212
.PHONY: all left clean_firmware clean_image clean
1313

1414
all:
15-
$(shell bin/get_version.sh >> /dev/null)
16-
$(DOCKER) build --tag zmk --file Dockerfile .
15+
# $(shell bin/get_version.sh >> /dev/null)
16+
$(DOCKER) build --tag zmk --file Dockerfile --load .
1717
$(DOCKER) run --rm -it --name zmk \
1818
-v $(PWD)/firmware:/app/firmware$(SELINUX1) \
1919
-v $(PWD)/config:/app/config:ro$(SELINUX2) \
@@ -25,7 +25,7 @@ all:
2525

2626
left:
2727
$(shell bin/get_version.sh >> /dev/null)
28-
$(DOCKER) build --tag zmk --file Dockerfile .
28+
$(DOCKER) build --tag zmk --file Dockerfile --load .
2929
$(DOCKER) run --rm -it --name zmk \
3030
-v $(PWD)/firmware:/app/firmware$(SELINUX1) \
3131
-v $(PWD)/config:/app/config:ro$(SELINUX2) \

‎config/adv360.keymap

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333

3434
default_layer {
3535
bindings = <
36-
&kp EQUAL &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &tog 1 &mo 3 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS
37-
&kp TAB &kp Q &kp W &kp E &kp R &kp T &none &none &kp Y &kp U &kp I &kp O &kp P &kp BSLH
38-
&kp ESC &kp A &kp S &kp D &kp F &kp G &none &kp LCTRL &kp LALT &kp LGUI &kp RCTRL &none &kp H &kp J &kp K &kp L &kp SEMI &kp SQT
39-
&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp HOME &kp PG_UP &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT
40-
&mo 2 &kp GRAVE &kp CAPS &kp LEFT &kp RIGHT &kp BSPC &kp DEL &kp END &kp PG_DN &kp ENTER &kp SPACE &kp UP &kp DOWN &kp LBKT &kp RBKT &mo 2
36+
&kp AMPERSAND &kp LEFT_BRACKET &kp LEFT_BRACE &kp RIGHT_BRACE &kp LEFT_PARENTHESIS &kp EQUAL &none &mo 3 &kp ASTRK &kp RIGHT_PARENTHESIS &kp PLUS &kp RIGHT_BRACKET &kp EXCLAMATION &kp HASH
37+
&kp TAB &kp COLON &kp COMMA &kp DOT &kp P &kp Y &none &none &kp F &kp G &kp C &kp R &kp L &kp BSLH
38+
&kp LCTRL &kp A &kp O &kp E &kp U &kp I &none &kp LCMD &kp LALT &kp RALT &kp RCMD &none &kp D &kp H &kp T &kp N &kp S &kp MINUS
39+
&mo 4 &kp SINGLE_QUOTE &kp Q &kp J &kp K &kp X &kp F9 &kp F9 &kp B &kp M &kp W &kp V &kp Z &mo 4
40+
&kp LSHIFT &kp DOLLAR &kp TILDE &kp LEFT &kp DOWN &kp BSPC &kp LCTRL &kp F8 &kp ESCAPE &kp ENTER &kp SPACE &kp UP &kp RIGHT &kp SLASH &kp AT &kp RSHIFT
4141
>;
4242
};
4343
keypad {
@@ -67,5 +67,14 @@
6767
&none &none &none &none &none &none &none &none &none &bl BL_TOG &rgb_ug RGB_TOG &bl BL_INC &bl BL_DEC &none &none &none
6868
>;
6969
};
70+
shift {
71+
bindings = <
72+
&kp PERCENT &kp NUMBER_7 &kp NUMBER_5 &kp NUMBER_3 &kp NUMBER_1 &kp NUMBER_9 &trans &trans &kp NUMBER_0 &kp NUMBER_2 &kp NUMBER_4 &kp NUMBER_6 &kp NUMBER_8 &kp GRAVE
73+
&kp LS(TAB) &kp SEMICOLON &kp LESS_THAN &kp GREATER_THAN &kp LS(P) &kp LS(Y) &trans &trans &kp LS(F) &kp LS(G) &kp LS(C) &kp LS(R) &kp LS(L) &kp PIPE
74+
&kp LS(LCTRL) &kp LS(A) &kp LS(O) &kp LS(E) &kp LS(U) &kp LS(I) &trans &kp LS(LCMD) &kp LS(LALT) &kp LS(RALT) &kp LS(RCMD) &trans &kp LS(D) &kp LS(H) &kp LS(T) &kp LS(N) &kp LS(S) &kp UNDERSCORE
75+
&trans &kp DOUBLE_QUOTES &kp LS(Q) &kp LS(J) &kp LS(K) &kp LS(X) &trans &trans &kp LS(B) &kp LS(M) &kp LS(W) &kp LS(V) &kp LS(Z) &trans
76+
&trans &kp DOLLAR &kp TILDE &kp LS(LEFT) &kp LS(DOWN) &kp LS(BSPC) &kp LS(LCTRL) &trans &kp LS(ESC) &kp LS(ENTER) &kp LS(SPACE) &kp LS(UP) &kp LS(RIGHT) &kp QUESTION &kp CARET &trans
77+
>;
78+
};
7079
};
7180
};

‎config/boards/arm/adv360/adv360.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
spi-zero-frame = <0x40>;
153153

154154
color-mapping = <LED_COLOR_ID_GREEN
155-
LED_COLOR_ID_RED
156-
LED_COLOR_ID_BLUE>;
155+
LED_COLOR_ID_BLUE
156+
LED_COLOR_ID_RED>;
157157
};
158158
};

‎config/boards/arm/adv360/adv360_left_defconfig

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,17 @@ CONFIG_ZMK_BLE_PASSKEY_ENTRY=n
7171

7272
CONFIG_ZMK_BLE=y
7373
CONFIG_ZMK_USB=y
74-
CONFIG_ZMK_HID_INDICATORS=y
74+
CONFIG_ZMK_HID_INDICATORS=y
75+
76+
# avoid debouncing: https://zmk.dev/docs/features/debouncing
77+
CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=3
78+
CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10
79+
80+
# CONFIG_ZMK_RGB_UNDERGLOW_MOD_COLOR=0xFFFFFF
81+
82+
# https://github.com/wilser/EW-Nauticus-Adv360/blob/2c9834e14059/config/boards/arm/adv360/adv360_left_defconfig#L71-L75
83+
# EW test 'idle' setting for hacking the small LED status lights timeout
84+
# ms before keyboard enters idle (first-tier sleep) which should turn off lights, but keep BT enabled and keyboard active
85+
# https://zmk.dev/docs/config/power
86+
# trying 10 minutes
87+
# CONFIG_ZMK_IDLE_TIMEOUT=600000

‎config/boards/arm/adv360/adv360_right_defconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,12 @@ CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
5959

6060
CONFIG_ZMK_BLE=y
6161
CONFIG_ZMK_USB=y
62+
63+
# avoid debouncing: https://zmk.dev/docs/features/debouncing
64+
CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=3
65+
CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=10
66+
67+
# CONFIG_ZMK_RGB_UNDERGLOW_MOD_COLOR=0xFFFFFF
68+
69+
# EW test 'idle' setting for hacking the small LED status lights timeout - see notes in LEFT file
70+
# CONFIG_ZMK_IDLE_TIMEOUT=600000

‎config/version.dtsi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#define VERSION_MACRO
2+
macro_ver: macro_ver {
3+
compatible = "zmk,behavior-macro";
4+
label = "macro_ver";
5+
#binding-cells = <0>;
6+
bindings = <&kp N2>, <&kp N0>, <&kp N2>, <&kp N4>, <&kp N0>, <&kp N8>, <&kp N1>, <&kp N8>, <&kp MINUS>, <&kp D>, <&kp V>, <&kp O>, <&kp R>, <&kp MINUS>, <&kp A>, <&kp N6>, <&kp N6>, <&kp N4>, <&kp N9>, <&kp N8>, <&kp E>, <&kp RET>;
7+
};

‎config/west.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,17 @@ manifest:
44
url-base: https://github.com/zmkfirmware
55
- name: refil
66
url-base: https://github.com/refil
7+
- name: zchee
8+
url-base: https://github.com/zchee
9+
- name: urob
10+
url-base: https://github.com/urob
711
projects:
812
- name: zmk
913
remote: refil
1014
revision: adv360-z3.5
1115
import: app/west.yml
16+
- name: zmk-helpers
17+
remote: urob
18+
revision: v2 # this will eventually become main
1219
self:
1320
path: config

0 commit comments

Comments
 (0)