From 3b81847f8dd3f9b44ba96a5fb47b7dbfa6cf7be1 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 21 Jul 2023 15:55:03 +0300 Subject: [PATCH 01/17] added totem dongle config --- build.yaml | 26 +-- config/boards/shields/totem/Kconfig.defconfig | 25 +++ config/boards/shields/totem/Kconfig.shield | 11 ++ config/boards/shields/totem/totem.conf | 0 config/boards/shields/totem/totem.dtsi | 44 +++++ config/boards/shields/totem/totem.keymap | 163 ++++++++++++++++++ config/boards/shields/totem/totem.zmk.yml | 12 ++ config/boards/shields/totem/totem_dongle.conf | 14 ++ .../boards/shields/totem/totem_dongle.overlay | 17 ++ config/boards/shields/totem/totem_left.conf | 0 .../boards/shields/totem/totem_left.overlay | 17 ++ config/boards/shields/totem/totem_right.conf | 0 .../boards/shields/totem/totem_right.overlay | 21 +++ config/corne.conf | 7 - config/corne.keymap | 68 -------- config/info.json | 53 ------ config/west.yml | 4 +- 17 files changed, 334 insertions(+), 148 deletions(-) create mode 100644 config/boards/shields/totem/Kconfig.defconfig create mode 100644 config/boards/shields/totem/Kconfig.shield create mode 100644 config/boards/shields/totem/totem.conf create mode 100644 config/boards/shields/totem/totem.dtsi create mode 100644 config/boards/shields/totem/totem.keymap create mode 100644 config/boards/shields/totem/totem.zmk.yml create mode 100644 config/boards/shields/totem/totem_dongle.conf create mode 100644 config/boards/shields/totem/totem_dongle.overlay create mode 100644 config/boards/shields/totem/totem_left.conf create mode 100644 config/boards/shields/totem/totem_left.overlay create mode 100644 config/boards/shields/totem/totem_right.conf create mode 100644 config/boards/shields/totem/totem_right.overlay delete mode 100644 config/corne.conf delete mode 100644 config/corne.keymap delete mode 100644 config/info.json diff --git a/build.yaml b/build.yaml index 228498f2..72df1163 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 00000000..2159b416 --- /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 00000000..648c1c5d --- /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 00000000..e69de29b diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi new file mode 100644 index 00000000..8cee606c --- /dev/null +++ b/config/boards/shields/totem/totem.dtsi @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include + + / { + 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 00000000..2e46912e --- /dev/null +++ b/config/boards/shields/totem/totem.keymap @@ -0,0 +1,163 @@ +// +// ▀▀▀▀▀ ▀▀▀▀▀ ▀▀█▀▀ +// ▄▀▀▀▄ ▄ ▄▀▀▀▄ ▄ ▄▀▀▀▄ █ ▄▀▀▀▄ +// █ █ █ █ █ █ █ █ █ █ █ +// ▀▀▀ █ ▀▀▀ █ ▀▀▀ ▀ ▀▀▀ +// █ ▄▄▄█▄▄▄ █ █ +// ▀ █ █ █ █▄█ +// ▀▀▀▀▀ █ █ █ ▀ +// ▀ ▀ ▀ +// +// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + +#include +#include +#include +#include +#include + +#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 00000000..b05b0e3d --- /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 00000000..f00c895f --- /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 00000000..36b6325e --- /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 00000000..e69de29b diff --git a/config/boards/shields/totem/totem_left.overlay b/config/boards/shields/totem/totem_left.overlay new file mode 100644 index 00000000..d1a969db --- /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 00000000..e69de29b diff --git a/config/boards/shields/totem/totem_right.overlay b/config/boards/shields/totem/totem_right.overlay new file mode 100644 index 00000000..123f2e35 --- /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 0a39f969..00000000 --- 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 9442f251..00000000 --- a/config/corne.keymap +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include -#include - -/ { - 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 551c6bbe..00000000 --- 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 379d2919..033dd3b9 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 From 4129017978879fcd4f87e0cd521b597dee925771 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 21 Jul 2023 15:57:52 +0300 Subject: [PATCH 02/17] updated keymap/conf --- config/boards/shields/totem/totem_dongle.conf | 1 - config/totem.conf | 3 + config/totem.keymap | 137 ++++++++++++++++++ 3 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 config/totem.conf create mode 100644 config/totem.keymap diff --git a/config/boards/shields/totem/totem_dongle.conf b/config/boards/shields/totem/totem_dongle.conf index f00c895f..8f3fc849 100644 --- a/config/boards/shields/totem/totem_dongle.conf +++ b/config/boards/shields/totem/totem_dongle.conf @@ -1,5 +1,4 @@ CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2 -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y CONFIG_ZMK_SLEEP=n # CONFIG_PM_DEVICE=n diff --git a/config/totem.conf b/config/totem.conf new file mode 100644 index 00000000..3ef185b0 --- /dev/null +++ b/config/totem.conf @@ -0,0 +1,3 @@ +CONFIG_ZMK_USB_LOGGING=n + +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y \ No newline at end of file diff --git a/config/totem.keymap b/config/totem.keymap new file mode 100644 index 00000000..506f06a7 --- /dev/null +++ b/config/totem.keymap @@ -0,0 +1,137 @@ +// +// ▀▀▀▀▀ ▀▀▀▀▀ ▀▀█▀▀ +// ▄▀▀▀▄ ▄ ▄▀▀▀▄ ▄ ▄▀▀▀▄ █ ▄▀▀▀▄ +// █ █ █ █ █ █ █ █ █ █ █ +// ▀▀▀ █ ▀▀▀ █ ▀▀▀ ▀ ▀▀▀ +// █ ▄▄▄█▄▄▄ █ █ +// ▀ █ █ █ █▄█ +// ▀▀▀▀▀ █ █ █ ▀ +// ▀ ▀ ▀ +// +// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + +#include +#include +#include +#include + +#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 = <200>; + quick-tap-ms = <125>; + global-quick-tap; + bindings = + <&kp>, + <&kp>; + }; + }; + + combos { + compatible = "zmk,combos"; + }; + + 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 +< 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH < 4 APOSTROPHE + &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS + >; + }; + + Nav { + label = "Nav"; + bindings = < + &trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp PLUS + &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS +&kp LEFT_ALT &trans &kp PAGE_UP &trans &kp PG_DN &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &trans + &trans &trans &trans &trans &trans &kp NUMBER_0 + >; + }; + + Sym { + label = "Sym"; + bindings = < + &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME + &trans &trans &trans &trans &trans &trans + >; + }; + + Fun { + label = "Fun"; + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 + &trans &trans &trans &trans &to 5 &trans &trans &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &trans + &trans &trans &trans &trans &trans &trans + >; + }; + + Button { + label = "Button"; + bindings = < + &bt BT_CLR &trans &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 +&bootloader &ext_power EP_TOG &trans &trans &trans &bt BT_SEL 2 &trans &trans &trans &trans &trans &trans + &trans &trans &trans &kp C_PREV &kp C_PLAY_PAUSE &kp C_NEXT + >; + }; + + Gaming { + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp A &kp S &kp D &kp F &mo 6 &trans &trans &trans &trans &trans +&kp ESCAPE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans + >; + + label = "Gaming"; + }; + + Gaming+ { + bindings = < + &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &kp NUMBER_5 &trans &trans &trans &trans &kp LC(RA(DEL)) + &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans +&kp TAB &to 0 &trans &trans &kp NUMBER_6 &kp NUMBER_7 &trans &trans &trans &trans &trans &kp LA(F4) + &kp J &kp I &kp M &trans &trans &trans + >; + + label = "Gaming+"; + }; + }; +}; \ No newline at end of file From 384d0cbce7c439e460694d42f5b3d85aafd4fde3 Mon Sep 17 00:00:00 2001 From: Victor Date: Fri, 21 Jul 2023 21:47:51 +0300 Subject: [PATCH 03/17] fix merged, moving to mainline zmk --- config/west.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/west.yml b/config/west.yml index 033dd3b9..adc97b70 100644 --- a/config/west.yml +++ b/config/west.yml @@ -1,11 +1,11 @@ manifest: remotes: - name: zmkfirmware - url-base: https://github.com/petejohanson + url-base: https://github.com/zmkfirmware projects: - name: zmk remote: zmkfirmware - revision: bluetooth/split-peripheral-slot-clearing-fix + revision: main import: app/west.yml self: - path: config + path: config \ No newline at end of file From 0816efc8ef2e737892ff5b3c238234c8ad8ed602 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 24 Jul 2023 14:27:12 +0300 Subject: [PATCH 04/17] added editor layout --- config/info.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 config/info.json diff --git a/config/info.json b/config/info.json new file mode 100644 index 00000000..c563192d --- /dev/null +++ b/config/info.json @@ -0,0 +1,47 @@ +{ + "url": "https://github.com/GEIGEIGEIST/TOTEM", + "layouts": { + "LAYOUT": { + "layout": [ + { "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, + { "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, + { "x": 3.175, "y": 0, "w": 1.059 }, + { "x": 4.234, "y": 0.496, "w": 1.059 }, + { "x": 5.292, "y": 0.656, "w": 1.059 }, + { "x": 8.682, "y": 0.656, "w": 1.059 }, + { "x": 9.741, "y": 0.496, "w": 1.059 }, + { "x": 10.8, "y": 0, "w": 1.059 }, + { "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, + { "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, + { "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, + { "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, + { "x": 3.175, "y": 1, "w": 1.059 }, + { "x": 4.234, "y": 1.496, "w": 1.059 }, + { "x": 5.292, "y": 1.656, "w": 1.059 }, + { "x": 8.682, "y": 1.661, "w": 1.059 }, + { "x": 9.741, "y": 1.496, "w": 1.059 }, + { "x": 10.8, "y": 1, "w": 1.059 }, + { "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, + { "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, + { "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, + { "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, + { "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, + { "x": 3.175, "y": 2, "w": 1.059 }, + { "x": 4.234, "y": 2.496, "w": 1.059 }, + { "x": 5.292, "y": 2.656, "w": 1.059 }, + { "x": 8.682, "y": 2.661, "w": 1.059 }, + { "x": 9.741, "y": 2.496, "w": 1.059 }, + { "x": 10.8, "y": 2, "w": 1.059 }, + { "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, + { "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, + { "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, + { "x": 3.938, "y": 3.714, "w": 1.059 }, + { "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, + { "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, + { "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, + { "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, + { "x": 10.037, "y": 3.714, "w": 1.059 } + ] + } + } + } \ No newline at end of file From e4092ca166256697df031e558017db47a761327b Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 14:35:22 +0000 Subject: [PATCH 05/17] remove button layer, small keymap changes --- config/totem.keymap | 222 +++++++++++++++++++------------------------- 1 file changed, 96 insertions(+), 126 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index 506f06a7..20f73ede 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -9,129 +9,99 @@ // ▀ ▀ ▀ // // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - -#include -#include -#include -#include - -#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 = <200>; - quick-tap-ms = <125>; - global-quick-tap; - bindings = - <&kp>, - <&kp>; - }; - }; - - combos { - compatible = "zmk,combos"; - }; - - 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 -< 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH < 4 APOSTROPHE - &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS - >; - }; - - Nav { - label = "Nav"; - bindings = < - &trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp PLUS - &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS -&kp LEFT_ALT &trans &kp PAGE_UP &trans &kp PG_DN &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &trans - &trans &trans &trans &trans &trans &kp NUMBER_0 - >; - }; - - Sym { - label = "Sym"; - bindings = < - &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME - &trans &trans &trans &trans &trans &trans - >; - }; - - Fun { - label = "Fun"; - bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 - &trans &trans &trans &trans &to 5 &trans &trans &trans &trans &kp F10 -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &trans - &trans &trans &trans &trans &trans &trans - >; - }; - - Button { - label = "Button"; - bindings = < - &bt BT_CLR &trans &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 -&bootloader &ext_power EP_TOG &trans &trans &trans &bt BT_SEL 2 &trans &trans &trans &trans &trans &trans - &trans &trans &trans &kp C_PREV &kp C_PLAY_PAUSE &kp C_NEXT - >; - }; - - Gaming { - bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp A &kp S &kp D &kp F &mo 6 &trans &trans &trans &trans &trans -&kp ESCAPE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans - >; - - label = "Gaming"; - }; - - Gaming+ { - bindings = < - &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &kp NUMBER_5 &trans &trans &trans &trans &kp LC(RA(DEL)) - &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans -&kp TAB &to 0 &trans &trans &kp NUMBER_6 &kp NUMBER_7 &trans &trans &trans &trans &trans &kp LA(F4) - &kp J &kp I &kp M &trans &trans &trans - >; - - label = "Gaming+"; - }; - }; -}; \ No newline at end of file + +#include +#include + +#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 = <200>; + quick-tap-ms = <125>; + global-quick-tap; + bindings = + <&kp>, + <&kp>; + }; + }; + + combos { + compatible = "zmk,combos"; + }; + + 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 < 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp APOSTROPHE &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS + >; + }; + + Nav { + label = "Nav"; + bindings = < +&trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS &kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &kp PLUS &trans &trans &trans &trans &trans &kp DOT + >; + }; + + Sym { + label = "Sym"; + bindings = < +&kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME &trans &trans &trans &trans &trans &trans + >; + }; + + Fun { + label = "Fun"; + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &trans &trans &trans &trans &trans &trans &trans + >; + }; + + Gaming { + bindings = < +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp A &kp S &kp D &kp F &mo 5 &trans &trans &trans &trans &trans &kp ESCAPE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans + >; + + label = "Gaming"; + }; + + Gaming+ { + bindings = < +&kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &kp NUMBER_5 &trans &trans &trans &trans &kp LC(RA(DEL)) &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans &kp TAB &to 0 &trans &trans &kp NUMBER_6 &kp NUMBER_7 &trans &trans &trans &trans &trans &kp LA(F4) &kp J &kp I &kp M &trans &trans &trans + >; + + label = "Gaming+"; + }; + }; +}; From 443bbde36f3c5937a5400ed9a2d93d11c6faa78e Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 24 Jul 2023 18:38:51 +0300 Subject: [PATCH 06/17] updated editor layout --- config/info.json | 90 ++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/config/info.json b/config/info.json index c563192d..33cce9e0 100644 --- a/config/info.json +++ b/config/info.json @@ -1,47 +1,47 @@ { - "url": "https://github.com/GEIGEIGEIST/TOTEM", - "layouts": { - "LAYOUT": { - "layout": [ - { "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, - { "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, - { "x": 3.175, "y": 0, "w": 1.059 }, - { "x": 4.234, "y": 0.496, "w": 1.059 }, - { "x": 5.292, "y": 0.656, "w": 1.059 }, - { "x": 8.682, "y": 0.656, "w": 1.059 }, - { "x": 9.741, "y": 0.496, "w": 1.059 }, - { "x": 10.8, "y": 0, "w": 1.059 }, - { "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, - { "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, - { "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, - { "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, - { "x": 3.175, "y": 1, "w": 1.059 }, - { "x": 4.234, "y": 1.496, "w": 1.059 }, - { "x": 5.292, "y": 1.656, "w": 1.059 }, - { "x": 8.682, "y": 1.661, "w": 1.059 }, - { "x": 9.741, "y": 1.496, "w": 1.059 }, - { "x": 10.8, "y": 1, "w": 1.059 }, - { "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, - { "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, - { "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, - { "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, - { "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, - { "x": 3.175, "y": 2, "w": 1.059 }, - { "x": 4.234, "y": 2.496, "w": 1.059 }, - { "x": 5.292, "y": 2.656, "w": 1.059 }, - { "x": 8.682, "y": 2.661, "w": 1.059 }, - { "x": 9.741, "y": 2.496, "w": 1.059 }, - { "x": 10.8, "y": 2, "w": 1.059 }, - { "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, - { "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, - { "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, - { "x": 3.938, "y": 3.714, "w": 1.059 }, - { "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, - { "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, - { "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, - { "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, - { "x": 10.037, "y": 3.714, "w": 1.059 } - ] - } + "url": "https://github.com/GEIGEIGEIST/TOTEM", + "layouts": { + "LAYOUT": { + "layout": [ + { "row": 0, "col": 0, "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, + { "row": 0, "col": 1, "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, + { "row": 0, "col": 2, "x": 3.175, "y": 0, "w": 1.059 }, + { "row": 0, "col": 3, "x": 4.234, "y": 0.496, "w": 1.059 }, + { "row": 0, "col": 4, "x": 5.292, "y": 0.656, "w": 1.059 }, + { "row": 0, "col": 5, "x": 8.682, "y": 0.656, "w": 1.059 }, + { "row": 0, "col": 6, "x": 9.741, "y": 0.496, "w": 1.059 }, + { "row": 0, "col": 7, "x": 10.8, "y": 0, "w": 1.059 }, + { "row": 0, "col": 8, "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, + { "row": 0, "col": 9, "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, + { "row": 1, "col": 0, "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, + { "row": 1, "col": 1, "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, + { "row": 1, "col": 2, "x": 3.175, "y": 1, "w": 1.059 }, + { "row": 1, "col": 3, "x": 4.234, "y": 1.496, "w": 1.059 }, + { "row": 1, "col": 4, "x": 5.292, "y": 1.656, "w": 1.059 }, + { "row": 1, "col": 5, "x": 8.682, "y": 1.661, "w": 1.059 }, + { "row": 1, "col": 6, "x": 9.741, "y": 1.496, "w": 1.059 }, + { "row": 1, "col": 7, "x": 10.8, "y": 1, "w": 1.059 }, + { "row": 1, "col": 8, "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, + { "row": 1, "col": 9, "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, + { "row": 2, "col": 0, "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, + { "row": 2, "col": 1, "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, + { "row": 2, "col": 2, "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, + { "row": 2, "col": 3, "x": 3.175, "y": 2, "w": 1.059 }, + { "row": 2, "col": 4, "x": 4.234, "y": 2.496, "w": 1.059 }, + { "row": 2, "col": 5, "x": 5.292, "y": 2.656, "w": 1.059 }, + { "row": 2, "col": 6, "x": 8.682, "y": 2.661, "w": 1.059 }, + { "row": 2, "col": 7, "x": 9.741, "y": 2.496, "w": 1.059 }, + { "row": 2, "col": 8, "x": 10.8, "y": 2, "w": 1.059 }, + { "row": 2, "col": 9, "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, + { "row": 3, "col": 0, "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, + { "row": 3, "col": 2, "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, + { "row": 3, "col": 3, "x": 3.938, "y": 3.714, "w": 1.059 }, + { "row": 3, "col": 4, "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, + { "row": 3, "col": 5, "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, + { "row": 3, "col": 6, "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, + { "row": 3, "col": 7, "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, + { "row": 3, "col": 9, "x": 10.037, "y": 3.714, "w": 1.059 } + ] } - } \ No newline at end of file + } +} \ No newline at end of file From ae2ef14bad5208aa82552d3dd4baf2199a184c06 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 20:01:57 +0000 Subject: [PATCH 07/17] gaming layer fixes --- config/totem.keymap | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index 20f73ede..5eb466ad 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -63,34 +63,49 @@ 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 < 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp APOSTROPHE &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS + &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 +< 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT + &kp SLASH &kp APOSTROPHE &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS >; }; Nav { label = "Nav"; bindings = < -&trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS &kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &kp PLUS &trans &trans &trans &trans &trans &kp DOT + &trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 + &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS + &kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 +&kp KP_MULTIPLY &kp PLUS &trans &trans &trans &trans &trans &kp DOT >; }; Sym { label = "Sym"; bindings = < -&kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME &trans &trans &trans &trans &trans &trans + &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans +&kp SLASH &kp HOME &trans &trans &trans &trans &trans &trans >; }; Fun { label = "Fun"; bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &trans &trans &trans &trans &trans &trans &trans +&bootloader &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 + &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp F20 &trans &trans &trans &trans &trans &trans &trans >; }; Gaming { bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp A &kp S &kp D &kp F &mo 5 &trans &trans &trans &trans &trans &kp ESCAPE &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp A &kp S &kp D &kp F &sl 5 &trans &trans &trans &trans &trans +&kp ESCAPE &trans &trans &trans &trans &trans &trans &trans &trans &trans + &trans &trans &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans >; label = "Gaming"; @@ -98,7 +113,10 @@ Gaming+ { bindings = < -&kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &kp NUMBER_5 &trans &trans &trans &trans &kp LC(RA(DEL)) &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans &kp TAB &to 0 &trans &trans &kp NUMBER_6 &kp NUMBER_7 &trans &trans &trans &trans &trans &kp LA(F4) &kp J &kp I &kp M &trans &trans &trans +&kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &trans &trans &trans &trans &kp LC(RA(DEL)) + &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans +&kp TAB &to 0 &trans &trans &kp NUMBER_5 &kp NUMBER_6 &trans &trans &trans &trans + &trans &kp LA(F4) &kp J &kp I &kp M &trans &trans &trans >; label = "Gaming+"; From 0818afe2352295d2f88b827668f6718292f36659 Mon Sep 17 00:00:00 2001 From: eigatech <120486526+eigatech@users.noreply.github.com> Date: Tue, 15 Aug 2023 08:50:01 +0300 Subject: [PATCH 08/17] Update textual layout --- config/info.json | 81 +++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/config/info.json b/config/info.json index 33cce9e0..82f1deb8 100644 --- a/config/info.json +++ b/config/info.json @@ -3,45 +3,48 @@ "layouts": { "LAYOUT": { "layout": [ - { "row": 0, "col": 0, "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, - { "row": 0, "col": 1, "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, - { "row": 0, "col": 2, "x": 3.175, "y": 0, "w": 1.059 }, - { "row": 0, "col": 3, "x": 4.234, "y": 0.496, "w": 1.059 }, - { "row": 0, "col": 4, "x": 5.292, "y": 0.656, "w": 1.059 }, - { "row": 0, "col": 5, "x": 8.682, "y": 0.656, "w": 1.059 }, - { "row": 0, "col": 6, "x": 9.741, "y": 0.496, "w": 1.059 }, - { "row": 0, "col": 7, "x": 10.8, "y": 0, "w": 1.059 }, - { "row": 0, "col": 8, "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, - { "row": 0, "col": 9, "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, - { "row": 1, "col": 0, "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, - { "row": 1, "col": 1, "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, - { "row": 1, "col": 2, "x": 3.175, "y": 1, "w": 1.059 }, - { "row": 1, "col": 3, "x": 4.234, "y": 1.496, "w": 1.059 }, - { "row": 1, "col": 4, "x": 5.292, "y": 1.656, "w": 1.059 }, - { "row": 1, "col": 5, "x": 8.682, "y": 1.661, "w": 1.059 }, - { "row": 1, "col": 6, "x": 9.741, "y": 1.496, "w": 1.059 }, - { "row": 1, "col": 7, "x": 10.8, "y": 1, "w": 1.059 }, - { "row": 1, "col": 8, "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, - { "row": 1, "col": 9, "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, - { "row": 2, "col": 0, "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, - { "row": 2, "col": 1, "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, - { "row": 2, "col": 2, "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, - { "row": 2, "col": 3, "x": 3.175, "y": 2, "w": 1.059 }, - { "row": 2, "col": 4, "x": 4.234, "y": 2.496, "w": 1.059 }, - { "row": 2, "col": 5, "x": 5.292, "y": 2.656, "w": 1.059 }, - { "row": 2, "col": 6, "x": 8.682, "y": 2.661, "w": 1.059 }, - { "row": 2, "col": 7, "x": 9.741, "y": 2.496, "w": 1.059 }, - { "row": 2, "col": 8, "x": 10.8, "y": 2, "w": 1.059 }, - { "row": 2, "col": 9, "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, - { "row": 3, "col": 0, "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, - { "row": 3, "col": 2, "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, - { "row": 3, "col": 3, "x": 3.938, "y": 3.714, "w": 1.059 }, - { "row": 3, "col": 4, "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, - { "row": 3, "col": 5, "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, - { "row": 3, "col": 6, "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, - { "row": 3, "col": 7, "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, - { "row": 3, "col": 9, "x": 10.037, "y": 3.714, "w": 1.059 } + { "row": 0, "col": 1, "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, + { "row": 0, "col": 2, "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, + { "row": 0, "col": 3, "x": 3.175, "y": 0, "w": 1.059 }, + { "row": 0, "col": 4, "x": 4.234, "y": 0.496, "w": 1.059 }, + { "row": 0, "col": 5, "x": 5.292, "y": 0.656, "w": 1.059 }, + { "row": 0, "col": 7, "x": 8.682, "y": 0.656, "w": 1.059 }, + { "row": 0, "col": 8, "x": 9.741, "y": 0.496, "w": 1.059 }, + { "row": 0, "col": 9, "x": 10.8, "y": 0, "w": 1.059 }, + { "row": 0, "col": 10, "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, + { "row": 0, "col": 11, "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, + + { "row": 1, "col": 1, "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, + { "row": 1, "col": 2, "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, + { "row": 1, "col": 3, "x": 3.175, "y": 1, "w": 1.059 }, + { "row": 1, "col": 4, "x": 4.234, "y": 1.496, "w": 1.059 }, + { "row": 1, "col": 5, "x": 5.292, "y": 1.656, "w": 1.059 }, + { "row": 1, "col": 7, "x": 8.682, "y": 1.661, "w": 1.059 }, + { "row": 1, "col": 8, "x": 9.741, "y": 1.496, "w": 1.059 }, + { "row": 1, "col": 9, "x": 10.8, "y": 1, "w": 1.059 }, + { "row": 1, "col": 10, "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, + { "row": 1, "col": 11, "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, + + { "row": 2, "col": 0, "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, + { "row": 2, "col": 1, "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, + { "row": 2, "col": 2, "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, + { "row": 2, "col": 3, "x": 3.175, "y": 2, "w": 1.059 }, + { "row": 2, "col": 4, "x": 4.234, "y": 2.496, "w": 1.059 }, + { "row": 2, "col": 5, "x": 5.292, "y": 2.656, "w": 1.059 }, + { "row": 2, "col": 7, "x": 8.682, "y": 2.661, "w": 1.059 }, + { "row": 2, "col": 8, "x": 9.741, "y": 2.496, "w": 1.059 }, + { "row": 2, "col": 9, "x": 10.8, "y": 2, "w": 1.059 }, + { "row": 2, "col": 10, "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, + { "row": 2, "col": 11, "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, + { "row": 2, "col": 12, "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, + + { "row": 3, "col": 3, "x": 3.938, "y": 3.714, "w": 1.059 }, + { "row": 3, "col": 4, "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, + { "row": 3, "col": 5, "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, + { "row": 3, "col": 7, "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, + { "row": 3, "col": 8, "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, + { "row": 3, "col": 9, "x": 10.037, "y": 3.714, "w": 1.059 } ] } } -} \ No newline at end of file +} From e0970bd353474134b6cdd079e1cd8ae005db94f3 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Sat, 30 Sep 2023 15:20:32 +0000 Subject: [PATCH 09/17] new gaming layers --- config/totem.keymap | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index 5eb466ad..a76f6d67 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -63,49 +63,49 @@ 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 -< 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT - &kp SLASH &kp APOSTROPHE &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS + &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 +< 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp APOSTROPHE + &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS >; }; Nav { label = "Nav"; bindings = < - &trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 - &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS - &kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 -&kp KP_MULTIPLY &kp PLUS &trans &trans &trans &trans &trans &kp DOT + &trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 + &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS +&kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &kp PLUS + &trans &trans &trans &trans &trans &kp DOT >; }; Sym { label = "Sym"; bindings = < - &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans -&kp SLASH &kp HOME &trans &trans &trans &trans &trans &trans + &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME + &trans &trans &trans &trans &trans &trans >; }; Fun { label = "Fun"; bindings = < -&bootloader &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 - &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp F20 &trans &trans &trans &trans &trans &trans &trans + &bootloader &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 + &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &kp F7 + &trans &trans &trans &trans &trans &trans >; }; Gaming { bindings = < - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp A &kp S &kp D &kp F &sl 5 &trans &trans &trans &trans &trans -&kp ESCAPE &trans &trans &trans &trans &trans &trans &trans &trans &trans - &trans &trans &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans + &kp R &kp X &kp C &kp V &kp T &trans &trans &trans &trans &trans + &kp TAB &kp Q &kp W &kp E &sl 5 &trans &trans &trans &trans &trans +&kp ESCAPE &kp LEFT_SHIFT &kp A &kp S &kp D &kp F &trans &trans &trans &trans &trans &trans + &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans >; label = "Gaming"; @@ -113,10 +113,10 @@ Gaming+ { bindings = < -&kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &trans &trans &trans &trans &kp LC(RA(DEL)) - &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans -&kp TAB &to 0 &trans &trans &kp NUMBER_5 &kp NUMBER_6 &trans &trans &trans &trans - &trans &kp LA(F4) &kp J &kp I &kp M &trans &trans &trans + &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &trans &trans &trans &trans &kp LC(RA(DEL)) + &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans +&kp TAB &to 0 &trans &trans &kp NUMBER_5 &kp NUMBER_6 &trans &trans &trans &trans &trans &kp LA(F4) + &kp J &kp I &kp M &trans &trans &trans >; label = "Gaming+"; From 2cc45239073dc41a96efb7707a94e40d62c29730 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Sat, 30 Sep 2023 20:22:32 +0000 Subject: [PATCH 10/17] add end key --- config/info.json | 103 +++++++++++++++++++++++--------------------- config/totem.keymap | 6 +-- 2 files changed, 56 insertions(+), 53 deletions(-) diff --git a/config/info.json b/config/info.json index 82f1deb8..26aebd9e 100644 --- a/config/info.json +++ b/config/info.json @@ -1,50 +1,53 @@ -{ - "url": "https://github.com/GEIGEIGEIST/TOTEM", - "layouts": { - "LAYOUT": { - "layout": [ - { "row": 0, "col": 1, "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, - { "row": 0, "col": 2, "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, - { "row": 0, "col": 3, "x": 3.175, "y": 0, "w": 1.059 }, - { "row": 0, "col": 4, "x": 4.234, "y": 0.496, "w": 1.059 }, - { "row": 0, "col": 5, "x": 5.292, "y": 0.656, "w": 1.059 }, - { "row": 0, "col": 7, "x": 8.682, "y": 0.656, "w": 1.059 }, - { "row": 0, "col": 8, "x": 9.741, "y": 0.496, "w": 1.059 }, - { "row": 0, "col": 9, "x": 10.8, "y": 0, "w": 1.059 }, - { "row": 0, "col": 10, "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, - { "row": 0, "col": 11, "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, - - { "row": 1, "col": 1, "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, - { "row": 1, "col": 2, "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, - { "row": 1, "col": 3, "x": 3.175, "y": 1, "w": 1.059 }, - { "row": 1, "col": 4, "x": 4.234, "y": 1.496, "w": 1.059 }, - { "row": 1, "col": 5, "x": 5.292, "y": 1.656, "w": 1.059 }, - { "row": 1, "col": 7, "x": 8.682, "y": 1.661, "w": 1.059 }, - { "row": 1, "col": 8, "x": 9.741, "y": 1.496, "w": 1.059 }, - { "row": 1, "col": 9, "x": 10.8, "y": 1, "w": 1.059 }, - { "row": 1, "col": 10, "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, - { "row": 1, "col": 11, "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, - - { "row": 2, "col": 0, "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, - { "row": 2, "col": 1, "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, - { "row": 2, "col": 2, "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, - { "row": 2, "col": 3, "x": 3.175, "y": 2, "w": 1.059 }, - { "row": 2, "col": 4, "x": 4.234, "y": 2.496, "w": 1.059 }, - { "row": 2, "col": 5, "x": 5.292, "y": 2.656, "w": 1.059 }, - { "row": 2, "col": 7, "x": 8.682, "y": 2.661, "w": 1.059 }, - { "row": 2, "col": 8, "x": 9.741, "y": 2.496, "w": 1.059 }, - { "row": 2, "col": 9, "x": 10.8, "y": 2, "w": 1.059 }, - { "row": 2, "col": 10, "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, - { "row": 2, "col": 11, "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, - { "row": 2, "col": 12, "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, - - { "row": 3, "col": 3, "x": 3.938, "y": 3.714, "w": 1.059 }, - { "row": 3, "col": 4, "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, - { "row": 3, "col": 5, "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, - { "row": 3, "col": 7, "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, - { "row": 3, "col": 8, "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, - { "row": 3, "col": 9, "x": 10.037, "y": 3.714, "w": 1.059 } - ] - } - } -} +{ + "id": "totem", + "name": "totem", + "url": "https://github.com/GEIGEIGEIST/TOTEM", + "layouts": { + "LAYOUT": { + "layout": [ + { "row": 0, "col": 1, "x": 0.776, "y": 1.519, "w": 1.059, "r": -10, "rx": 1.305, "ry": 2.019 }, + { "row": 0, "col": 2, "x": 1.964, "y": 0.605, "w": 1.059, "r": -4, "rx": 2.494, "ry": 1.105 }, + { "row": 0, "col": 3, "x": 3.175, "y": 0, "w": 1.059 }, + { "row": 0, "col": 4, "x": 4.234, "y": 0.496, "w": 1.059 }, + { "row": 0, "col": 5, "x": 5.292, "y": 0.656, "w": 1.059 }, + { "row": 0, "col": 7, "x": 8.682, "y": 0.656, "w": 1.059 }, + { "row": 0, "col": 8, "x": 9.741, "y": 0.496, "w": 1.059 }, + { "row": 0, "col": 9, "x": 10.8, "y": 0, "w": 1.059 }, + { "row": 0, "col": 10, "x": 12.007, "y": 0.606, "w": 1.059, "r": 4, "rx": 12.537, "ry": 1.106 }, + { "row": 0, "col": 11, "x": 13.199, "y": 1.52, "w": 1.059, "r": 10, "rx": 13.729, "ry": 2.02 }, + + { "row": 1, "col": 1, "x": 0.95, "y": 2.504, "w": 1.059, "r": -10, "rx": 1.479, "ry": 3.004 }, + { "row": 1, "col": 2, "x": 2.033, "y": 1.602, "w": 1.059, "r": -4, "rx": 2.562, "ry": 2.102 }, + { "row": 1, "col": 3, "x": 3.175, "y": 1, "w": 1.059 }, + { "row": 1, "col": 4, "x": 4.234, "y": 1.496, "w": 1.059 }, + { "row": 1, "col": 5, "x": 5.292, "y": 1.656, "w": 1.059 }, + { "row": 1, "col": 7, "x": 8.682, "y": 1.661, "w": 1.059 }, + { "row": 1, "col": 8, "x": 9.741, "y": 1.496, "w": 1.059 }, + { "row": 1, "col": 9, "x": 10.8, "y": 1, "w": 1.059 }, + { "row": 1, "col": 10, "x": 11.937, "y": 1.603, "w": 1.059, "r": 4, "rx": 12.466, "ry": 2.103 }, + { "row": 1, "col": 11, "x": 13.026, "y": 2.505, "w": 1.059, "r": 10, "rx": 13.556, "ry": 3.005 }, + + { "row": 2, "col": 0, "x": 0, "y": 3.231, "w": 1.059, "r": -10, "rx": 0.529, "ry": 3.731 }, + { "row": 2, "col": 1, "x": 1.124, "y": 3.489, "w": 1.059, "r": -10, "rx": 1.654, "ry": 3.989 }, + { "row": 2, "col": 2, "x": 2.103, "y": 2.6, "w": 1.059, "r": -4, "rx": 2.633, "ry": 3.1 }, + { "row": 2, "col": 3, "x": 3.175, "y": 2, "w": 1.059 }, + { "row": 2, "col": 4, "x": 4.234, "y": 2.496, "w": 1.059 }, + { "row": 2, "col": 5, "x": 5.292, "y": 2.656, "w": 1.059 }, + { "row": 2, "col": 7, "x": 8.682, "y": 2.661, "w": 1.059 }, + { "row": 2, "col": 8, "x": 9.741, "y": 2.496, "w": 1.059 }, + { "row": 2, "col": 9, "x": 10.8, "y": 2, "w": 1.059 }, + { "row": 2, "col": 10, "x": 11.868, "y": 2.601, "w": 1.059, "r": 4, "rx": 12.398, "ry": 3.101 }, + { "row": 2, "col": 11, "x": 12.852, "y": 3.49, "w": 1.059, "r": 10, "rx": 13.382, "ry": 3.99 }, + { "row": 2, "col": 12, "x": 13.973, "y": 3.231, "w": 1.059, "r": 10, "rx": 14.503, "ry": 3.731 }, + + { "row": 3, "col": 3, "x": 3.938, "y": 3.714, "w": 1.059 }, + { "row": 3, "col": 4, "x": 5.11, "y": 3.878, "w": 1.059, "r": 15, "rx": 5.639, "ry": 4.378 }, + { "row": 3, "col": 5, "x": 6.195, "y": 4.329, "w": 1.059, "r": 30, "rx": 6.724, "ry": 4.829 }, + { "row": 3, "col": 7, "x": 7.781, "y": 4.329, "w": 1.059, "r": -30, "rx": 8.31, "ry": 4.829 }, + { "row": 3, "col": 8, "x": 8.866, "y": 3.878, "w": 1.059, "r": -15, "rx": 9.396, "ry": 4.378 }, + { "row": 3, "col": 9, "x": 10.037, "y": 3.714, "w": 1.059 } + ] + } + }, + "sensors": [] +} \ No newline at end of file diff --git a/config/totem.keymap b/config/totem.keymap index a76f6d67..78747273 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -93,9 +93,9 @@ Fun { label = "Fun"; bindings = < - &bootloader &trans &trans &trans &trans &trans &trans &trans &trans &kp F1 - &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &kp F7 + &bootloader &trans &trans &trans &trans &trans &trans &trans &kp END &kp F1 + &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 +&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &kp F7 &trans &trans &trans &trans &trans &trans >; }; From ba5ef99c2785c8b109a0444fc2e62db5461d2fd1 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 13:37:00 +0000 Subject: [PATCH 11/17] add titlde --- config/totem.keymap | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index 78747273..1f96d8bb 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -47,9 +47,7 @@ tapping-term-ms = <200>; quick-tap-ms = <125>; global-quick-tap; - bindings = - <&kp>, - <&kp>; + bindings = <&kp>, <&kp>; }; }; @@ -73,7 +71,7 @@ Nav { label = "Nav"; bindings = < - &trans &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 + &kp TILDE &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS &kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &kp PLUS &trans &trans &trans &trans &trans &kp DOT From eeb1147aa636869b693fa69b8da039aefaa0d6e3 Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 18:24:41 +0000 Subject: [PATCH 12/17] gaming layer modifications --- config/totem.keymap | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index 1f96d8bb..58018ff5 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -100,8 +100,8 @@ Gaming { bindings = < - &kp R &kp X &kp C &kp V &kp T &trans &trans &trans &trans &trans - &kp TAB &kp Q &kp W &kp E &sl 5 &trans &trans &trans &trans &trans + &kp Z &kp X &kp C &kp V &sl 5 &trans &trans &trans &trans &trans + &kp TAB &kp Q &kp W &kp E &kp R &trans &trans &trans &trans &trans &kp ESCAPE &kp LEFT_SHIFT &kp A &kp S &kp D &kp F &trans &trans &trans &trans &trans &trans &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans >; @@ -111,10 +111,10 @@ Gaming+ { bindings = < - &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp NUMBER_4 &trans &trans &trans &trans &kp LC(RA(DEL)) - &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans -&kp TAB &to 0 &trans &trans &kp NUMBER_5 &kp NUMBER_6 &trans &trans &trans &trans &trans &kp LA(F4) - &kp J &kp I &kp M &trans &trans &trans + &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp T &trans &trans &trans &trans &kp LC(RA(DEL)) + &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans +&trans &to 0 &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LA(F4) + &kp J &kp I &kp M &trans &trans &trans >; label = "Gaming+"; From 8247479f8289447e6e0600b606ce8e0db37ece7d Mon Sep 17 00:00:00 2001 From: "keymap-editor[bot]" <91849743+keymap-editor[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:18:12 +0000 Subject: [PATCH 13/17] Updated totem.keymap --- config/totem.keymap | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index 58018ff5..8d728b22 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -51,9 +51,7 @@ }; }; - combos { - compatible = "zmk,combos"; - }; + combos { compatible = "zmk,combos"; }; keymap { compatible = "zmk,keymap"; @@ -91,8 +89,8 @@ Fun { label = "Fun"; bindings = < - &bootloader &trans &trans &trans &trans &trans &trans &trans &kp END &kp F1 - &trans &trans &trans &trans &to 4 &trans &trans &trans &trans &kp F10 + &bootloader &trans &trans &trans &to 4 &trans &trans &trans &kp END &kp F1 + &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F10 &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &kp F7 &trans &trans &trans &trans &trans &trans >; @@ -111,10 +109,10 @@ Gaming+ { bindings = < - &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp T &trans &trans &trans &trans &kp LC(RA(DEL)) - &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans -&trans &to 0 &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LA(F4) - &kp J &kp I &kp M &trans &trans &trans + &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp T &kp RA(RC(Y)) &kp RA(RC(U)) &trans &trans &kp LC(RA(DEL)) + &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans +&trans &to 0 &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LA(F4) + &kp J &kp I &kp M &trans &trans &trans >; label = "Gaming+"; From aa2a7eee025adc0f54fdfe51e8857650c73cd0d8 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 25 Apr 2024 18:39:23 +0300 Subject: [PATCH 14/17] Update build.yaml --- build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.yaml b/build.yaml index 72df1163..36dfd080 100644 --- a/build.yaml +++ b/build.yaml @@ -5,5 +5,5 @@ include: shield: totem_right - board: seeeduino_xiao_ble shield: totem_dongle -# - board: seeeduino_xiao_ble -# shield: settings_reset \ No newline at end of file + - board: seeeduino_xiao_ble + shield: settings_reset \ No newline at end of file From 2e044d1fda095873f3f04d0c49d3e1b4e56546a3 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 18 Jul 2024 08:47:59 +0300 Subject: [PATCH 15/17] clean-up dongle conf --- config/boards/shields/totem/totem_dongle.conf | 15 ++++++--------- config/totem.conf | 6 ++++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/config/boards/shields/totem/totem_dongle.conf b/config/boards/shields/totem/totem_dongle.conf index 8f3fc849..db92264d 100644 --- a/config/boards/shields/totem/totem_dongle.conf +++ b/config/boards/shields/totem/totem_dongle.conf @@ -1,13 +1,10 @@ CONFIG_ZMK_SPLIT_BLE_CENTRAL_PERIPHERALS=2 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 +#CONFIG_ZMK_USB_LOGGING=y +#CONFIG_LOG_MODE_IMMEDIATE=n +#CONFIG_LOG_TIMESTAMP_64BIT=y +#CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=5000 +#CONFIG_ZMK_LOG_LEVEL_DBG=y +#CONFIG_KSCAN_LOG_LEVEL_INF=y \ No newline at end of file diff --git a/config/totem.conf b/config/totem.conf index 3ef185b0..ab57e65d 100644 --- a/config/totem.conf +++ b/config/totem.conf @@ -1,3 +1,5 @@ -CONFIG_ZMK_USB_LOGGING=n +CONFIG_BT_CTLR_TX_PWR_PLUS_8=y +CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y -CONFIG_BT_CTLR_TX_PWR_PLUS_8=y \ No newline at end of file +CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_FETCHING=y +CONFIG_ZMK_SPLIT_BLE_CENTRAL_BATTERY_LEVEL_PROXY=y \ No newline at end of file From 78e91c60676f9ede228c024f85ee593ec285df68 Mon Sep 17 00:00:00 2001 From: Victor Date: Sat, 7 Sep 2024 09:43:44 +0100 Subject: [PATCH 16/17] add physical layout, update keymap, build w/ studio --- build.yaml | 2 + config/boards/shields/totem/totem.dtsi | 124 +++++++++++++++++-------- config/totem.keymap | 58 ++++++------ 3 files changed, 114 insertions(+), 70 deletions(-) diff --git a/build.yaml b/build.yaml index 36dfd080..e2f07e5d 100644 --- a/build.yaml +++ b/build.yaml @@ -5,5 +5,7 @@ include: shield: totem_right - board: seeeduino_xiao_ble shield: totem_dongle + snippet: studio-rpc-usb-uart + cmake-args: -DCONFIG_ZMK_STUDIO=y - board: seeeduino_xiao_ble shield: settings_reset \ No newline at end of file diff --git a/config/boards/shields/totem/totem.dtsi b/config/boards/shields/totem/totem.dtsi index 8cee606c..4b2c10ea 100644 --- a/config/boards/shields/totem/totem.dtsi +++ b/config/boards/shields/totem/totem.dtsi @@ -1,44 +1,92 @@ /* - * Copyright (c) 2022 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ +* Copyright (c) 2022 The ZMK Contributors +* +* SPDX-License-Identifier: MIT +*/ - #include +#include +#include - / { - 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) - >; - }; +/ { + chosen { + zmk,kscan = &kscan0; + zmk,physical-layout = &default_layout; + }; + + 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) + >; + }; + default_layout: default_layout { + compatible = "zmk,physical-layout"; + display-name = "TOTEM"; + transform = <&default_transform>; + kscan = <&kscan0>; + + keys // w h x y rot rx ry + = <&key_physical_attrs 105 100 77 151 (-1000) 130 201> + , <&key_physical_attrs 105 100 196 60 (-400) 249 110> + , <&key_physical_attrs 105 100 317 0 0 0 0> + , <&key_physical_attrs 105 100 423 49 0 0 0> + , <&key_physical_attrs 105 100 529 65 0 0 0> + , <&key_physical_attrs 105 100 868 65 0 0 0> + , <&key_physical_attrs 105 100 974 49 0 0 0> + , <&key_physical_attrs 105 100 1080 0 0 0 0> + , <&key_physical_attrs 105 100 1200 60 400 1253 110> + , <&key_physical_attrs 105 100 1319 152 1000 1372 202> + , <&key_physical_attrs 105 100 95 250 (-1000) 147 300> + , <&key_physical_attrs 105 100 203 160 (-400) 256 210> + , <&key_physical_attrs 105 100 317 100 0 0 0> + , <&key_physical_attrs 105 100 423 149 0 0 0> + , <&key_physical_attrs 105 100 529 165 0 0 0> + , <&key_physical_attrs 105 100 868 166 0 0 0> + , <&key_physical_attrs 105 100 974 149 0 0 0> + , <&key_physical_attrs 105 100 1080 100 0 0 0> + , <&key_physical_attrs 105 100 1193 160 400 1246 210> + , <&key_physical_attrs 105 100 1302 250 1000 1355 300> + , <&key_physical_attrs 105 100 0 323 (-1000) 52 373> + , <&key_physical_attrs 105 100 112 348 (-1000) 165 398> + , <&key_physical_attrs 105 100 210 260 (-400) 263 310> + , <&key_physical_attrs 105 100 317 200 0 0 0> + , <&key_physical_attrs 105 100 423 249 0 0 0> + , <&key_physical_attrs 105 100 529 265 0 0 0> + , <&key_physical_attrs 105 100 868 266 0 0 0> + , <&key_physical_attrs 105 100 974 249 0 0 0> + , <&key_physical_attrs 105 100 1080 200 0 0 0> + , <&key_physical_attrs 105 100 1186 260 400 1239 310> + , <&key_physical_attrs 105 100 1285 349 1000 1338 399> + , <&key_physical_attrs 105 100 1397 323 1000 1450 373> + , <&key_physical_attrs 105 100 393 371 0 0 0> + , <&key_physical_attrs 105 100 511 387 1500 563 437> + , <&key_physical_attrs 105 100 619 432 3000 672 482> + , <&key_physical_attrs 105 100 778 432 (-3000) 831 482> + , <&key_physical_attrs 105 100 886 387 (-1500) 939 437> + , <&key_physical_attrs 105 100 1003 371 0 0 0> + ; + }; - 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)> - ; - }; + 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/totem.keymap b/config/totem.keymap index 8d728b22..fbe8a729 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -1,28 +1,24 @@ -// -// ▀▀▀▀▀ ▀▀▀▀▀ ▀▀█▀▀ -// ▄▀▀▀▄ ▄ ▄▀▀▀▄ ▄ ▄▀▀▀▄ █ ▄▀▀▀▄ -// █ █ █ █ █ █ █ █ █ █ █ -// ▀▀▀ █ ▀▀▀ █ ▀▀▀ ▀ ▀▀▀ -// █ ▄▄▄█▄▄▄ █ █ -// ▀ █ █ █ █▄█ -// ▀▀▀▀▀ █ █ █ ▀ -// ▀ ▀ ▀ -// -// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ +// +// ▀▀▀▀▀ ▀▀▀▀▀ ▀▀█▀▀ +// ▄▀▀▀▄ ▄ ▄▀▀▀▄ ▄ ▄▀▀▀▄ █ ▄▀▀▀▄ +// █ █ █ █ █ █ █ █ █ █ █ +// ▀▀▀ █ ▀▀▀ █ ▀▀▀ ▀ ▀▀▀ +// █ ▄▄▄█▄▄▄ █ █ +// ▀ █ █ █ █▄█ +// ▀▀▀▀▀ █ █ █ ▀ +// ▀ ▀ ▀ +// +// ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ #include #include #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 +#define Nav 1 +#define Sym 2 +#define Fun 3 +#define Game 4 +#define Gameplus 5 &mt { quick-tap-ms = <100>; @@ -57,7 +53,7 @@ compatible = "zmk,keymap"; Base { - label = "Base"; + display-name = "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 @@ -67,7 +63,7 @@ }; Nav { - label = "Nav"; + display-name = "Nav"; bindings = < &kp TILDE &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS @@ -77,17 +73,17 @@ }; Sym { - label = "Sym"; + display-name = "Sym"; bindings = < - &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&trans &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME - &trans &trans &trans &trans &trans &trans + &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans +&studio_unlock &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME + &trans &trans &trans &trans &trans &trans >; }; Fun { - label = "Fun"; + display-name = "Fun"; bindings = < &bootloader &trans &trans &trans &to 4 &trans &trans &trans &kp END &kp F1 &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F10 @@ -97,25 +93,23 @@ }; Gaming { + display-name = "Gaming"; bindings = < &kp Z &kp X &kp C &kp V &sl 5 &trans &trans &trans &trans &trans &kp TAB &kp Q &kp W &kp E &kp R &trans &trans &trans &trans &trans &kp ESCAPE &kp LEFT_SHIFT &kp A &kp S &kp D &kp F &trans &trans &trans &trans &trans &trans &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans >; - - label = "Gaming"; }; Gaming+ { + display-name = "Gaming+"; bindings = < &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp T &kp RA(RC(Y)) &kp RA(RC(U)) &trans &trans &kp LC(RA(DEL)) &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans &trans &to 0 &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LA(F4) &kp J &kp I &kp M &trans &trans &trans >; - - label = "Gaming+"; }; }; }; From e3d958667f00836bde4d8728306e2bb18f3e2fa4 Mon Sep 17 00:00:00 2001 From: DA21bad <110840929+DA21bad@users.noreply.github.com> Date: Thu, 7 Nov 2024 10:50:49 -0500 Subject: [PATCH 17/17] Personalized totem.keymap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As I am moving from a QWERTY keyboard and is my first keyboard this is a personalized layer. Also my main language is spanish so I have to include ñ in the layout --- config/totem.keymap | 210 +++++++++++++++++++++++++++++++------------- 1 file changed, 148 insertions(+), 62 deletions(-) diff --git a/config/totem.keymap b/config/totem.keymap index fbe8a729..7f9b91ae 100644 --- a/config/totem.keymap +++ b/config/totem.keymap @@ -11,14 +11,16 @@ // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ #include +#include #include +#include -#define Base 0 -#define Nav 1 -#define Sym 2 -#define Fun 3 -#define Game 4 -#define Gameplus 5 +#define BASE 0 +#define NAV 1 +#define SYM 2 +#define ADJ 3 +#define TVP1 4 +#define TVP2 5 &mt { quick-tap-ms = <100>; @@ -27,88 +29,172 @@ 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 = <200>; - quick-tap-ms = <125>; - global-quick-tap; - bindings = <&kp>, <&kp>; + combos { + compatible = "zmk,combos"; + + combo_esc { + timeout-ms = <50>; + key-positions = <0 1>; + bindings = <&kp ESC>; + }; + + kill { + bindings = <&kp RC(RA(BACKSPACE))>; + key-positions = <30 31 19>; + }; + + backspace { + bindings = <&kp BACKSPACE>; + key-positions = <9 8>; + }; + + Delete { + bindings = <&kp DEL>; + key-positions = <7 6>; + }; + + Tabulate { + bindings = <&kp TAB>; + key-positions = <0 20>; + }; + + gaming_layer { + bindings = <&tog 4>; + key-positions = <36 33>; + }; + + Enter { + bindings = <&kp ENTER>; + key-positions = <30 29>; }; }; - combos { compatible = "zmk,combos"; }; + macros { + ene: ene { + compatible = "zmk,behavior-macro"; + #binding-cells = <0>; + bindings = <&kp LA(N) &kp TILDE>; + label = "ENE"; + }; + }; keymap { compatible = "zmk,keymap"; - Base { - display-name = "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 -< 3 ESCAPE &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp SLASH &kp APOSTROPHE - &mt LCTRL DEL < 1 TAB &kp SPACE &kp RET < 2 BSPC &kp MINUS - >; - }; + // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + + base_layer { + // ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ + + label = "BASE"; + + // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ + // ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ + // ┃ Q ┃ W ┃ F ┃ P ┃ G ┃ ┃ J ┃ L ┃ U ┃ Y ┃ ; ┃ + // ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ + // ┃ A ┃ R ┃ S ┃ T ┃ D ┃ ┃ H ┃ N ┃ E ┃ I ┃ O ┃ + // ┏━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┓ + // ┃ Q ┃ Z ┃ X ┃ C ┃ V ┃ B ┃ ┃ K ┃ M ┃ , ┃ . ┃ / ┃ \ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + // ┃ DEL ┃ TAB ┃ SPC ┃ ┃ ENTER ┃ ┃ BSPC ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ - Nav { - display-name = "Nav"; bindings = < - &kp TILDE &trans &kp UP_ARROW &trans &kp LBRC &kp RBRC &kp NUMBER_7 &kp NUMBER_8 &kp NUMBER_9 &kp NUMBER_0 - &kp LEFT_SHIFT &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp NUMBER_4 &kp NUMBER_5 &kp NUMBER_6 &kp MINUS -&kp LEFT_ALT &kp LEFT_WIN &kp MINUS &trans &kp PLUS &kp LPAR &kp RPAR &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp KP_MULTIPLY &kp PLUS - &trans &trans &trans &trans &trans &kp DOT + &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P + &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &ene +&kp LEFT_SHIFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp APOS &kp BACKSPACE + &kp LEFT_CONTROL < 1 NUMBER_1 &kp SPACE &kp LEFT_WIN < 2 NUMBER_2 &kp RC(TAB) >; }; - Sym { - display-name = "Sym"; + // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + + nav_layer { + // ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ + + label = "NAVI"; + + // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ + // ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ + // ┃ ┃ ┃ UP ┃ ┃ { ┃ ┃ } ┃ 7 ┃ 8 ┃ 9 ┃ + ┃ + // ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ + // ┃ SHIFT ┃ LEFT ┃ DOWN ┃ RIGHT ┃ [ ┃ ┃ ] ┃ 4 ┃ 5 ┃ 6 ┃ - ┃ + // ┏━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┓ + // ┃ ┃ ┃ P UP ┃ C LOCK ┃ P DOWN ┃ ( ┃ ┃ ) ┃ 1 ┃ 2 ┃ 3 ┃ * ┃ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + // ┃ ┃ TAB ┃ SPC ┃ ┃ DEL ┃ 0 ┃ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + bindings = < - &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PERCENT &kp CARET &kp AMPERSAND &kp KP_ASTERISK &kp SQT &kp DQT - &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&studio_unlock &trans &trans &trans &trans &trans &kp UNDER &kp EQUAL &trans &trans &kp SLASH &kp HOME - &trans &trans &trans &trans &trans &trans + &mkp MCLK &kp END &kp UP &kp HOME &kp LBRC &kp RBRC &kp KP_N7 &kp KP_N8 &kp KP_N9 &kp PLUS + &mkp LCLK &kp LEFT &kp DOWN &kp RIGHT &kp LBKT &kp RBKT &kp KP_N4 &kp KP_N5 &kp KP_N6 &kp MINUS +&mkp RCLK &mo 3 &kp PG_UP &kp CAPS &kp PG_DN &kp LPAR &kp RPAR &kp KP_N1 &kp KP_N2 &kp KP_N3 &kp DOT &kp SLASH + &kp BACKSPACE &trans &trans &kp ASTERISK &trans &kp KP_NUMBER_0 >; }; - Fun { - display-name = "Fun"; + // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + + sim_layer { + // ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ + + label = "SYM"; + + // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ + // ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ + // ┃ ! ┃ @ ┃ # ┃ $ ┃ % ┃ ┃ ˆ ┃ & ┃ Ü ┃ ' ┃ " ┃ + // ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ + // ┃ Ä ┃ ┃ SZ ┃ ┃ ┃ ┃ MUTE ┃ YEN ┃ EURO ┃ POUND ┃ Ö ┃ + // ┏━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┓ + // ┃ ┃ EMAIL1 ┃ EMAIL2 ┃ ┃ ┃ ┃ ┃ VOL- ┃ VOL+ ┃ LAST ┃ NEXT ┃ \ ┃ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + // ┃ ┃ GIF ┃ ADJ ┃ ┃ ┃ ┃ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + bindings = < - &bootloader &trans &trans &trans &to 4 &trans &trans &trans &kp END &kp F1 - &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F10 -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp F20 &kp F7 - &trans &trans &trans &trans &trans &trans + &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp K_MUTE &kp C_VOLUME_DOWN &kp C_VOLUME_UP &kp C_BRIGHTNESS_DEC &kp C_BRIGHTNESS_INC + &kp QUESTION &kp UNDER &kp BACKSLASH &kp CARET &kp AMPERSAND &kp C_PREVIOUS &kp C_PLAY_PAUSE &kp C_NEXT &kp LC(V) &kp LS(Z) +&kp SEMICOLON &kp COLON &kp MINUS &kp SLASH &kp DOUBLE_QUOTES &kp SINGLE_QUOTE &kp LESS_THAN &kp GREATER_THAN &kp LC(C) &kp LC(S) &kp LC(O) &kp C_AC_NEXT_KEYBOARD_LAYOUT_SELECT + &kp EQUAL &trans &trans &mo 3 &trans &trans >; }; - Gaming { - display-name = "Gaming"; + // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + + fn_layer { + // ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓ + + label = "ADJ"; + + // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ + // ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ ┏━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┳━━━━━━━━━━━┓ + // ┃ RESET ┃ BT CLEAR ┃ OUT TOG ┃ ┃ ┃ ┃ ┃ F7 ┃ F8 ┃ F9 ┃ F12 ┃ + // ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ + // ┃ BOOTLOAD ┃ BT NEXT ┃ ┃ ┃ ┃ ┃ ┃ F4 ┃ F5 ┃ F6 ┃ F11 ┃ + // ┏━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┓ + // ┃ ┃ ┃ BT PREV ┃ ┃ ┃ ┃ ┃ ┃ F1 ┃ F2 ┃ F3 ┃ F10 ┃ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┫ ┣━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━╋━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + // ┃ ┃ ┃ ┃ ┃ ┃ ┃ ┃ + // ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ ┗━━━━━━━━━━━┻━━━━━━━━━━━┻━━━━━━━━━━━┛ + bindings = < - &kp Z &kp X &kp C &kp V &sl 5 &trans &trans &trans &trans &trans - &kp TAB &kp Q &kp W &kp E &kp R &trans &trans &trans &trans &trans -&kp ESCAPE &kp LEFT_SHIFT &kp A &kp S &kp D &kp F &trans &trans &trans &trans &trans &trans - &kp LCTRL &kp LEFT_ALT &trans &trans &trans &trans + &sys_reset &bt BT_CLR &trans &trans &trans &trans &kp F7 &kp F8 &kp F9 &kp F12 + &bootloader &bt BT_NXT &trans &trans &trans &trans &kp F4 &kp F5 &kp F6 &kp F11 +&trans &trans &bt BT_PRV &trans &trans &trans &trans &kp F1 &kp F2 &kp F3 &kp F10 &trans + &trans &trans &trans &trans &trans &trans >; }; - Gaming+ { - display-name = "Gaming+"; + // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + // ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + + gaming_layer { bindings = < - &kp F10 &kp NUMBER_1 &kp NUMBER_2 &kp NUMBER_3 &kp T &kp RA(RC(Y)) &kp RA(RC(U)) &trans &trans &kp LC(RA(DEL)) - &kp L &kp O &kp Y &kp K &kp G &kp F5 &trans &trans &trans &trans -&trans &to 0 &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp LA(F4) - &kp J &kp I &kp M &trans &trans &trans + &kp Q &kp W &kp E &kp R &kp T &kp PLUS &trans &kp UP_ARROW &trans &trans + &kp A &kp S &kp D &kp F &kp G &kp MINUS &kp LEFT_ARROW &kp DOWN &kp RIGHT &trans +&trans &kp Z &kp X &kp C &kp V &kp B &kp LEFT_BRACKET &kp RIGHT_BRACKET &trans &trans &trans &trans + &trans &trans &trans &trans &trans &trans >; }; };