diff --git a/build.yaml b/build.yaml index 909f156..20ed2fd 100644 --- a/build.yaml +++ b/build.yaml @@ -58,8 +58,7 @@ include: - board: nice_nano_v2 shield: corne_left nice_oled artifact-name: nice_corne_left_oled_rgb - snippet: rgb-config studio-rpc-usb-uart zmk-usb-logging - cmake-args: -DCONFIG_ZMK_USB_LOGGING=y -DCONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000 + snippet: rgb-config studio-rpc-usb-uart # nice_nano_v2 + nice_oled + RGB (RIGHT) - board: nice_nano_v2 shield: corne_right nice_oled diff --git a/config/corne.conf b/config/corne.conf index 1246a85..c10e7a9 100644 --- a/config/corne.conf +++ b/config/corne.conf @@ -126,14 +126,6 @@ CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=5 # ref: https://zmk.dev/docs/config/system#hid CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y -### JAVELIN STENO ENGINE -CONFIG_ZMK_JAVELIN_STENO=y -CONFIG_ZMK_JAVELIN_STENO_DICT_PLOVER=y -CONFIG_ZMK_JAVELIN_STENO_DICT_LAPWING=n -CONFIG_CPLUSPLUS=y -CONFIG_LIB_CPLUSPLUS=y -CONFIG_HEAP_MEM_POOL_SIZE=32768 - ### DEBUG OPTIONS # CONFIG_ZMK_USB_LOGGING=y # CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=8000 diff --git a/config/corne.keymap b/config/corne.keymap index 0ec9836..973f0c2 100644 --- a/config/corne.keymap +++ b/config/corne.keymap @@ -13,8 +13,6 @@ #include #include #include -#include -#include &led_strip { chain-length = <27>; @@ -95,10 +93,10 @@ steno_layer { display-name = "STEN"; bindings = < -&none &javsteno STENO_NUM1 &javsteno STENO_NUM2 &javsteno STENO_NUM3 &javsteno STENO_NUM4 &javsteno STENO_NUM5 &javsteno STENO_NUM6 &javsteno STENO_NUM7 &javsteno STENO_NUM8 &javsteno STENO_NUM9 &javsteno STENO_NUM10 &to 4 -&mo 4 &javsteno STENO_S1 &javsteno STENO_TL &javsteno STENO_PL &javsteno STENO_HL &javsteno STENO_STAR1 &javsteno STENO_STAR3 &javsteno STENO_FR &javsteno STENO_PR &javsteno STENO_LR &javsteno STENO_TR &javsteno STENO_DR -&none &javsteno STENO_S2 &javsteno STENO_KL &javsteno STENO_WL &javsteno STENO_RL &javsteno STENO_STAR2 &javsteno STENO_STAR4 &javsteno STENO_RR &javsteno STENO_BR &javsteno STENO_GR &javsteno STENO_SR &javsteno STENO_ZR - &none &javsteno STENO_A &javsteno STENO_O &javsteno STENO_E &javsteno STENO_U &none +&none &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &to 4 +&mo 4 &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT +&none &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT + &td_rgb &kp C &kp V &kp N &kp M &ht_mute_pp C_PLAY_PAUSE C_MUTE >; }; diff --git a/config/west.yml b/config/west.yml index 692f65e..1c4f319 100644 --- a/config/west.yml +++ b/config/west.yml @@ -11,12 +11,6 @@ manifest: # fork of zmk-nice-oled with custom KM medal animation - name: KeebMaker url-base: https://github.com/KeebMaker - # javelin steno engine module - - name: afiqzudinhadi - url-base: https://github.com/afiqzudinhadi - # javelin steno engine source - - name: jthlim - url-base: https://github.com/jthlim projects: # Pinned to v0.3.0 instead of `main`: ZMK main tracks Zephyr 4.1, whose # board-model rewrite renamed `nice_nano_v2` (now `nice_nano//zmk`) and @@ -42,14 +36,5 @@ manifest: - name: zmk-oled-adapter remote: mctechnology17 revision: main - # javelin steno engine module - - name: zmk-javelin-steno - remote: afiqzudinhadi - revision: debug/dict-inspect - # javelin steno engine source (fetched into module's javelin/ dir) - - name: javelin-steno - remote: jthlim - revision: main - path: zmk-javelin-steno/javelin self: path: config diff --git a/keymap-drawer/corne.svg b/keymap-drawer/corne.svg index 82e3be7..26a8ff4 100644 --- a/keymap-drawer/corne.svg +++ b/keymap-drawer/corne.svg @@ -752,63 +752,43 @@ rect.held, rect.combo.held { - -&javstenoSTENO_NUM1 - +1 - -&javstenoSTENO_NUM2 - +2 - -&javstenoSTENO_NUM3 - +3 - -&javstenoSTENO_NUM4 - +4 - -&javstenoSTENO_NUM5 - +5 - -&javstenoSTENO_NUM6 - +6 - -&javstenoSTENO_NUM7 - +7 - -&javstenoSTENO_NUM8 - +8 - -&javstenoSTENO_NUM9 - +9 - -&javstenoSTENO_NUM… - +0 @@ -823,168 +803,119 @@ rect.held, rect.combo.held { - -&javstenoSTENO_S1 - +Q - -&javstenoSTENO_TL - +W - -&javstenoSTENO_PL - +E - -&javstenoSTENO_HL - +R - -&javstenoSTENO_STA… - +T - -&javstenoSTENO_STA… - +Y - -&javstenoSTENO_FR - +U - -&javstenoSTENO_PR - +I - -&javstenoSTENO_LR - +O - -&javstenoSTENO_TR - +P - -&javstenoSTENO_DR - +[ - -&javstenoSTENO_S2 - +A - -&javstenoSTENO_KL - +S - -&javstenoSTENO_WL - +D - -&javstenoSTENO_RL - +F - -&javstenoSTENO_STA… - +G - -&javstenoSTENO_STA… - +H - -&javstenoSTENO_RR - +J - -&javstenoSTENO_BR - +K - -&javstenoSTENO_GR - +L - -&javstenoSTENO_SR - +; - -&javstenoSTENO_ZR - +' +&td_rgb - -&javstenoSTENO_A - +C - -&javstenoSTENO_O - +V - -&javstenoSTENO_E - +N - -&javstenoSTENO_U - +M +MUTE +PLAY PAUSE diff --git a/keymap-drawer/corne.yaml b/keymap-drawer/corne.yaml index 6340a96..361e1ab 100644 --- a/keymap-drawer/corne.yaml +++ b/keymap-drawer/corne.yaml @@ -88,47 +88,47 @@ layers: - {t: MUTE, h: PLAY PAUSE} STEN: - '' - - '&javsteno STENO_NUM1' - - '&javsteno STENO_NUM2' - - '&javsteno STENO_NUM3' - - '&javsteno STENO_NUM4' - - '&javsteno STENO_NUM5' - - '&javsteno STENO_NUM6' - - '&javsteno STENO_NUM7' - - '&javsteno STENO_NUM8' - - '&javsteno STENO_NUM9' - - '&javsteno STENO_NUM10' + - '1' + - '2' + - '3' + - '4' + - '5' + - '6' + - '7' + - '8' + - '9' + - '0' - {t: HUB, h: toggle} - HUB - - '&javsteno STENO_S1' - - '&javsteno STENO_TL' - - '&javsteno STENO_PL' - - '&javsteno STENO_HL' - - '&javsteno STENO_STAR1' - - '&javsteno STENO_STAR3' - - '&javsteno STENO_FR' - - '&javsteno STENO_PR' - - '&javsteno STENO_LR' - - '&javsteno STENO_TR' - - '&javsteno STENO_DR' - - '' - - '&javsteno STENO_S2' - - '&javsteno STENO_KL' - - '&javsteno STENO_WL' - - '&javsteno STENO_RL' - - '&javsteno STENO_STAR2' - - '&javsteno STENO_STAR4' - - '&javsteno STENO_RR' - - '&javsteno STENO_BR' - - '&javsteno STENO_GR' - - '&javsteno STENO_SR' - - '&javsteno STENO_ZR' - - '' - - '&javsteno STENO_A' - - '&javsteno STENO_O' - - '&javsteno STENO_E' - - '&javsteno STENO_U' + - Q + - W + - E + - R + - T + - Y + - U + - I + - O + - P + - '[' - '' + - A + - S + - D + - F + - G + - H + - J + - K + - L + - ; + - '''' + - '&td_rgb' + - C + - V + - N + - M + - {t: MUTE, h: PLAY PAUSE} FPS: - {t: '1', h: Esc} - '2'