diff options
author | jack <[email protected]> | 2023-02-25 10:59:31 -0700 |
---|---|---|
committer | jack <[email protected]> | 2023-02-25 10:59:31 -0700 |
commit | a1a3bda3543555fb7774c046a44919ce3ffe9eda (patch) | |
tree | 7a1817af7fff4279c7fc7b5baedc8e3aac91ea35 | |
parent | 119d328444fcdd88619022c8a8e2b624f0e7976d (diff) | |
download | zmk_build-a1a3bda3543555fb7774c046a44919ce3ffe9eda.tar.gz zmk_build-a1a3bda3543555fb7774c046a44919ce3ffe9eda.zip |
add "features" to sweep
remove lulu (refer to older commit pls)
-rw-r--r-- | config/splitkb_aurora_sweep.conf | 2 | ||||
-rw-r--r-- | config/splitkb_aurora_sweep.keymap | 24 | ||||
-rw-r--r-- | lulu/Kconfig.defconfig | 15 | ||||
-rw-r--r-- | lulu/Kconfig.shield | 8 | ||||
-rw-r--r-- | lulu/boards/nice_nano_v2.overlay | 28 | ||||
-rw-r--r-- | lulu/lulu.conf | 4 | ||||
-rw-r--r-- | lulu/lulu.dtsi | 62 | ||||
-rw-r--r-- | lulu/lulu.keymap | 41 | ||||
-rw-r--r-- | lulu/lulu.zmk.yml | 16 | ||||
-rw-r--r-- | lulu/lulu_left.conf | 0 | ||||
-rw-r--r-- | lulu/lulu_left.overlay | 18 | ||||
-rw-r--r-- | lulu/lulu_right.conf | 0 | ||||
-rw-r--r-- | lulu/lulu_right.overlay | 18 |
13 files changed, 14 insertions, 222 deletions
diff --git a/config/splitkb_aurora_sweep.conf b/config/splitkb_aurora_sweep.conf new file mode 100644 index 0000000..d85021a --- /dev/null +++ b/config/splitkb_aurora_sweep.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SLEEP=y +CONFIG_ZMK_USB_LOGGING=n diff --git a/config/splitkb_aurora_sweep.keymap b/config/splitkb_aurora_sweep.keymap index ced54e8..d35bc90 100644 --- a/config/splitkb_aurora_sweep.keymap +++ b/config/splitkb_aurora_sweep.keymap @@ -55,17 +55,17 @@ }; combos { compatible = "zmk,combos"; - // name output pos. - COMBO(ru_ent, &kp RET, 3 6) - COMBO(dk_eql, &kp EQUAL, 12 17) - COMBO(gh_quot, &td_quot_dquo, 14 15) - COMBO(ty_coln, &kp COLON, 4 5) - COMBO(bn_unds, &kp UNDER, 24 25) - COMBO(er_cbkt, &td_cbrkt, 2 3) - COMBO(ui_brkt, &td_brkt, 6 7) - COMBO(ccom_plus, &kp PLUS, 22 27) - COMBO(ei_bsls, &td_bsls_pipe, 2 7) - COMBO(vm_mins, &kp MINUS, 23 26) - COMBO(fj_capw, &caps_word, 13 16) + // name output pos. + COMBO(ru_ent, &kp RET, 3 6) + COMBO(dk_eql, &kp EQUAL, 12 17) + COMBO(gh_quot, &td_quot_dquo, 14 15) + COMBO(ty_coln, &kp COLON, 4 5) + COMBO(bn_unds, &kp UNDER, 24 25) + COMBO(er_cbkt, &td_cbrkt, 2 3) + COMBO(ui_brkt, &td_brkt, 6 7) + COMBO(ccom_plus, &kp PLUS, 22 27) + COMBO(ei_bsls, &td_bsls_pipe, 2 7) + COMBO(vm_mins, &kp MINUS, 23 26) + COMBO(fj_capw, &caps_word, 13 16) }; }; diff --git a/lulu/Kconfig.defconfig b/lulu/Kconfig.defconfig deleted file mode 100644 index 636195e..0000000 --- a/lulu/Kconfig.defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2022 jack (@waffle87) -# SPDX-License-Identifier: MIT - -if SHIELD_LULU_LEFT -config ZMK_KEYBOARD_NAME - default "lulu" - -config ZMK_SPLIT_ROLE_CENTRAL - default y -endif - -if SHIELD_LULU_LEFT || SHIELD_LULU_RIGHT -config ZMK_SPLIT - default y -endif diff --git a/lulu/Kconfig.shield b/lulu/Kconfig.shield deleted file mode 100644 index 0f82b69..0000000 --- a/lulu/Kconfig.shield +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 2022 jack (@waffle87) -# SPDX-License-Identifier: MIT - -config SHIELD_LULU_LEFT - def_bool $(shields_list_contains,lulu_left) - -config SHIELD_LULU_RIGHT - def_bool $(shields_list_contains,lulu_right) diff --git a/lulu/boards/nice_nano_v2.overlay b/lulu/boards/nice_nano_v2.overlay deleted file mode 100644 index fbd0466..0000000 --- a/lulu/boards/nice_nano_v2.overlay +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: MIT - -#include <dt-bindings/led/led.h> - -&spi1 { - compatible = "nordic,nrf-spim"; - status = "okay"; - mosi-pin = <6>; - sck-pin = <5>; - miso-pin = <7>; - led_strip: ws2812@0 { - compatible = "worldsemi,ws2812-spi"; - label = "WS2812"; - reg = <0>; - spi-max-frequency = <4000000>; - chain-length = <6>; - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; - color-mapping = <LED_COLOR_ID_GREEN LED_COLOR_ID_RED LED_COLOR_ID_BLUE>; - }; -}; - -/ { - chosen { - zmk,underglow = &led_strip; - } -} diff --git a/lulu/lulu.conf b/lulu/lulu.conf deleted file mode 100644 index 0557c93..0000000 --- a/lulu/lulu.conf +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y -CONFIG_ZMK_RGB_UNDERGLOW=n -CONFIG_WS2812_STRIP=n diff --git a/lulu/lulu.dtsi b/lulu/lulu.dtsi deleted file mode 100644 index 77295a9..0000000 --- a/lulu/lulu.dtsi +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: MIT - -#include <dt-bindings/zmk/matrix_transform.h> - -/ { - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - zephyr,display = &oled; - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <16>; - rows = <5>; - 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(0,10) RC(0,11) -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(1,10) RC(1,11) -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(2,10) RC(2,11) -RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(4,5) RC(4,6) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) - RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,7) RC(4,8) RC(4,9) RC(4,10) - >; - }; - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; - diode-direction = "col2row"; - row-gpios = - <&pro_micro 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>, - <&pro_micro 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>, - <&pro_micro 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>, - <&pro_micro 8 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>, - <&pro_micro 9 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; - }; - left_encoder: encoder_left { - compatible = "alps,ec11"; - label = "LEFT_ENCODER"; - a-gpios = <&pro_micro 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - b-gpios = <&pro_micro 20 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; - resolution = <4>; - }; - }; - -&pro_micro_i2c { - status = "okay"; - oled: ssd1306@3c { - compatible = "solomon,ssd13066fb"; - reg = <0x3c>; - label = "DISPLAY"; - width = <128>; - height = <32>; - segment-offset = <0>; - page-offset = <0>; - display-offset = <0>; - multiplex-ration = <31>; - segment-remap; - com-invdir; - com-sequential; - prechargep = <0x22>; - }; -}; diff --git a/lulu/lulu.keymap b/lulu/lulu.keymap deleted file mode 100644 index 61c4e6d..0000000 --- a/lulu/lulu.keymap +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: MIT - -#include <behaviors.dtsi> -#include <dt-bindings/zmk/keys.h> -#include <dt-bindings/zmk/bt.h> -#include <dt-bindings/zmk/ext_power.h> - -/ { - keymap { - compatible = "zmk,keymap"; - 0 { - bindings = < -&kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp GRAVE -&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp MINUS -&kp LCTRL &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp SQT -&kp LSHFT &kp Z &kp X &kp C &kp V &kp B &kp LBKT &kp RBKT &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT - &kp LALT &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp BSPC &kp RGUI - >; - sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; - }; - 1 { - bindings = < -&bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans &trans &trans &trans &trans &trans -&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 -&kp GRAVE &kp EXCL &kp AT &kp HASH &kp DOLLAR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp TILDE -&trans &ext_power EP_ON &ext_power EP_OFF &ext_power EP_TOG &trans &trans &trans &trans &trans &kp MINUS &kp KP_PLUS &kp LBRC &kp RBRC &kp PIPE - &trans &trans &trans &trans &trans &trans &trans &trans - >; - }; - 2 { - bindings = < -&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans -&kp GRAVE &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans -&kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans -&kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &trans &kp KP_PLUS &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH - &trans &trans &trans &trans &trans &trans &trans &trans - >; - }; - }; - }; diff --git a/lulu/lulu.zmk.yml b/lulu/lulu.zmk.yml deleted file mode 100644 index 4e84e25..0000000 --- a/lulu/lulu.zmk.yml +++ /dev/null @@ -1,16 +0,0 @@ -file_format: "1" -id: lulu -name: Lulu -type: shield -url: https://boardsource.xyz/projects/60de24d6847112054777bbdd -requires: - - pro_micro -exposes: - - i2c_oled -features: - - keys - - display - - underglow -siblings: - - lulu_left - - lulu_right diff --git a/lulu/lulu_left.conf b/lulu/lulu_left.conf deleted file mode 100644 index e69de29..0000000 --- a/lulu/lulu_left.conf +++ /dev/null diff --git a/lulu/lulu_left.overlay b/lulu/lulu_left.overlay deleted file mode 100644 index b54fa8a..0000000 --- a/lulu/lulu_left.overlay +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: MIT - -#include "lulu.dtsi" - -&kscan0 { - col-gpios = - <&pro_micro 19 GPIO_ACTIVE_HIGH>, - <&pro_micro 18 GPIO_ACTIVE_HIGH>, - <&pro_micro 15 GPIO_ACTIVE_HIGH>, - <&pro_micro 14 GPIO_ACTIVE_HIGH>, - <&pro_micro 16 GPIO_ACTIVE_HIGH>, - <&pro_micro 10 GPIO_ACTIVE_HIGH>; -}; - -&left_encoder { - status = "okay"; -}; diff --git a/lulu/lulu_right.conf b/lulu/lulu_right.conf deleted file mode 100644 index e69de29..0000000 --- a/lulu/lulu_right.conf +++ /dev/null diff --git a/lulu/lulu_right.overlay b/lulu/lulu_right.overlay deleted file mode 100644 index fa4f531..0000000 --- a/lulu/lulu_right.overlay +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2022 jack (@waffle87) -// SPDX-License-Identifier: MIT - -#include "lulu.dtsi" - -&default_transform { - col-offset = <6>; -}; - -&kscan0 { - col-gpios = - <&pro_micro 10 GPIO_ACTIVE_HIGH>, - <&pro_micro 16 GPIO_ACTIVE_HIGH>, - <&pro_micro 14 GPIO_ACTIVE_HIGH>, - <&pro_micro 15 GPIO_ACTIVE_HIGH>, - <&pro_micro 18 GPIO_ACTIVE_HIGH>, - <&pro_micro 19 GPIO_ACTIVE_HIGH>; -}; |