From b831100371eff98f314dc414361533e47483cd0b Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 28 Jun 2023 10:14:32 +0300 Subject: [PATCH] removed corne, added charybdis config --- build.yaml | 4 +-- config/charybdis.conf | 8 ++++++ config/charybdis.keymap | 45 +++++++++++++++++++++++++++++ config/charybdis_right.conf | 20 +++++++++++++ config/corne.conf | 6 ---- config/corne.keymap | 56 ------------------------------------- config/west.yml | 4 +-- 7 files changed, 77 insertions(+), 66 deletions(-) create mode 100644 config/charybdis.conf create mode 100644 config/charybdis.keymap create mode 100644 config/charybdis_right.conf delete mode 100644 config/corne.conf delete mode 100644 config/corne.keymap diff --git a/build.yaml b/build.yaml index 7ab5d6a..d983bc7 100644 --- a/build.yaml +++ b/build.yaml @@ -14,6 +14,6 @@ --- include: - board: nice_nano_v2 - shield: corne_left + shield: charybdis_left - board: nice_nano_v2 - shield: corne_right + shield: charybdis_right diff --git a/config/charybdis.conf b/config/charybdis.conf new file mode 100644 index 0000000..8895d34 --- /dev/null +++ b/config/charybdis.conf @@ -0,0 +1,8 @@ +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y + +CONFIG_BT_LL_SW_LLCP_LEGACY=y + +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 \ No newline at end of file diff --git a/config/charybdis.keymap b/config/charybdis.keymap new file mode 100644 index 0000000..1ad4e68 --- /dev/null +++ b/config/charybdis.keymap @@ -0,0 +1,45 @@ +#include +#include +#include +#include +#include + +/ { + + keymap { + compatible = "zmk,keymap"; + + Base { + label = "Base"; + bindings = < + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS + &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHIFT + &kp LCTRL &mo 1 &kp SPACE &kp RET &mo 2 + >; + trackball-bindings = <&tmv_coarse>; + }; + + Lower { + label = "Lower"; + bindings = < + &trans &kp K_PP &kp UP &kp N1 &kp N2 &kp N3 &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &trans + &trans &kp LEFT &kp DOWN &kp RIGHT &kp N4 &kp N5 &kp N4 &kp N5 &kp N6 &kp RIGHT &trans &kp F10 + &kp LEFT_ALT &trans &trans &trans &kp MINUS &kp PLUS &kp N1 &kp N2 &kp N3 &kp DOT &trans &trans + &kp LGUI &trans &kp SPACE &kp RET &kp RCTRL + >; + trackball-bindings = <&tmv_fine>; + }; + + Raise { + label = "Raise"; + bindings = < + &trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp DEL + &trans &bt BT_CLR &bt BT_PRV &bt BT_NXT &bt BT_SEL 0 &to 3 &kp UNDER &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE + &trans &out OUT_TOG &trans &trans &trans &trans &kp MINUS &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + &kp LGUI &kp LEFT_ALT &kp SPACE &kp RET &trans + >; + trackball-bindings = <&tsl_fine>; + }; + }; +}; \ No newline at end of file diff --git a/config/charybdis_right.conf b/config/charybdis_right.conf new file mode 100644 index 0000000..0067f74 --- /dev/null +++ b/config/charybdis_right.conf @@ -0,0 +1,20 @@ +CONFIG_PMW3610=y +CONFIG_PMW3610_SMART_ALGORITHM=y +CONFIG_PMW3610_CPI=1000 +CONFIG_PMW3610_CPI_DIVIDOR=4 +CONFIG_PMW3610_ORIENTATION_90=y +CONFIG_ZMK_MOUSE_TICK_DURATION=6 +CONFIG_MOUSE_LAYER_ACTIVE_MS=750 +CONFIG_MOUSE_LAYER_INDEX=5 + +#CONFIG_SCROLL_LAYER_INDEX=8 + +#CONFIG_ZMK_USB_LOGGING=y +#CONFIG_LOG_MODE_IMMEDIATE=n +#CONFIG_LOG_TIMESTAMP_64BIT=y +#CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=2000 +#CONFIG_ZMK_LOG_LEVEL_DBG=y +#CONFIG_KSCAN_LOG_LEVEL_INF=y +#CONFIG_ZMK_BLE=y +#CONFIG_ZMK_USB=n +#CONFIG_SPI_LOG_LEVEL_DBG=y \ No newline at end of file diff --git a/config/corne.conf b/config/corne.conf deleted file mode 100644 index 974243c..0000000 --- a/config/corne.conf +++ /dev/null @@ -1,6 +0,0 @@ -# Uncomment the following lines to enable the Corne RGB Underglow -# CONFIG_ZMK_RGB_UNDERGLOW=y -# CONFIG_WS2812_STRIP=y - -# Uncomment the following line to enable the Corne OLED Display -# CONFIG_ZMK_DISPLAY=y diff --git a/config/corne.keymap b/config/corne.keymap deleted file mode 100644 index 0555cf4..0000000 --- a/config/corne.keymap +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include - -/ { - keymap { - compatible = "zmk,keymap"; - - default_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP | -// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | -// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC | -// | GUI | LWR | SPC | | ENT | RSE | ALT | - bindings = < - &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT - &kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC - &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp RALT - >; - }; - lower_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP | -// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | | -// | SHFT | | | | | | | | | | | | | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp TAB &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans - &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - - raise_layer { -// ----------------------------------------------------------------------------------------- -// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | -// | CTRL | | | | | | | - | = | [ | ] | \ | ` | -// | SHFT | | | | | | | _ | + | { | } | "|" | ~ | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp TAB &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC - &kp LCTRL &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE - &kp LSHFT &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - }; -}; diff --git a/config/west.yml b/config/west.yml index 379d291..ef93b42 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,11 +1,11 @@ manifest: remotes: - name: zmkfirmware - url-base: https://github.com/zmkfirmware + url-base: https://github.com/victorlucachi projects: - name: zmk remote: zmkfirmware - revision: main + revision: pmw3610-aml import: app/west.yml self: path: config