diff options
| -rw-r--r-- | build.yaml | 26 | ||||
| -rw-r--r-- | config/boards/shields/totem/Kconfig.defconfig | 25 | ||||
| -rw-r--r-- | config/boards/shields/totem/Kconfig.shield | 11 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem.conf | 0 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem.dtsi | 44 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem.keymap | 163 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem.zmk.yml | 12 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem_dongle.conf | 14 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem_dongle.overlay | 17 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem_left.conf | 0 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem_left.overlay | 17 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem_right.conf | 0 | ||||
| -rw-r--r-- | config/boards/shields/totem/totem_right.overlay | 21 | ||||
| -rw-r--r-- | config/corne.conf | 7 | ||||
| -rw-r--r-- | config/corne.keymap | 68 | ||||
| -rw-r--r-- | config/info.json | 53 | ||||
| -rw-r--r-- | config/west.yml | 4 |
17 files changed, 334 insertions, 148 deletions
diff --git a/build.yaml b/build.yaml index 228498f..72df116 100644 --- a/build.yaml +++ b/build.yaml @@ -1,19 +1,9 @@ -# This file generates the GitHub Actions matrix -# For simple board + shield combinations, add them -# to the top level board and shield arrays, for more -# control, add individual board + shield combinations to -# the `include` property, e.g: -# -# board: [ "nice_nano_v2" ] -# shield: [ "corne_left", "corne_right" ] -# include: -# - board: bdn9_rev2 -# - board: nice_nano_v2 -# shield: reviung41 -# ---- include: - - board: nice_nano_v2 - shield: corne_left nice_view_adapter nice_view - - board: nice_nano_v2 - shield: corne_right nice_view_adapter nice_view + - board: seeeduino_xiao_ble + shield: totem_left + - board: seeeduino_xiao_ble + shield: totem_right + - board: seeeduino_xiao_ble + shield: totem_dongle +# - board: seeeduino_xiao_ble +# shield: settings_reset \ No newline at end of file diff --git a/config/boards/shields/totem/Kconfig.defconfig b/config/boards/shields/totem/Kconfig.defconfig new file mode 100644 index 0000000..2159b41 --- /dev/null +++ b/config/boards/shields/totem/Kconfig.defconfig @@ -0,0 +1,25 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_TOTEM_DONGLE + +config ZMK_KEYBOARD_NAME + default "TOTEM" + +config ZMK_SPLIT_ROLE_CENTRAL + default y + +config ZMK_USB + default y + +endif + +if SHIELD_TOTEM_LEFT || SHIELD_TOTEM_RIGHT || SHIELD_TOTEM_DONGLE + +config ZMK_SPLIT + default y + +config ZMK_BLE + default y + +endif \ No newline at end of file diff --git a/config/boards/shields/totem/Kconfig.shield b/config/boards/shields/totem/Kconfig.shield new file mode 100644 index 0000000..648c1c5 --- /dev/null +++ b/config/boards/shields/totem/Kconfig.shield @@ -0,0 +1,11 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_TOTEM_LEFT + def_bool $(shields_list_contains,totem_left) + +config SHIELD_TOTEM_RIGHT + def_bool $(shields_list_contains,totem_right) + +config SHIELD_TOTEM_DONGLE + def_bool $(shields_list_contains,totem_dongle) \ No newline at end of file diff --git a/config/boards/shields/totem/totem.conf b/config/boards/shields/totem/totem.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/config/boards/shields/totem/totem.conf diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi new file mode 100644 index 0000000..8cee606 --- /dev/null +++ b/config/boards/shields/totem/totem.dtsi @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include <dt-bindings/zmk/matrix_transform.h> + + / { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <10>; + rows = <4>; + // | SW01 | SW02 | SW03 | SW04 | SW05 | | SW05 | SW04 | SW03 | SW02 | SW01 | + // | SW06 | SW07 | SW08 | SW09 | SW10 | | SW10 | SW09 | SW08 | SW07 | SW06 | + // | SW16 | SW11 | SW12 | SW13 | SW14 | SW15 | | SW15 | SW14 | SW13 | SW12 | SW11 | SW16 | + // | SW17 | SW18 | SW19 | | SW19 | SW18 | SW17 | + map = < + RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) + RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) + RC(3,0) RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(3,9) + RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) + >; + }; + + + kscan0: kscan_0 { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&xiao_d 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&xiao_d 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + }; + }; \ No newline at end of file diff --git a/config/boards/shields/totem/totem.keymap b/config/boards/shields/totem/totem.keymap new file mode 100644 index 0000000..2e46912 --- /dev/null +++ b/config/boards/shields/totem/totem.keymap @@ -0,0 +1,163 @@ +// +// ▀▀▀▀▀ ▀▀▀▀▀ ▀▀█▀▀ +// ▄▀▀▀▄ ▄ ▄▀▀▀▄ ▄ ▄▀▀▀▄ █ ▄▀▀▀▄ +// █ █ █ █ █ █ █ █ █ █ █ +// ▀▀▀ █ ▀▀▀ █ ▀▀▀ ▀ ▀▀▀ +// █ ▄▄▄█▄▄▄ █ █ +// ▀ █ █ █ █▄█ +// ▀▀▀▀▀ █ █ █ ▀ +// ▀ ▀ ▀ +// +// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + +#include <behaviors.dtsi> +#include <dt-bindings/zmk/keys.h> +#include <dt-bindings/zmk/bt.h> +#include <dt-bindings/zmk/outputs.h> +#include <dt-bindings/zmk/ext_power.h> + +#define Base 0 +#define Media 1 +#define Nav 2 +#define Mouse 3 +#define Sym 4 +#define Num 5 +#define Fun 6 +#define Button 7 +#define Game 8 +#define Gameplus 9 + +&mt { + quick-tap-ms = <100>; + global-quick-tap; + flavor = "tap-preferred"; + tapping-term-ms = <170>; +}; + +< { + tapping-term-ms = <240>; + flavor = "balanced"; + quick-tap-ms = <150>; +}; + +/ { + + behaviors { + hm: homerow_mods { + compatible = "zmk,behavior-hold-tap"; + label = "HOMEROW_MODS"; + #binding-cells = <2>; + flavor = "tap-preferred"; + tapping-term-ms = <240>; + quick-tap-ms = <150>; + global-quick-tap; + bindings = + <&kp>, + <&kp>; + }; + }; + + keymap { + compatible = "zmk,keymap"; + + Base { + label = "Base"; + bindings = < + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + &hm LGUI A &hm LALT S &hm LCTRL D &hm LSHIFT F &kp G &kp H &hm RSHFT J &hm RCTRL K &hm RALT L &hm RGUI SEMICOLON + &trans &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT < 7 SLASH &trans + < 1 ESCAPE < 2 TAB < 3 SPACE < 4 BACKSPACE < 5 ENTER < 6 DELETE + >; + }; + + Media { + label = "Media"; + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp LGUI &kp LALT &kp LCTRL &kp LSHIFT &trans &trans &kp C_PREVIOUS &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_NEXT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &tog 8 &kp C_STOP &kp C_PLAY_PAUSE &trans + >; + }; + + Nav { + label = "Nav"; + bindings = < + &kp DELETE &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp LEFT_GUI &kp LALT &kp LCTRL &kp LSHIFT &kp SQT &kp CAPS &kp LEFT &kp DOWN &kp UP &kp RIGHT + &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &kp C_PLAY_PAUSE &kp INSERT &kp HOME &kp PAGE_DOWN &kp PAGE_UP &kp END &trans + &trans &trans &trans &kp DELETE &kp ENTER &trans + >; + }; + + Mouse { + label = "Mouse"; + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans + >; + }; + + Sym { + label = "Sym"; + bindings = < + &kp LEFT_BRACE &kp AMPERSAND &kp ASTERISK &kp LEFT_PARENTHESIS &kp RIGHT_BRACE &trans &trans &trans &trans &trans + &kp COLON &kp DOLLAR &kp PERCENT &kp CARET &kp PLUS &trans &kp RSHIFT &kp RCTRL &kp RALT &kp RGUI + &trans &kp TILDE &kp EXCL &kp AT &kp HASH &kp PIPE &trans &trans &trans &trans &trans &trans + &kp LEFT_PARENTHESIS &kp RIGHT_PARENTHESIS &kp UNDERSCORE &trans &trans &trans + >; + }; + + Num { + label = "Num"; + bindings = < + &kp LEFT_BRACKET &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp RIGHT_BRACKET &trans &trans &trans &trans &trans + &kp SEMICOLON &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp EQUAL &trans &kp RSHIFT &kp RCTRL &kp RALT &kp RGUI + &trans &kp GRAVE &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp BACKSLASH &trans &trans &trans &trans &trans &trans + &kp SQT &kp NUMBER_0 &kp MINUS &trans &trans &trans + >; + }; + + Fun { + label = "Fun"; + bindings = < + &kp F12 &kp F7 &kp F8 &kp F9 &kp PRINTSCREEN &trans &trans &trans &trans &trans + &kp F11 &kp F4 &kp F5 &kp F6 &kp SCROLLLOCK &trans &kp RSHIFT &kp RCTRL &kp RALT &kp RGUI + &trans &kp F10 &kp F1 &kp F2 &kp F3 &kp PAUSE_BREAK &trans &trans &trans &trans &trans &trans + &kp C_MENU &kp TAB &kp SPACE &trans &trans &trans + >; + }; + + Button { + label = "Button"; + bindings = < + &bt BT_CLR &bootloader &trans &trans &bt BT_SEL 0 &trans &trans &trans &bootloader &trans + &kp LGUI &kp LALT &kp LCTRL &kp LSHIFT &bt BT_SEL 1 &trans &kp RSHIFT &kp RCTRL &kp RALT &kp RGUI + &trans &ext_power EP_TOG &trans &trans &trans &bt BT_SEL 2 &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans + >; + }; + + Game { + label = "Game"; + bindings = < + &kp TAB &kp Z &kp X &kp C &kp V &trans &trans &trans &trans &trans + &kp LEFT_SHIFT &kp Q &kp W &kp E &kp R &trans &trans &trans &trans &trans + &trans &kp LCTRL &kp A &kp S &kp D &kp F &trans &trans &trans &trans &trans &trans + &kp LALT < 9 ESCAPE &kp SPACE &trans &trans &trans + >; + }; + + Gameplus { + label = "Gameplus"; + bindings = < + &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &kp NUMBER_5 &trans &trans &trans &trans &trans + &kp G &trans &trans &trans &kp T &trans &trans &trans &trans &trans + &trans &kp TAB &trans &trans &trans &kp B &trans &trans &trans &trans &trans &trans + &kp ESCAPE &trans &tog 8 &trans &trans &trans + >; + }; + }; +}; \ No newline at end of file diff --git a/config/boards/shields/totem/totem.zmk.yml b/config/boards/shields/totem/totem.zmk.yml new file mode 100644 index 0000000..b05b0e3 --- /dev/null +++ b/config/boards/shields/totem/totem.zmk.yml @@ -0,0 +1,12 @@ +file_format: "1" +id: totem +name: TOTEM +type: shield +url: https://github.com/GEIGEIGEIST/TOTEM +requires: [seeeduino_xiao_ble] +features: + - keys +siblings: + - totem_left + - totem_right + - totem_dongle \ No newline at end of file diff --git a/config/boards/shields/totem/totem_dongle.conf b/config/boards/shields/totem/totem_dongle.conf new file mode 100644 index 0000000..f00c895 --- /dev/null +++ b/config/boards/shields/totem/totem_dongle.conf @@ -0,0 +1,14 @@ +CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2 +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y + +CONFIG_ZMK_SLEEP=n +# CONFIG_PM_DEVICE=n +CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=900000 +CONFIG_ZMK_EXT_POWER=y + +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 \ No newline at end of file diff --git a/config/boards/shields/totem/totem_dongle.overlay b/config/boards/shields/totem/totem_dongle.overlay new file mode 100644 index 0000000..36b6325 --- /dev/null +++ b/config/boards/shields/totem/totem_dongle.overlay @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include "totem.dtsi" + + &kscan0 { + col-gpios + = <&xiao_d 8 GPIO_ACTIVE_HIGH> + , <&xiao_d 9 GPIO_ACTIVE_HIGH> + , <&xiao_d 10 GPIO_ACTIVE_HIGH> + , <&xiao_d 5 GPIO_ACTIVE_HIGH> + , <&xiao_d 4 GPIO_ACTIVE_HIGH> + ; + }; \ No newline at end of file diff --git a/config/boards/shields/totem/totem_left.conf b/config/boards/shields/totem/totem_left.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/config/boards/shields/totem/totem_left.conf diff --git a/config/boards/shields/totem/totem_left.overlay b/config/boards/shields/totem/totem_left.overlay new file mode 100644 index 0000000..d1a969d --- /dev/null +++ b/config/boards/shields/totem/totem_left.overlay @@ -0,0 +1,17 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include "totem.dtsi" + + &kscan0 { + col-gpios + = <&xiao_d 4 GPIO_ACTIVE_HIGH> + , <&xiao_d 5 GPIO_ACTIVE_HIGH> + , <&xiao_d 10 GPIO_ACTIVE_HIGH> + , <&xiao_d 9 GPIO_ACTIVE_HIGH> + , <&xiao_d 8 GPIO_ACTIVE_HIGH> + ; + }; \ No newline at end of file diff --git a/config/boards/shields/totem/totem_right.conf b/config/boards/shields/totem/totem_right.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/config/boards/shields/totem/totem_right.conf diff --git a/config/boards/shields/totem/totem_right.overlay b/config/boards/shields/totem/totem_right.overlay new file mode 100644 index 0000000..123f2e3 --- /dev/null +++ b/config/boards/shields/totem/totem_right.overlay @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include "totem.dtsi" + +&default_transform { + col-offset = <5>; +}; + +&kscan0 { + col-gpios + = <&xiao_d 8 GPIO_ACTIVE_HIGH> + , <&xiao_d 9 GPIO_ACTIVE_HIGH> + , <&xiao_d 10 GPIO_ACTIVE_HIGH> + , <&xiao_d 5 GPIO_ACTIVE_HIGH> + , <&xiao_d 4 GPIO_ACTIVE_HIGH> + ; +}; \ No newline at end of file diff --git a/config/corne.conf b/config/corne.conf deleted file mode 100644 index 0a39f96..0000000 --- a/config/corne.conf +++ /dev/null @@ -1,7 +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 -CONFIG_ZMK_EXT_POWER=y diff --git a/config/corne.keymap b/config/corne.keymap deleted file mode 100644 index 9442f25..0000000 --- a/config/corne.keymap +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include <behaviors.dtsi> -#include <dt-bindings/zmk/keys.h> -#include <dt-bindings/zmk/bt.h> -#include <dt-bindings/zmk/outputs.h> - -/ { - keymap { - compatible = "zmk,keymap"; - - Base { - // ----------------------------------------------------------------------------------------- - // | 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 | - - 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 &kp RALT - >; - }; - - Lower { - // ----------------------------------------------------------------------------------------- - // | 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 | - - label = "Lower"; - bindings = < - &kp TAB &kp K_PP &kp UP &kp N1 &kp N2 &kp N3 &kp N7 &kp N8 &kp N9 &kp N0 &kp HOME &trans - &kp LALT &kp LEFT &kp DOWN &kp RIGHT &kp N4 &kp N5 &kp N4 &kp N5 &kp N6 &kp RIGHT &trans &kp F10 - &kp LSHFT &trans &trans &trans &kp MINUS &kp PLUS &kp N1 &kp N2 &kp N3 &kp DOT &trans &kp RSHIFT - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - - Raise { - // ----------------------------------------------------------------------------------------- - // | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | - // | CTRL | | | | | | | - | = | [ | ] | \ | ` | - // | SHFT | | | | | | | _ | + | { | } | "|" | ~ | - // | GUI | | SPC | | ENT | | ALT | - - 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 &kp RALT - >; - }; - }; -}; - -&nice_view_spi { - cs-gpios = <&pro_micro 0 GPIO_ACTIVE_HIGH>; -}; diff --git a/config/info.json b/config/info.json deleted file mode 100644 index 551c6bb..0000000 --- a/config/info.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "Tab", "row": 0, "col": 0, "x": 0, "y": 0.5 }, - { "label": "Q", "row": 0, "col": 1, "x": 1, "y": 0.5 }, - { "label": "W", "row": 0, "col": 2, "x": 2, "y": 0.2 }, - { "label": "E", "row": 0, "col": 3, "x": 3, "y": 0 }, - { "label": "R", "row": 0, "col": 4, "x": 4, "y": 0.25 }, - { "label": "T", "row": 0, "col": 5, "x": 5, "y": 0.25 }, - { "label": "Y", "row": 0, "col": 7, "x": 9, "y": 0.25 }, - { "label": "U", "row": 0, "col": 8, "x": 10, "y": 0.25 }, - { "label": "I", "row": 0, "col": 9, "x": 11, "y": 0 }, - { "label": "O", "row": 0, "col": 10, "x": 12, "y": 0.2 }, - { "label": "P", "row": 0, "col": 11, "x": 13, "y": 0.5 }, - { "label": "BSPC", "row": 0, "col": 12, "x": 14, "y": 0.5 }, - - { "label": "Ctrl", "row": 1, "col": 0, "x": 0, "y": 1.5 }, - { "label": "A", "row": 1, "col": 1, "x": 1, "y": 1.5 }, - { "label": "S", "row": 1, "col": 2, "x": 2, "y": 1.2 }, - { "label": "D", "row": 1, "col": 3, "x": 3, "y": 1 }, - { "label": "F", "row": 1, "col": 4, "x": 4, "y": 1.25 }, - { "label": "G", "row": 1, "col": 5, "x": 5, "y": 1.25 }, - { "label": "H", "row": 1, "col": 7, "x": 9, "y": 1.25 }, - { "label": "J", "row": 1, "col": 8, "x": 10, "y": 1.25 }, - { "label": "K", "row": 1, "col": 9, "x": 11, "y": 1 }, - { "label": "L", "row": 1, "col": 10, "x": 12, "y": 1.2 }, - { "label": ";", "row": 1, "col": 11, "x": 13, "y": 1.5 }, - { "label": "'", "row": 1, "col": 12, "x": 14, "y": 1.5 }, - - { "label": "LShift", "row": 2, "col": 0, "x": 0, "y": 2.5 }, - { "label": "Z", "row": 2, "col": 1, "x": 1, "y": 2.5 }, - { "label": "X", "row": 2, "col": 2, "x": 2, "y": 2.2 }, - { "label": "C", "row": 2, "col": 3, "x": 3, "y": 2 }, - { "label": "V", "row": 2, "col": 4, "x": 4, "y": 2.25 }, - { "label": "B", "row": 2, "col": 5, "x": 5, "y": 2.25 }, - { "label": "N", "row": 2, "col": 7, "x": 9, "y": 2.25 }, - { "label": "M", "row": 2, "col": 8, "x": 10, "y": 2.25 }, - { "label": ",", "row": 2, "col": 9, "x": 11, "y": 2 }, - { "label": ".", "row": 2, "col": 10, "x": 12, "y": 2.2 }, - { "label": "/", "row": 2, "col": 11, "x": 13, "y": 2.5 }, - { "label": "Esc", "row": 2, "col": 12, "x": 14, "y": 2.5 }, - - { "label": "GUI", "row": 3, "col": 3, "x": 3.5, "y": 3.25 }, - { "label": "LWR", "row": 3, "col": 4, "x": 4.5, "y": 3.25, "r": 13, "ry": 4.25 }, - { "label": "SPC", "row": 3, "col": 5, "x": 5.5, "y": 3.05, "h": 1.5, "r": 26, "ry": 4.6 }, - { "label": "ENT", "row": 3, "col": 7, "x": 8.5, "y": 3.05, "h": 1.5, "r": -26, "rx": 9.5, "ry": 4.6 }, - { "label": "RSE", "row": 3, "col": 8, "x": 9.5, "y": 3.25, "r": -13, "rx": 10.5, "ry": 4.25 }, - { "label": "ALT", "row": 3, "col": 9, "x": 10.5, "y": 3.25 } - ] - } - } -} diff --git a/config/west.yml b/config/west.yml index 379d291..033dd3b 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/petejohanson projects: - name: zmk remote: zmkfirmware - revision: main + revision: bluetooth/split-peripheral-slot-clearing-fix import: app/west.yml self: path: config |