From f98dd814f92f99e2928a79651daea9b1f0e6468f Mon Sep 17 00:00:00 2001 From: Alex Kang Date: Tue, 12 Sep 2023 07:18:52 -0700 Subject: [PATCH] Revert Microdox V2 keymap changes. They're unneeded. --- app/boards/shields/microdox/microdox.keymap | 67 ++++++++++++++++- .../shields/microdox/microdox_common.keymap | 73 ------------------- .../shields/microdox/microdox_v2.keymap | 7 -- 3 files changed, 66 insertions(+), 81 deletions(-) delete mode 100644 app/boards/shields/microdox/microdox_common.keymap delete mode 100644 app/boards/shields/microdox/microdox_v2.keymap diff --git a/app/boards/shields/microdox/microdox.keymap b/app/boards/shields/microdox/microdox.keymap index de04a7c2..f7f5878b 100644 --- a/app/boards/shields/microdox/microdox.keymap +++ b/app/boards/shields/microdox/microdox.keymap @@ -4,4 +4,69 @@ * SPDX-License-Identifier: MIT */ -#include "microdox_common.keymap" +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ----------------------------------------------------------------------------------------- +// | Q | W | E | R | T | | Y | U | I | O | P | +// | A | S | D | F | G | | H | J | K | L | ; | +// | Z | X | C | V | B | | N | M | , | . | / | +// | GUI | NAV | SHFT | | SPC | SYM | ALT | + bindings = < + &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 &kp SEMI + &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH + &kp LGUI &mo 1 &kp LSHFT &kp SPACE &mo 2 &kp RALT + >; + }; + nav_layer { +// ----------------------------------------------------------------------------------------- +// |BTCLR| | ESC | ~ | | | TAB | HOME | UP | END | DEL | +// | BT1 | GUI | ALT | CTRL | NUM | | / | LEFT | DOWN | RGT | BKSP | +// | BT2 | | | | | | \ | ENT | | | | +// | | | | | | | | + bindings = < + &bt BT_CLR &trans &kp ESC &kp TILDE &trans &kp TAB &kp HOME &kp UP &kp END &kp DEL + &bt BT_SEL 0 &kp K_CMENU &kp RALT &kp LCTRL &mo 3 &kp FSLH &kp LEFT &kp DOWN &kp RIGHT &kp BSPC + &bt BT_SEL 1 &trans &trans &trans &trans &kp BSLH &kp RET &trans &trans &trans + &trans &trans &trans &trans &trans &trans + >; + }; + + sym_layer { +// ----------------------------------------------------------------------------------------- +// | ! | @ | # | $ | % | | ^ | & | * | ( | ) | +// | | | | | | | - | = | { | } | "|" | +// | | | | | | | _ | + | [ | ] | \ | +// | GUI | | SPC | | ENT | | ALT | + bindings = < + &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR + &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp PIPE + &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp BSLH + &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT + >; + }; + +// This layer is unreachable until "tri layer state" is sorted out. +// Leaving it here for completeness. + num_layer { +// ----------------------------------------------------------------------------------------- +// | | | | | | | A | 7 | 8 | 9 | D | +// | | | | | | | B | 4 | 5 | 6 | E | +// | | | | | | | C | 1 | 2 | 3 | F | +// | | | | | 0 | . | | + bindings = < + &trans &trans &trans &trans &trans &kp A &kp N7 &kp N8 &kp N9 &kp D + &trans &trans &trans &trans &trans &kp B &kp N4 &kp N5 &kp N6 &kp E + &trans &trans &trans &trans &trans &kp C &kp N1 &kp N2 &kp N3 &kp F + &trans &trans &trans &kp N0 &kp DOT &trans + >; + }; + }; +}; \ No newline at end of file diff --git a/app/boards/shields/microdox/microdox_common.keymap b/app/boards/shields/microdox/microdox_common.keymap deleted file mode 100644 index 3431e07b..00000000 --- a/app/boards/shields/microdox/microdox_common.keymap +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2023 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include - -/ { -keymap { - compatible = "zmk,keymap"; - - default_layer { -// ----------------------------------------------------------------------------------------- -// | Q | W | E | R | T | | Y | U | I | O | P | -// | A | S | D | F | G | | H | J | K | L | ; | -// | Z | X | C | V | B | | N | M | , | . | / | -// | GUI | NAV | SHFT | | SPC | SYM | ALT | - bindings = < - &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 &kp SEMI - &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH - &kp LGUI &mo 1 &kp LSHFT &kp SPACE &mo 2 &kp RALT - >; - }; - - nav_layer { -// ----------------------------------------------------------------------------------------- -// |BTCLR| | ESC | ~ | | | TAB | HOME | UP | END | DEL | -// | BT1 | GUI | ALT | CTRL | NUM | | / | LEFT | DOWN | RGT | BKSP | -// | BT2 | | | | | | \ | ENT | | | | -// | | | | | | | | - bindings = < - &bt BT_CLR &trans &kp ESC &kp TILDE &trans &kp TAB &kp HOME &kp UP &kp END &kp DEL - &bt BT_SEL 0 &kp K_CMENU &kp RALT &kp LCTRL &mo 3 &kp FSLH &kp LEFT &kp DOWN &kp RIGHT &kp BSPC - &bt BT_SEL 1 &trans &trans &trans &trans &kp BSLH &kp RET &trans &trans &trans - &trans &trans &trans &trans &trans &trans - >; - }; - - sym_layer { -// ----------------------------------------------------------------------------------------- -// | ! | @ | # | $ | % | | ^ | & | * | ( | ) | -// | | | | | | | - | = | { | } | "|" | -// | | | | | | | _ | + | [ | ] | \ | -// | GUI | | SPC | | ENT | | ALT | - bindings = < - &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR - &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp PIPE - &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp BSLH - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT - >; - }; - -// This layer is unreachable until "tri layer state" is sorted out. -// Leaving it here for completeness. - num_layer { -// ----------------------------------------------------------------------------------------- -// | | | | | | | A | 7 | 8 | 9 | D | -// | | | | | | | B | 4 | 5 | 6 | E | -// | | | | | | | C | 1 | 2 | 3 | F | -// | | | | | 0 | . | | - bindings = < - &trans &trans &trans &trans &trans &kp A &kp N7 &kp N8 &kp N9 &kp D - &trans &trans &trans &trans &trans &kp B &kp N4 &kp N5 &kp N6 &kp E - &trans &trans &trans &trans &trans &kp C &kp N1 &kp N2 &kp N3 &kp F - &trans &trans &trans &kp N0 &kp DOT &trans - >; - }; -}; -}; diff --git a/app/boards/shields/microdox/microdox_v2.keymap b/app/boards/shields/microdox/microdox_v2.keymap deleted file mode 100644 index b20a4965..00000000 --- a/app/boards/shields/microdox/microdox_v2.keymap +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2023 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include "microdox_common.keymap"