diff --git a/config/boards/shields/charybdis/charybdis_left.conf b/config/boards/shields/charybdis/charybdis_left.conf index d3f5a12f..e69de29b 100644 --- a/config/boards/shields/charybdis/charybdis_left.conf +++ b/config/boards/shields/charybdis/charybdis_left.conf @@ -1 +0,0 @@ - diff --git a/config/boards/shields/charybdis/charybdis_left.overlay b/config/boards/shields/charybdis/charybdis_left.overlay index 80e99b70..1a1bad9e 100644 --- a/config/boards/shields/charybdis/charybdis_left.overlay +++ b/config/boards/shields/charybdis/charybdis_left.overlay @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: MIT */ - + #include "charybdis.dtsi" @@ -16,4 +16,4 @@ , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; -}; +}; \ No newline at end of file diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index ea75b1c2..cbb9994b 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -1,26 +1,28 @@ CONFIG_SPI=y CONFIG_INPUT=y +CONFIG_PMW3610=y CONFIG_ZMK_MOUSE=y - CONFIG_ZMK_EXT_POWER=y -CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=3000 -CONFIG_PMW3610_CPI_DIVIDOR=4 -CONFIG_PMW3610_ORIENTATION_90=y -CONFIG_PMW3610_SNIPE_CPI=800 -CONFIG_PMW3610_SNIPE_CPI_DIVIDOR=4 -CONFIG_PMW3610_SCROLL_TICK=32 +CONFIG_PMW3610_SWAP_XY=y CONFIG_PMW3610_INVERT_X=y -CONFIG_PMW3610_INVERT_SCROLL_Y=n +CONFIG_PMW3610_INVERT_Y=y +CONFIG_PMW3610_REPORT_INTERVAL_MIN=13 + +#CONFIG_BT_PERIPHERAL_PREF_MAX_INT=9 +#CONFIG_BT_PERIPHERAL_PREF_LATENCY=16 +#CONFIG_BT_BUF_ACL_TX_COUNT=32 +#CONFIG_BT_L2CAP_TX_BUF_COUNT=32 + +#CONFIG_SPI_LOG_LEVEL_DBG=y + CONFIG_PMW3610_RUN_DOWNSHIFT_TIME_MS=3264 CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=20 -#CONFIG_PMW3610_REST1_DOWNSHIFT_TIME_MS=9600 -#CONFIG_PMW3610_REST2_SAMPLE_TIME_MS= -#CONFIG_PMW3610_REST2_DOWNSHIFT_TIME_MS= -#CONFIG_PMW3610_REST3_SAMPLE_TIME_MS= -#CONFIG_PMW3610_REST3_DOWNSHIFT_TIME_MS= -#CONFIG_PMW3610_FORCE_AWAKE=n -CONFIG_PMW3610_POLLING_RATE_125_SW=y +#CONFIG_PMW3610_REST1_SAMPLE_TIME_MS=100 +#CONFIG_PMW3610_REST2_SAMPLE_TIME_MS=200 +#CONFIG_PMW3610_REST3_SAMPLE_TIME_MS=300 +#CONFIG_PMW3610_RUN_DOWNSHIFT_TIME_MS=500 +#CONFIG_PMW3610_REST1_DOWNSHIFT_TIME_MS=3000 +#CONFIG_PMW3610_REST2_DOWNSHIFT_TIME_MS=30000 -CONFIG_PMW3610_SMART_ALGORITHM=y +CONFIG_ZMK_SLEEP=y diff --git a/config/charybdis.keymap b/config/charybdis.keymap index fef18e20..a27bf782 100644 --- a/config/charybdis.keymap +++ b/config/charybdis.keymap @@ -92,12 +92,22 @@ bindings = < &kp LEFT_BRACKET &kp N7 &kp N8 &kp N9 &kp RIGHT_BRACKET &none &none &none &none &none &kp SEMICOLON &kp NUMBER_4 &kp N5 &kp NUMBER_6 &kp EQUAL &none &kp LEFT_SHIFT &kp LEFT_CONTROL &kp LEFT_ALT &kp LEFT_GUI + &kp GRAVE &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp BACKSLASH &none &none &none &none &none + &kp N0 &kp MINUS &none &none + + >; + }; + + NUM { + bindings = < + &kp LEFT_BRACKET &kp N7 &kp N8 &kp N9 &kp RIGHT_BRACKET &none &none &none &none &none + &kp SEMICOLON &kp NUMBER_4 &kp N5 &kp NUMBER_6 &kp EQUAL &none &kp LEFT_SHIFT &kp LEFT_CONTROL &kp LEFT_ALT &kp LEFT_GUI &kp GRAVE &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp BACKSLASH &none &none &none &none &none &kp N0 &kp MINUS &none &none >; }; - SCROLL { + FUN { bindings = < &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans diff --git a/config/info.json b/config/info.json index f3751c07..28422bb6 100644 --- a/config/info.json +++ b/config/info.json @@ -4,7 +4,6 @@ "layouts": { "default": { "layout": [ - { "label": "Q", "row": 0, "col": 1, "x": 1, "y": 0.36 }, { "label": "W", "row": 0, "col": 2, "x": 2, "y": 0.11 }, { "label": "E", "row": 0, "col": 3, "x": 3, "y": -0.015 }, { "label": "R", "row": 0, "col": 4, "x": 4, "y": 0.11 }, @@ -13,9 +12,7 @@ { "label": "U", "row": 0, "col": 8, "x": 10, "y": 0.11 }, { "label": "I", "row": 0, "col": 9, "x": 11, "y": -0.015 }, { "label": "O", "row": 0, "col": 10, "x": 12, "y": 0.11 }, - { "label": "P", "row": 0, "col": 11, "x": 13, "y": 0.36 }, - - { "label": "A", "row": 1, "col": 1, "x": 1, "y": 1.36 }, + { "label": "S", "row": 1, "col": 2, "x": 2, "y": 1.11 }, { "label": "D", "row": 1, "col": 3, "x": 3, "y": 0.985 }, { "label": "F", "row": 1, "col": 4, "x": 4, "y": 1.11 }, @@ -24,9 +21,7 @@ { "label": "J", "row": 1, "col": 8, "x": 10, "y": 1.11 }, { "label": "K", "row": 1, "col": 9, "x": 11, "y": 0.985 }, { "label": "L", "row": 1, "col": 10, "x": 12, "y": 1.11 }, - { "label": ";", "row": 1, "col": 11, "x": 13, "y": 1.36 }, - { "label": "Z", "row": 2, "col": 1, "x": 1, "y": 2.36 }, { "label": "X", "row": 2, "col": 2, "x": 2, "y": 2.11 }, { "label": "C", "row": 2, "col": 3, "x": 3, "y": 1.985 }, { "label": "V", "row": 2, "col": 4, "x": 4, "y": 2.11 }, @@ -35,7 +30,6 @@ { "label": "M", "row": 2, "col": 8, "x": 10, "y": 2.11 }, { "label": ",", "row": 2, "col": 9, "x": 11, "y": 1.985 }, { "label": ".", "row": 2, "col": 10, "x": 12, "y": 2.11 }, - { "label": "/", "row": 2, "col": 11, "x": 13, "y": 2.36 }, { "label": "LWR", "row": 3, "col": 4, "x": 3.48, "y": 3.13, "r": 15, "rx": 3.98, "ry": 7.63 }, { "label": "SPC", "row": 3, "col": 5, "x": 3.48, "y": 3.1, "r": 30, "rx": 3.98, "ry": 7.63 }, diff --git a/config/west.yml b/config/west.yml index 1d2a57aa..75611ae3 100644 --- a/config/west.yml +++ b/config/west.yml @@ -2,15 +2,23 @@ manifest: remotes: - name: zmkfirmware url-base: https://github.com/petejohanson - - name: inorichi - url-base: https://github.com/inorichi + - name: badjeff + url-base: https://github.com/badjeff + # Additional modules containing boards/shields/custom code can be listed here as well + # See https://docs.zephyrproject.org/3.2.0/develop/west/manifest.html#projects projects: - name: zmk remote: zmkfirmware revision: feat/pointers-move-scroll import: app/west.yml - name: zmk-pmw3610-driver - remote: inorichi + remote: badjeff + revision: main + - name: zmk-split-peripheral-input-relay + remote: badjeff + revision: main + - name: zmk-input-behavior-listener + remote: badjeff revision: main self: - path: config \ No newline at end of file + path: config