From 7a450e6e87937b1074a03a31123365836cb37cf9 Mon Sep 17 00:00:00 2001 From: 280Zo <280Zo@users.noreply.github.com> Date: Fri, 16 Aug 2024 19:10:07 -0700 Subject: [PATCH 1/2] disable automouse & update README --- .github/workflows/draw_keymaps.yaml | 4 ++-- README.md | 7 +++--- .../charybdis_right.overlay | 2 +- config/charybdis.keymap | 4 ++-- keymap-drawer/charybdis.svg | 23 +++++++++++-------- keymap-drawer/charybdis.yaml | 10 ++++---- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/draw_keymaps.yaml b/.github/workflows/draw_keymaps.yaml index 6f4be8b1..e2c4cf2d 100644 --- a/.github/workflows/draw_keymaps.yaml +++ b/.github/workflows/draw_keymaps.yaml @@ -158,8 +158,8 @@ jobs: , "&VSplit": "VSPLIT" , "&caps_word": "CAPS WORD" , "&td_bore": "L_BASE L_EXTRA" - , "&tdtb": "TRACKBALL SCROLL" - , "&tdtb2": "SNIPE SCROLL" + , "&tdtb": "SCROLL TRACKBALL" + , "&tdtb2": "SCROLL SNIPE" } run: | get_args() { diff --git a/README.md b/README.md index 1a1bded0..b78256a7 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,11 @@ There are a few things to note about how I've chosen to configure things. - ZMK has terms for each side of a split keyboard. Central is the half that sends keyboard outputs over USB or advertises to other devices over bluetooth. Peripheral is the half that will only send keystrokes to the central once they are paired and connected through bluetooth. I have chosen the right side as central because it fits my desk layout better. - To add support for the PMW3610 sensor, [inorichi's driver](https://github.com/inorichi/zmk-pmw3610-driver?tab=readme-ov-file) is included in the firmware. - Looking at different options to include support for mouse keys (move and scroll), there are several repos out there. [krikun98](https://github.com/krikun98/zmk/tree/mouse-pr) has one that looked promising, but ultimately I settled on [petejohanson's work](https://github.com/petejohanson/zmk/blob/feat/pointers-move-scroll/docs/docs/behaviors/mouse-emulation.md). This will be included in the prebuilt firmware until ZMK merges it. +- I have disabled the automouse layer activation, but it can be reactiveated in `config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay`. ### Keymaps & Layers -There is a lot that's going on with each layer, but the only things you need to know to get started are that the red keys are what to press to activate the layer, layer names are underlined, the BT keys on the EXTRAS layer allow you to select which bluetooth pairing you want, BT-CLR clears the pairing on the selected profile, and the Slow_Trkbl layer allows you to hold that button to slow the trackball movement down for more precision. As soon as you let it go the trackball movement goes back to normal. +There is a lot that's going on with each layer, but the only things you need to know to get started are that the red keys are what to press to activate the layer, layer names are underlined, the BT keys on the EXTRAS layer allow you to select which bluetooth pairing you want, BT-CLR clears the pairing on the selected profile, and the MOUSE, SLOW, and SCROLL layers are activated by the thumb key and allow you use the mouse keys or the trackball to scroll and use the pointer. Here is how each layer is mapped out for the latest firmware. @@ -47,7 +48,7 @@ Using a GUI to generate the keymap file content is the easiest option. Head over - Wait for the pipeline to run - Download and flash the new firmware -### Flashing the Firmware +## Flashing the Firmware - Unzip the firmware.zip - Plug the right half info the computer through USB - Double press the reset button @@ -59,7 +60,7 @@ Using a GUI to generate the keymap file content is the easiest option. Head over ## Building Your Own Firmware -ZMK provide a comprehensive guide to follow when creating a [New Keyboard Shield](https://zmk.dev/docs/development/new-shield). I'll touch on some of the points here, but their docs should be what you reference when you're building your own firmware. +ZMK provides a comprehensive guide to follow when creating a [New Keyboard Shield](https://zmk.dev/docs/development/new-shield). I'll touch on some of the points here, but their docs should be what you reference when you're building your own firmware. ### File Locations diff --git a/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay b/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay index a03d2c31..ac8c5da7 100644 --- a/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay +++ b/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay @@ -53,7 +53,7 @@ /* optional features */ snipe-layers = <8>; scroll-layers = <1 2 3 9>; - automouse-layer = <7>; + // automouse-layer = <7>; }; }; diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 7d831f21..8a4187e9 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -140,9 +140,9 @@ PHOTOS { bindings = < -&trans &kp LA(LC(LS(Z))) &kp LA(LC(LS(E))) &kp LA(LC(LS(A))) &kp LA(LC(LS(S))) &kp LA(LC(LS(B))) &none &none &none &none &none &none +&trans &kp LA(LC(LS(Z))) &kp LA(LC(LS(E))) &kp LA(LC(LS(A))) &kp LA(LC(LS(S))) &kp LA(LC(LS(B))) &none &none &none &none &none &trans &kp LC(LA(E)) &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp LCTRL &none &none &none &none &none &none -&kp LS(DELETE) &kp LA(LS(A)) &kp LA(KP_N1) &kp LA(KP_N2) &kp LA(KP_N3) &none &none &none &none &none &none &trans +&kp LS(DELETE) &kp LA(LS(A)) &kp LA(KP_N1) &kp LA(KP_N2) &kp LA(KP_N3) &none &none &none &none &none &none &to 0 &trans &none &trans &trans &trans >; }; diff --git a/keymap-drawer/charybdis.svg b/keymap-drawer/charybdis.svg index 230cbdd2..0eab32dc 100644 --- a/keymap-drawer/charybdis.svg +++ b/keymap-drawer/charybdis.svg @@ -331,7 +331,7 @@ path.combo { stroke: #7f7f7f; } -TRACKBALLSCROLL +SCROLLTRACKBALL @@ -1293,9 +1293,10 @@ path.combo { stroke: #7f7f7f; } - - - + + + +▽ @@ -1402,10 +1403,12 @@ path.combo { stroke: #7f7f7f; } - - - -▽ + + + + +BASE +toggle @@ -1861,7 +1864,7 @@ path.combo { stroke: #7f7f7f; } -SNIPESCROLL +SCROLLSNIPE @@ -2091,7 +2094,7 @@ path.combo { stroke: #7f7f7f; } -TRACKBALLSCROLL +SCROLLTRACKBALL diff --git a/keymap-drawer/charybdis.yaml b/keymap-drawer/charybdis.yaml index d42e0aa9..f682637d 100644 --- a/keymap-drawer/charybdis.yaml +++ b/keymap-drawer/charybdis.yaml @@ -36,7 +36,7 @@ layers: - {t: ., h: MEH} - / - {t: PHOTOS, h: toggle} - - TRACKBALL SCROLL + - SCROLL TRACKBALL - {t: BACK SPACE, h: NUM} - {t: ESCAPE, h: NAV} - {t: RETURN, h: MOUSE} @@ -221,7 +221,7 @@ layers: - '' - '' - '' - - '' + - {t: ▽, type: trans} - FIT - LEFT - DOWN @@ -245,7 +245,7 @@ layers: - '' - '' - '' - - {t: ▽, type: trans} + - {t: BASE, h: toggle} - {t: ▽, type: trans} - '' - {t: ▽, type: trans} @@ -330,7 +330,7 @@ layers: - '' - '' - {t: ▽, type: trans} - - SNIPE SCROLL + - SCROLL SNIPE - L CLK - R CLK - {type: held} @@ -372,7 +372,7 @@ layers: - '' - '' - {t: ▽, type: trans} - - TRACKBALL SCROLL + - SCROLL TRACKBALL - L CLK - R CLK - '' From 4cc4b762aaf6438b16ee1d94cdd07eb1291fe774 Mon Sep 17 00:00:00 2001 From: 280Zo <1754228+280Zo@users.noreply.github.com> Date: Tue, 27 Aug 2024 23:58:17 -0700 Subject: [PATCH 2/2] SYM layer change for better coding positions and re-enable automouse function * disable automouse & update README * add mouse key adjustments * add comment correction * add comment correction * remove double tap mouse buttons * fix behaviour binding for left thumbs * fix action binding * fix action binding * enable automouse * change nav buttons * fix keymap * fix keymap * swap scroll and slow thumb action * swap scroll and slow thumb action * swap scroll and slow thumb action * add mouse layer back in * change mouse layer button functions * change mouse layer button functions * adjust mouse algorithm and add mouse buttons into all mouse layers * adjust mouse algorithm and add mouse buttons into all mouse layers * increase downshift time * move symbols to better coding positions * move symbols to better coding positions --------- Co-authored-by: 280Zo <280Zo@users.noreply.github.com> --- .github/workflows/draw_keymaps.yaml | 2 + .../charybdis_right.conf | 14 +- .../charybdis_right.overlay | 6 +- config/charybdis.conf | 8 +- config/charybdis.keymap | 66 ++++----- keymap-drawer/charybdis.svg | 132 ++++++++++-------- keymap-drawer/charybdis.yaml | 78 +++++------ 7 files changed, 161 insertions(+), 145 deletions(-) diff --git a/.github/workflows/draw_keymaps.yaml b/.github/workflows/draw_keymaps.yaml index e2c4cf2d..7e951484 100644 --- a/.github/workflows/draw_keymaps.yaml +++ b/.github/workflows/draw_keymaps.yaml @@ -160,6 +160,8 @@ jobs: , "&td_bore": "L_BASE L_EXTRA" , "&tdtb": "SCROLL TRACKBALL" , "&tdtb2": "SCROLL SNIPE" + , "&tdmt": "L1/BS LCLICK" + , "&tdbt": "L2/ESC RCLICK" } run: | get_args() { diff --git a/config/boards/shields/charybdis-mini-wireless/charybdis_right.conf b/config/boards/shields/charybdis-mini-wireless/charybdis_right.conf index c8d32130..a81b6208 100644 --- a/config/boards/shields/charybdis-mini-wireless/charybdis_right.conf +++ b/config/boards/shields/charybdis-mini-wireless/charybdis_right.conf @@ -1,4 +1,4 @@ - # https://zmk.dev/docs/config/power#kconfig-2 +# https://zmk.dev/docs/config/power#kconfig-2 CONFIG_ZMK_EXT_POWER=y # https://github.com/inorichi/zmk-pmw3610-driver?tab=readme-ov-file @@ -8,9 +8,9 @@ CONFIG_ZMK_MOUSE=y CONFIG_PMW3610=y # https://github.com/inorichi/zmk-pmw3610-driver/blob/main/Kconfig -CONFIG_PMW3610_SMART_ALGORITHM=y -CONFIG_PMW3610_CPI=1200 -CONFIG_PMW3610_CPI_DIVIDOR=3 +CONFIG_PMW3610_SMART_ALGORITHM=n +CONFIG_PMW3610_CPI=400 +CONFIG_PMW3610_CPI_DIVIDOR=1 CONFIG_PMW3610_SNIPE_CPI=200 CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=1 CONFIG_PMW3610_SCROLL_TICK=20 @@ -19,9 +19,9 @@ CONFIG_PMW3610_POLLING_RATE_125_SW=y # CONFIG_PMW3610_POLLING_RATE_125=y # CONFIG_PMW3610_POLLING_RATE_250=y -CONFIG_PMW3610_FORCE_AWAKE=y -# CONFIG_PMW3610_RUN_DOWNSHIFT_TIME_MS=2500 -# CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=10 +# CONFIG_PMW3610_FORCE_AWAKE=y +CONFIG_PMW3610_RUN_DOWNSHIFT_TIME_MS=2000 +CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=40 CONFIG_PMW3610_ORIENTATION_90=y CONFIG_PMW3610_INVERT_X=y diff --git a/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay b/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay index ac8c5da7..ddd8ea2f 100644 --- a/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay +++ b/config/boards/shields/charybdis-mini-wireless/charybdis_right.overlay @@ -51,9 +51,9 @@ spi-max-frequency = <2000000>; irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* optional features */ - snipe-layers = <8>; - scroll-layers = <1 2 3 9>; - // automouse-layer = <7>; + snipe-layers = <8>; + scroll-layers = <1 9>; + automouse-layer = <7>; }; }; diff --git a/config/charybdis.conf b/config/charybdis.conf index c788e8f4..3e283493 100644 --- a/config/charybdis.conf +++ b/config/charybdis.conf @@ -1,4 +1,6 @@ CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_IDLE_TIMEOUT=30000 +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=600000 CONFIG_ZMK_MOUSE=y CONFIG_BT_CTLR_TX_PWR_PLUS_8=y @@ -11,4 +13,8 @@ CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y CONFIG_ZMK_BATTERY_REPORTING=y CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y -CONFIG_ZMK_BEHAVIORS_QUEUE_SIZE=512 \ No newline at end of file +CONFIG_ZMK_BEHAVIORS_QUEUE_SIZE=512 + +CONFIG_ZMK_RGB_UNDERGLOW=n +CONFIG_WS2812_STRIP=n +CONFIG_ZMK_EXT_POWER=y \ No newline at end of file diff --git a/config/charybdis.keymap b/config/charybdis.keymap index 8a4187e9..bfc24d18 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -25,16 +25,13 @@ compatible = "zmk,behavior-tap-dance"; #binding-cells = <0>; bindings = <&httl 9 7>, <&to 0>; - tapping-term-ms = <200>; - label = "Trackball & Scroll"; + tapping-term-ms = <200>; }; tdtb2: td_slow_scroll { compatible = "zmk,behavior-tap-dance"; #binding-cells = <0>; - bindings = <&httl 9 8>, <&to 0>; - - label = "Scroll Slow & Base"; + bindings = <&httl 9 0>, <&to 8>; }; httl: ht_two_layers { @@ -79,14 +76,12 @@ compatible = "zmk,behavior-macro"; #binding-cells = <0>; bindings = <&kp LEFT_SHIFT &kp SEMI &kp LS(V) &kp LS(S) &kp LS(P) &kp RET>; - label = "VSPLIT"; }; HSplit: HSplit { compatible = "zmk,behavior-macro"; #binding-cells = <0>; bindings = <&kp LEFT_SHIFT &kp SEMI &kp LS(S) &kp LS(P) &kp RET>; - label = "HSPLIT"; }; }; @@ -95,19 +90,24 @@ BASE { bindings = < -&kp C_AC_SEARCH &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &to 4 -&hm LG(E) TAB &hm LEFT_GUI A &hm LEFT_ALT S &hm LCTRL D &hm LEFT_SHIFT F &kp G &kp H &hm LEFT_SHIFT J &hm RCTRL K &hm RIGHT_ALT L &hm LEFT_META SEMICOLON &kp DEL -&kp LA(LC(T)) &kp Z &mt LC(LA(LEFT_SHIFT)) X &mt LA(LC(LG(LEFT_SHIFT))) C &kp V &kp B &kp N &kp M &mt LA(LC(LG(LEFT_SHIFT))) COMMA &mt LC(LA(LEFT_SHIFT)) PERIOD &kp FSLH &to 5 - &tdtb < 1 BACKSPACE < 2 ESCAPE < 7 RETURN < 3 SPACE +// ╭────────────────┬──────────────┬─────────────────────────┬─────────────────────────────┬──────────────────┬──────────────╮ ╭──────────────┬─────────────────┬──────────────────────────────────┬──────────────────────────────┬────────────────────────┬─────────╮ + &kp C_AC_SEARCH &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &to 4 +// ├────────────────┼──────────────┼─────────────────────────┼─────────────────────────────┼──────────────────┼──────────────┤ ├──────────────┼─────────────────┼──────────────────────────────────┼──────────────────────────────┼────────────────────────┼─────────┤ + &hm LG(E) TAB &hm LEFT_GUI A &hm LEFT_ALT S &hm LCTRL D &hm LEFT_SHIFT F &kp G &kp H &hm LEFT_SHIFT J &hm RCTRL K &hm RIGHT_ALT L &hm LEFT_META SEMICOLON &kp DEL +// ├────────────────┼──────────────┼─────────────────────────┼─────────────────────────────┼──────────────────┼──────────────┤ ├──────────────┼─────────────────┼──────────────────────────────────┼──────────────────────────────┼────────────────────────┼─────────┤ + &kp LA(LC(T)) &kp Z &hm LC(LA(LEFT_SHIFT)) X &hm LA(LC(LG(LEFT_SHIFT))) C &kp V &kp B &kp N &kp M &hm LA(LC(LG(LEFT_SHIFT))) COMMA &hm LC(LA(LEFT_SHIFT)) PERIOD &kp FSLH &to 5 +// ╰────────────────┴──────────────┴─────────────────────────┼─────────────────────────────┼──────────────────┼──────────────┤ ├──────────────┼─────────────────┼──────────────────────────────────┴──────────────────────────────┴────────────────────────┴─────────╯ + &tdtb2 < 1 BACKSPACE < 2 ESCAPE < 7 RETURN < 3 SPACE + // ╰─────────────────────────────┴──────────────────┴──────────────╯ ╰──────────────┴────────────╯ >; }; NUM { bindings = < -&none &none &none &none &none &none &kp SLASH &hm F7 N7 &hm F8 N8 &hm F9 N9 &hm F10 MINUS &none -&none &none &none &none &kp BACKSPACE &none &kp ASTRK &hm F4 N4 &hm F5 N5 &hm F6 N6 &hm F11 PLUS &none -&none &none &none &none &none &none &kp DOT &hm F1 N1 &hm F2 N2 &hm F3 N3 &hm F12 EQUAL &trans - &none &none &none &kp N0 &none +&none &none &none &none &none &none &kp SLASH &hm F7 N7 &hm F8 N8 &hm F9 N9 &hm F10 MINUS &none +&kp TAB &none &none &none &kp BACKSPACE &none &kp ASTRK &hm F4 N4 &hm F5 N5 &hm F6 N6 &hm F11 PLUS &none +&none &none &none &none &none &none &kp DOT &hm F1 N1 &hm F2 N2 &hm F3 N3 &hm F12 EQUAL &none + &none &none &none &kp N0 &none >; }; @@ -115,17 +115,17 @@ bindings = < &none &none &none &none &none &none &none &kp LS(LC(H)) &kp LS(LC(J)) &kp LS(LC(K)) &kp LS(LC(L)) &none &trans &trans &trans &trans &trans &trans &VSplit &kp LEFT_ARROW &kp DOWN &kp UP &kp RIGHT_ARROW &none -&none &none &none &none &none &none &HSplit &kp HOME &kp PG_DN &kp PG_UP &kp END &trans +&none &none &none &none &none &none &HSplit &kp HOME &kp PG_DN &kp PG_UP &kp END &none &none &none &trans &trans &trans >; }; SYM { bindings = < -&none &kp SQT &kp CARET &kp PLUS &kp ASTRK &kp BSLH &kp GRAVE &kp TILDE &kp LEFT_BRACE &kp RIGHT_BRACE &kp AMPS &none -&kp PRCNT &hm LEFT_META EXCLAMATION &hm LEFT_ALT LT &hm LCTRL GT &hm LEFT_SHIFT SPACE &kp SLASH &kp COLON &mt LEFT_SHIFT SPACE &hm LCTRL LPAR &hm LEFT_ALT RPAR &kp HASH &none -&none &kp DQT &kp DLLR &kp EQUAL &kp MINUS &kp PIPE &kp SEMICOLON &kp UNDERSCORE &kp LBKT &kp RBKT &kp AT_SIGN &trans - &trans &trans &trans &none &trans +&none &kp PLUS &kp LEFT_BRACE &kp RIGHT_BRACE &kp MINUS &kp COLON &kp BSLH &kp GRAVE &kp DLLR &kp CARET &kp SQT &none +&none &hm LEFT_META EXCL &hm LEFT_ALT LPAR &hm LCTRL RPAR &hm LEFT_SHIFT SPACE &kp TILDE &kp SLASH &hm LEFT_SHIFT SPACE &hm LCTRL LT &hm LEFT_ALT GT &kp HASH &none +&none &kp EQUAL &kp LBKT &kp RBKT &kp UNDERSCORE &kp SEMICOLON &kp PIPE &kp ASTRK &kp AMPS &kp PRCNT &kp AT_SIGN &none + &trans &trans &trans &none &trans >; }; @@ -133,7 +133,7 @@ bindings = < &kp N1 &kp TAB &kp Q &kp W &kp E &kp R &none &none &none &none &none &to 0 &kp N2 &kp LCTRL &kp A &kp S &kp D &kp F &none &none &none &none &none &none -&kp N3 &kp LSHFT &kp Z &kp X &kp C &kp V &none &none &none &none &none &trans +&kp N3 &kp LSHFT &kp Z &kp X &kp C &kp V &none &none &none &none &none &none &trans &kp SPACE &kp LEFT_ALT &none &none >; }; @@ -158,28 +158,28 @@ MOUSE { bindings = < -&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none -&none &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp LEFT_META &none -&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &trans - &tdtb2 &mkp LCLK &mkp RCLK &none &none +&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none +&kp TAB &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp LEFT_META &none +&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &none + &tdtb2 &mkp LCLK &mkp RCLK &kp RETURN < 3 SPACE >; }; SLOW { bindings = < -&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none -&none &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp LEFT_META &none -&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &trans - &tdtb &mkp LCLK &mkp RCLK &none &none +&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none +&kp TAB &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp LEFT_META &none +&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &none + &tdtb2 &mkp LCLK &mkp RCLK &kp RETURN < 3 SPACE >; }; SCROLL { bindings = < -&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none -&none &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp LEFT_META &none -&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &trans - &tog 9 &mkp LCLK &mkp RCLK &none &none +&none &msc MOVE_LEFT &msc MOVE_UP &mmv MOVE_UP &msc MOVE_DOWN &msc MOVE_RIGHT &none &none &none &none &none &none +&kp TAB &mkp MB4 &mmv MOVE_LEFT &mmv MOVE_DOWN &mmv MOVE_RIGHT &mkp MB5 &none &kp RIGHT_SHIFT &kp RCTRL &kp LEFT_ALT &kp LEFT_META &none +&none &kp C_AC_UNDO &kp C_AC_CUT &kp C_AC_COPY &kp C_AC_PASTE &mkp MCLK &none &none &none &none &none &none + &tdtb2 &mkp LCLK &mkp RCLK &kp RETURN < 3 SPACE >; }; }; diff --git a/keymap-drawer/charybdis.svg b/keymap-drawer/charybdis.svg index 0eab32dc..1157961c 100644 --- a/keymap-drawer/charybdis.svg +++ b/keymap-drawer/charybdis.svg @@ -331,7 +331,7 @@ path.combo { stroke: #7f7f7f; } -SCROLLTRACKBALL +SCROLLSNIPE @@ -449,6 +449,7 @@ path.combo { stroke: #7f7f7f; } +TAB @@ -559,10 +560,9 @@ path.combo { stroke: #7f7f7f; } = F12 - - - -▽ + + + @@ -770,10 +770,9 @@ path.combo { stroke: #7f7f7f; } END - - - -▽ + + + @@ -817,52 +816,52 @@ path.combo { stroke: #7f7f7f; } -' ++ -^ +{ -+ +} -* +- -\ +: -` +\ -~ +` -{ +$ -} +^ -& +' @@ -871,7 +870,6 @@ path.combo { stroke: #7f7f7f; } -% @@ -882,13 +880,13 @@ path.combo { stroke: #7f7f7f; } -< +( LEFT ALT -> +) LCTRL @@ -900,12 +898,12 @@ path.combo { stroke: #7f7f7f; } -/ +~ -: +/ @@ -916,13 +914,13 @@ path.combo { stroke: #7f7f7f; } -( +< LCTRL -) +> LEFT ALT @@ -941,57 +939,56 @@ path.combo { stroke: #7f7f7f; } -" += -$ +[ -= +] -- +_ -| +; -; +| -_ +* -[ +& -] +% @ - - - -▽ + + + @@ -1190,10 +1187,9 @@ path.combo { stroke: #7f7f7f; } - - - -▽ + + + @@ -1738,6 +1734,7 @@ path.combo { stroke: #7f7f7f; } +TAB @@ -1855,10 +1852,9 @@ path.combo { stroke: #7f7f7f; } - - - -▽ + + + @@ -1884,11 +1880,15 @@ path.combo { stroke: #7f7f7f; } +RETURN - +SPACE + +SYM + @@ -1968,6 +1968,7 @@ path.combo { stroke: #7f7f7f; } +TAB @@ -2085,16 +2086,15 @@ path.combo { stroke: #7f7f7f; } - - - -▽ + + + -SCROLLTRACKBALL +SCROLLSNIPE @@ -2114,11 +2114,15 @@ path.combo { stroke: #7f7f7f; } +RETURN - +SPACE + +SYM + @@ -2198,6 +2202,7 @@ path.combo { stroke: #7f7f7f; } +TAB @@ -2315,17 +2320,16 @@ path.combo { stroke: #7f7f7f; } - - - -▽ + + + - -SCROLL -toggle + +SCROLLSNIPE + @@ -2344,11 +2348,15 @@ path.combo { stroke: #7f7f7f; } +RETURN - +SPACE + +SYM + diff --git a/keymap-drawer/charybdis.yaml b/keymap-drawer/charybdis.yaml index f682637d..e27d1eeb 100644 --- a/keymap-drawer/charybdis.yaml +++ b/keymap-drawer/charybdis.yaml @@ -36,7 +36,7 @@ layers: - {t: ., h: MEH} - / - {t: PHOTOS, h: toggle} - - SCROLL TRACKBALL + - SCROLL SNIPE - {t: BACK SPACE, h: NUM} - {t: ESCAPE, h: NAV} - {t: RETURN, h: MOUSE} @@ -54,7 +54,7 @@ layers: - {t: '9', h: F9} - {t: '-', h: F10} - '' - - '' + - TAB - '' - '' - '' @@ -77,7 +77,7 @@ layers: - {t: '2', h: F2} - {t: '3', h: F3} - {t: '=', h: F12} - - {t: ▽, type: trans} + - '' - '' - {type: held} - '' @@ -119,7 +119,7 @@ layers: - PG DN - PG UP - END - - {t: ▽, type: trans} + - '' - '' - '' - {type: held} @@ -127,41 +127,41 @@ layers: - {t: ▽, type: trans} SYM: - '' - - '''' - - ^ - + - - '*' - - \ - - '`' - - '~' - '{' - '}' - - '&' + - '-' + - ':' + - \ + - '`' + - $ + - ^ + - '''' + - '' - '' - - '%' - {t: '!', h: LEFT META} - - {t: <, h: LEFT ALT} - - {t: '>', h: LCTRL} + - {t: (, h: LEFT ALT} + - {t: ), h: LCTRL} - {t: SPACE, h: LEFT SHIFT} + - '~' - / - - ':' - {t: SPACE, h: LEFT SHIFT} - - {t: (, h: LCTRL} - - {t: ), h: LEFT ALT} + - {t: <, h: LCTRL} + - {t: '>', h: LEFT ALT} - '#' - '' - '' - - '"' - - $ - '=' - - '-' - - '|' - - ; - - _ - '[' - ']' + - _ + - ; + - '|' + - '*' + - '&' + - '%' - '@' - - {t: ▽, type: trans} + - '' - {t: ▽, type: trans} - {t: ▽, type: trans} - {t: ▽, type: trans} @@ -203,7 +203,7 @@ layers: - '' - '' - '' - - {t: ▽, type: trans} + - '' - {t: ▽, type: trans} - SPACE - LEFT ALT @@ -306,7 +306,7 @@ layers: - '' - '' - '' - - '' + - TAB - BACK - MOVE L - MOVE D @@ -329,12 +329,12 @@ layers: - '' - '' - '' - - {t: ▽, type: trans} + - '' - SCROLL SNIPE - L CLK - R CLK - - {type: held} - - '' + - {t: RETURN, type: held} + - {t: SPACE, h: SYM} SLOW: - '' - WHEEL L @@ -348,7 +348,7 @@ layers: - '' - '' - '' - - '' + - TAB - BACK - MOVE L - MOVE D @@ -371,12 +371,12 @@ layers: - '' - '' - '' - - {t: ▽, type: trans} - - SCROLL TRACKBALL + - '' + - SCROLL SNIPE - L CLK - R CLK - - '' - - '' + - RETURN + - {t: SPACE, h: SYM} SCROLL: - '' - WHEEL L @@ -390,7 +390,7 @@ layers: - '' - '' - '' - - '' + - TAB - BACK - MOVE L - MOVE D @@ -413,12 +413,12 @@ layers: - '' - '' - '' - - {t: ▽, type: trans} - - {t: SCROLL, h: toggle} + - '' + - SCROLL SNIPE - L CLK - R CLK - - '' - - '' + - RETURN + - {t: SPACE, h: SYM} combos: - p: [8, 9] k: DELETE