diff options
| -rw-r--r-- | config/boards/shields/charybdis/charybdis_right.conf | 18 | ||||
| -rw-r--r-- | config/boards/shields/charybdis/charybdis_right.overlay | 38 | ||||
| -rw-r--r-- | config/charybdis.keymap (renamed from config/boards/shields/charybdis/charybdis.keymap) | 0 | ||||
| -rw-r--r-- | config/charybdis_right.conf | 19 | ||||
| -rw-r--r-- | config/charybdis_right.overlay | 38 | ||||
| -rw-r--r-- | config/info.json | 136 |
6 files changed, 147 insertions, 102 deletions
diff --git a/config/boards/shields/charybdis/charybdis_right.conf b/config/boards/shields/charybdis/charybdis_right.conf index 5fc8661..e69de29 100644 --- a/config/boards/shields/charybdis/charybdis_right.conf +++ b/config/boards/shields/charybdis/charybdis_right.conf @@ -1,18 +0,0 @@ -CONFIG_SPI=y -CONFIG_INPUT=y -CONFIG_ZMK_MOUSE=y - -CONFIG_ZMK_EXT_POWER=y - -CONFIG_PMW3610=y -CONFIG_PMW3610_CPI=2400 -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_INVERT_X=y - -CONFIG_PMW3610_POLLING_RATE_125_SW=y - -CONFIG_PMW3610_SMART_ALGORITHM=y diff --git a/config/boards/shields/charybdis/charybdis_right.overlay b/config/boards/shields/charybdis/charybdis_right.overlay index efc259e..053d103 100644 --- a/config/boards/shields/charybdis/charybdis_right.overlay +++ b/config/boards/shields/charybdis/charybdis_right.overlay @@ -23,42 +23,4 @@ , <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; -}; - -&pinctrl { - spi0_default: spi0_default { - group1 { - psels = <NRF_PSEL(SPIM_SCK, 0, 8)>, - <NRF_PSEL(SPIM_MOSI, 0, 17)>, - <NRF_PSEL(SPIM_MISO, 0, 17)>; - }; - }; - - spi0_sleep: spi0_sleep { - group1 { - psels = <NRF_PSEL(SPIM_SCK, 0, 8)>, - <NRF_PSEL(SPIM_MOSI, 0, 17)>, - <NRF_PSEL(SPIM_MISO, 0, 17)>; - low-power-enable; - }; - }; -}; - -&spi0 { - status = "okay"; - compatible = "nordic,nrf-spim"; - pinctrl-0 = <&spi0_default>; - pinctrl-1 = <&spi0_sleep>; - pinctrl-names = "default", "sleep"; - cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; - - trackball: trackball@0 { - status = "okay"; - compatible = "pixart,pmw3610"; - reg = <0>; - spi-max-frequency = <2000000>; - irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - scroll-layers = <1>; - snipe-layers = <5>; - }; }; \ No newline at end of file diff --git a/config/boards/shields/charybdis/charybdis.keymap b/config/charybdis.keymap index c40464a..c40464a 100644 --- a/config/boards/shields/charybdis/charybdis.keymap +++ b/config/charybdis.keymap diff --git a/config/charybdis_right.conf b/config/charybdis_right.conf new file mode 100644 index 0000000..0fdc91d --- /dev/null +++ b/config/charybdis_right.conf @@ -0,0 +1,19 @@ +CONFIG_SPI=y +CONFIG_INPUT=y +CONFIG_ZMK_MOUSE=y + +CONFIG_ZMK_EXT_POWER=y + +CONFIG_PMW3610=y +CONFIG_PMW3610_CPI=2400 +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_INVERT_X=y +CONFIG_PMW3610_AUTOMOUSE_TIMEOUT_MS=750 + +CONFIG_PMW3610_POLLING_RATE_125_SW=y + +CONFIG_PMW3610_SMART_ALGORITHM=y diff --git a/config/charybdis_right.overlay b/config/charybdis_right.overlay new file mode 100644 index 0000000..706e562 --- /dev/null +++ b/config/charybdis_right.overlay @@ -0,0 +1,38 @@ +&pinctrl { + spi0_default: spi0_default { + group1 { + psels = <NRF_PSEL(SPIM_SCK, 0, 8)>, + <NRF_PSEL(SPIM_MOSI, 0, 17)>, + <NRF_PSEL(SPIM_MISO, 0, 17)>; + }; + }; + + spi0_sleep: spi0_sleep { + group1 { + psels = <NRF_PSEL(SPIM_SCK, 0, 8)>, + <NRF_PSEL(SPIM_MOSI, 0, 17)>, + <NRF_PSEL(SPIM_MISO, 0, 17)>; + low-power-enable; + }; + }; +}; + +&spi0 { + status = "okay"; + compatible = "nordic,nrf-spim"; + pinctrl-0 = <&spi0_default>; + pinctrl-1 = <&spi0_sleep>; + pinctrl-names = "default", "sleep"; + cs-gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; + + trackball: trackball@0 { + status = "okay"; + compatible = "pixart,pmw3610"; + reg = <0>; + spi-max-frequency = <2000000>; + irq-gpios = <&gpio0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + scroll-layers = <1>; + // snipe-layers = <>; + automouse-layer = <5>; + }; +}; \ No newline at end of file diff --git a/config/info.json b/config/info.json index 630f8ed..4ca9636 100644 --- a/config/info.json +++ b/config/info.json @@ -1,53 +1,97 @@ { "id": "charybdis", - "name": "charybdis", + "name": "Charybdis", "layouts": { - "default": { + "default_transform": { + "name": "default_transform", "layout": [ - { "label": "Tab", "row": 0, "col": 0, "x": 0, "y": 0.36 }, - { "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 }, - { "label": "T", "row": 0, "col": 5, "x": 5, "y": 0.235 }, - { "label": "Y", "row": 0, "col": 7, "x": 9, "y": 0.235 }, - { "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": "BSPC", "row": 0, "col": 12, "x": 14, "y": 0.36 }, - - { "label": "Ctrl", "row": 1, "col": 0, "x": 0, "y": 1.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 }, - { "label": "G", "row": 1, "col": 5, "x": 5, "y": 1.235 }, - { "label": "H", "row": 1, "col": 7, "x": 9, "y": 1.235 }, - { "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": "'", "row": 1, "col": 12, "x": 14, "y": 1.36 }, - - { "label": "LShift", "row": 2, "col": 0, "x": 0, "y": 2.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 }, - { "label": "B", "row": 2, "col": 5, "x": 5, "y": 2.235 }, - { "label": "N", "row": 2, "col": 7, "x": 9, "y": 2.235 }, - { "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": "Esc", "row": 2, "col": 12, "x": 14, "y": 2.36 }, - - { "label": "GUI", "row": 3, "col": 3, "x": 3.48, "y": 3.13, "r": 0 }, - { "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 }, - { "label": "ENT", "row": 3, "col": 7, "x": 10.52, "y": 3.1, "r": -30, "rx": 11.02, "ry": 7.63 }, - { "label": "RSE", "row": 3, "col": 8, "x": 10.52, "y": 3.13, "r": -15, "rx": 11.02, "ry": 7.63 } + { "row": 0, "col": 0, "x": 0, "y": 0.575 }, + { "row": 0, "col": 1, "x": 1, "y": 0.575 }, + { "row": 0, "col": 2, "x": 2, "y": 0.125 }, + { "row": 0, "col": 3, "x": 3, "y": 0 }, + { "row": 0, "col": 4, "x": 4, "y": 0.125 }, + { "row": 0, "col": 5, "x": 5, "y": 0.125 }, + { "row": 0, "col": 7, "x": 9, "y": 0.125 }, + { "row": 0, "col": 8, "x": 10, "y": 0.125 }, + { "row": 0, "col": 9, "x": 11, "y": 0 }, + { "row": 0, "col": 10, "x": 12, "y": 0.125 }, + { "row": 0, "col": 11, "x": 13, "y": 0.575 }, + { "row": 0, "col": 12, "x": 14, "y": 0.575 }, + + { "row": 1, "col": 0, "x": 0, "y": 1.575 }, + { "row": 1, "col": 1, "x": 1, "y": 1.575 }, + { "row": 1, "col": 2, "x": 2, "y": 1.125 }, + { "row": 1, "col": 3, "x": 3, "y": 1 }, + { "row": 1, "col": 4, "x": 4, "y": 1.125 }, + { "row": 1, "col": 5, "x": 5, "y": 1.125 }, + { "row": 1, "col": 7, "x": 9, "y": 1.125 }, + { "row": 1, "col": 8, "x": 10, "y": 1.125 }, + { "row": 1, "col": 9, "x": 11, "y": 1 }, + { "row": 1, "col": 10, "x": 12, "y": 1.125 }, + { "row": 1, "col": 11, "x": 13, "y": 1.575 }, + { "row": 1, "col": 12, "x": 14, "y": 1.575 }, + + { "row": 2, "col": 0, "x": 0, "y": 2.575 }, + { "row": 2, "col": 1, "x": 1, "y": 2.575 }, + { "row": 2, "col": 2, "x": 2, "y": 2.125 }, + { "row": 2, "col": 3, "x": 3, "y": 2 }, + { "row": 2, "col": 4, "x": 4, "y": 2.125 }, + { "row": 2, "col": 5, "x": 5, "y": 2.125 }, + { "row": 2, "col": 7, "x": 9, "y": 2.125 }, + { "row": 2, "col": 8, "x": 10, "y": 2.125 }, + { "row": 2, "col": 9, "x": 11, "y": 2 }, + { "row": 2, "col": 10, "x": 12, "y": 2.125 }, + { "row": 2, "col": 11, "x": 13, "y": 2.575 }, + { "row": 2, "col": 12, "x": 14, "y": 2.575 }, + + { "row": 3, "col": 3, "x": 3.48, "y": 3.125, "r": 0 }, + { "row": 3, "col": 4, "x": 3.48, "y": 3.125, "r": 15, "rx": 3.98, "ry": 7.895 }, + { "row": 3, "col": 5, "x": 3.48, "y": 3.125, "r": 30, "rx": 3.98, "ry": 7.895, "h": 1 }, + { "row": 3, "col": 7, "x": 10.52, "y": 3.125, "r": -30, "rx": 11.02, "ry": 7.895, "h": 1 }, + { "row": 3, "col": 8, "x": 10.52, "y": 3.125, "r": -15, "rx": 11.02, "ry": 7.895 } + ] + }, + "five_column_transform": { + "name": "five_column_transform", + "layout": [ + { "row": 0, "col": 1, "x": 0, "y": 0.575 }, + { "row": 0, "col": 2, "x": 1, "y": 0.125 }, + { "row": 0, "col": 3, "x": 2, "y": 0 }, + { "row": 0, "col": 4, "x": 3, "y": 0.125 }, + { "row": 0, "col": 5, "x": 4, "y": 0.125 }, + { "row": 0, "col": 7, "x": 8, "y": 0.125 }, + { "row": 0, "col": 8, "x": 9, "y": 0.125 }, + { "row": 0, "col": 9, "x": 10, "y": 0 }, + { "row": 0, "col": 10, "x": 11, "y": 0.125 }, + { "row": 0, "col": 11, "x": 12, "y": 0.575 }, + + { "row": 1, "col": 1, "x": 0, "y": 1.575 }, + { "row": 1, "col": 2, "x": 1, "y": 1.125 }, + { "row": 1, "col": 3, "x": 2, "y": 1 }, + { "row": 1, "col": 4, "x": 3, "y": 1.125 }, + { "row": 1, "col": 5, "x": 4, "y": 1.125 }, + { "row": 1, "col": 7, "x": 8, "y": 1.125 }, + { "row": 1, "col": 8, "x": 9, "y": 1.125 }, + { "row": 1, "col": 9, "x": 10, "y": 1 }, + { "row": 1, "col": 10, "x": 11, "y": 1.125 }, + { "row": 1, "col": 11, "x": 12, "y": 1.575 }, + + { "row": 2, "col": 1, "x": 0, "y": 2.575 }, + { "row": 2, "col": 2, "x": 1, "y": 2.125 }, + { "row": 2, "col": 3, "x": 2, "y": 2 }, + { "row": 2, "col": 4, "x": 3, "y": 2.125 }, + { "row": 2, "col": 5, "x": 4, "y": 2.125 }, + { "row": 2, "col": 7, "x": 8, "y": 2.125 }, + { "row": 2, "col": 8, "x": 9, "y": 2.125 }, + { "row": 2, "col": 9, "x": 10, "y": 2 }, + { "row": 2, "col": 10, "x": 11, "y": 2.125 }, + { "row": 2, "col": 11, "x": 12, "y": 2.575 }, + + { "row": 3, "col": 3, "x": 2.48, "y": 3.125, "r": 0 }, + { "row": 3, "col": 4, "x": 2.48, "y": 3.125, "r": 15, "rx": 2.98, "ry": 7.895 }, + { "row": 3, "col": 5, "x": 2.48, "y": 3.125, "r": 30, "rx": 2.98, "ry": 7.895, "h": 1 }, + { "row": 3, "col": 7, "x": 9.52, "y": 3.125, "r": -30, "rx": 10.02, "ry": 7.895, "h": 1 }, + { "row": 3, "col": 8, "x": 9.52, "y": 3.125, "r": -15, "rx": 10.02, "ry": 7.895 } ] } }, |