From da9bc6702f1d0c928ecaac4b5a1d2242d244cb92 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Fri, 17 Mar 2023 16:00:40 -0400 Subject: [PATCH] Prepping for PR --- app/boards/shields/bb65/Kconfig.defconfig | 26 ++++ app/boards/shields/bb65/Kconfig.shield | 5 + app/boards/shields/bb65/bb65.conf | 10 ++ app/boards/shields/bb65/bb65.keymap | 119 ++++++++++++++++++ app/boards/shields/bb65/bb65.overlay | 63 ++++++++++ app/boards/shields/bb65/bb65.yml | 10 ++ app/boards/shields/bb65/boards/pillbug.conf | 3 + .../shields/bb65/boards/pillbug.overlay | 38 ++++++ 8 files changed, 274 insertions(+) create mode 100644 app/boards/shields/bb65/Kconfig.defconfig create mode 100644 app/boards/shields/bb65/Kconfig.shield create mode 100644 app/boards/shields/bb65/bb65.conf create mode 100644 app/boards/shields/bb65/bb65.keymap create mode 100644 app/boards/shields/bb65/bb65.overlay create mode 100644 app/boards/shields/bb65/bb65.yml create mode 100644 app/boards/shields/bb65/boards/pillbug.conf create mode 100644 app/boards/shields/bb65/boards/pillbug.overlay diff --git a/app/boards/shields/bb65/Kconfig.defconfig b/app/boards/shields/bb65/Kconfig.defconfig new file mode 100644 index 00000000..8e45a4d4 --- /dev/null +++ b/app/boards/shields/bb65/Kconfig.defconfig @@ -0,0 +1,26 @@ +# Copyright (c) 2023 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_BB65 + +config ZMK_KEYBOARD_NAME + default "BB65" + +if LVGL + +config LVGL_VDB_SIZE + default 64 + +config LVGL_DPI + default 148 + +config LVGL_BITS_PER_PIXEL + default 1 + +choice LVGL_COLOR_DEPTH + default LVGL_COLOR_DEPTH_1 +endchoice + +endif # LVGL + +endif diff --git a/app/boards/shields/bb65/Kconfig.shield b/app/boards/shields/bb65/Kconfig.shield new file mode 100644 index 00000000..617926f6 --- /dev/null +++ b/app/boards/shields/bb65/Kconfig.shield @@ -0,0 +1,5 @@ +# Copyright (c) 2023 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_BB65 + def_bool $(shields_list_contains,bb65) diff --git a/app/boards/shields/bb65/bb65.conf b/app/boards/shields/bb65/bb65.conf new file mode 100644 index 00000000..af141633 --- /dev/null +++ b/app/boards/shields/bb65/bb65.conf @@ -0,0 +1,10 @@ +# Uncomment to turn on logging, and set ZMK logging to debug output +# CONFIG_ZMK_USB_LOGGING=y + +# Uncomment both to enable encoder +# CONFIG_EC11=y +# CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y + +# Quality of life settings +# CONFIG_ZMK_IDLE_TIMEOUT=300000 +# CONFIG_BT_CTLR_TX_PWR_PLUS_8=y diff --git a/app/boards/shields/bb65/bb65.keymap b/app/boards/shields/bb65/bb65.keymap new file mode 100644 index 00000000..728be0a7 --- /dev/null +++ b/app/boards/shields/bb65/bb65.keymap @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include +#include +#include + +#define DEFAULT 0 +#define FN 1 +#define SETTINGS 2 +#define LOCK 3 + +#define TIMEOUT 300 + +&encoder_1 { + status = "okay"; +}; + +/ { + combos { + compatible = "zmk,combos"; + combo_btclr { + timeout-ms = ; + key-positions = <1 6>; + bindings = <&bt BT_CLR>; + }; + combo_lock { + timeout-ms = ; + key-positions = <1 7>; + bindings = <&tog 2>; + }; + combo_reset { + timeout-ms = ; + key-positions = <1 3>; + bindings = <&reset>; + }; + combo_bootloader { + timeout-ms = ; + key-positions = <1 15>; + bindings = <&bootloader>; + }; + combo_lock { + timeout-ms = ; + key-positions = <1 12>; + bindings = <&tog LOCK>; + }; + combo_bt_nxt { + timeout-ms = ; + key-positions = <1 4>; + bindings = <&bt BT_NXT>; + }; + }; + + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&encoder_1>; + }; + + keymap0: keymap { + compatible = "zmk,keymap"; + + default_layer { + label = "default layer"; + bindings = < + &kp ESC &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp MINUS &kp EQUAL &kp BSPC + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp LBKT &kp RBKT &kp BSLH + &mo FN &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SEMI &kp APOS &trans &kp ENTER + &kp LSHFT &trans &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp COMMA &kp DOT &kp FSLH &kp RSHFT &kp UP &ext_power EP_TOG + &kp LCTRL &kp LGUI &kp LALT &kp SPACE &kp RALT &mo FN &kp RCTRL &kp LEFT &kp DOWN &kp RIGHT + >; + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>; + + }; + + fn_layer { + label = "fn layer"; + bindings = < + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL + &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &mo SETTINGS &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 &kp PG_UP &ext_power EP_TOG + &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp END + >; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; + + }; + + setting_layer { + label = "settings layer"; + 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 &trans &kp DEL + &trans &trans &trans &trans &reset &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 &bootloader &trans &trans &trans &trans &trans &trans &trans &rgb_ug RGB_EFF + &trans &out OUT_BLE &out OUT_USB &trans &trans &trans &trans &trans &trans &trans + >; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN>; + + }; + + lock_layer { + label = "fn layer"; + bindings = < + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none &none &none &none &none &none + &none &none &none &none &none &none &none &none &none &none + >; + + }; + }; +}; diff --git a/app/boards/shields/bb65/bb65.overlay b/app/boards/shields/bb65/bb65.overlay new file mode 100644 index 00000000..e23915ec --- /dev/null +++ b/app/boards/shields/bb65/bb65.overlay @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + diode-direction = "col2row"; + row-gpios + = <&blackpill 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 39 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 21 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 17 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 25 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&blackpill 27 GPIO_ACTIVE_HIGH> + , <&blackpill 28 GPIO_ACTIVE_HIGH> + , <&blackpill 29 GPIO_ACTIVE_HIGH> + , <&blackpill 38 GPIO_ACTIVE_HIGH> + , <&blackpill 40 GPIO_ACTIVE_HIGH> + , <&blackpill 41 GPIO_ACTIVE_HIGH> + , <&blackpill 45 GPIO_ACTIVE_HIGH> + , <&blackpill 46 GPIO_ACTIVE_HIGH> + , <&blackpill 18 GPIO_ACTIVE_HIGH> + ; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; + 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(5,8) RC(5,7) RC(5,6) RC(5,5) RC(5,4) + 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(6,8) RC(6,7) RC(6,6) RC(6,5) RC(6,4) + 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(7,0) RC(6,0) RC(6,1) RC(6,2) RC(6,3) + RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(7,8) RC(7,7) RC(7,6) RC(7,5) RC(7,4) RC(7,3) + RC(4,0) RC(4,1) RC(4,2) RC(4,5) RC(4,3) RC(4,4) RC(4,6) RC(4,7) RC(4,8) RC(7,2) + >; + }; + + encoder_1: encoder_1 { + compatible = "alps,ec11"; + label = "Encoder 1"; + a-gpios = <&blackpill 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + b-gpios = <&blackpill 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; +}; diff --git a/app/boards/shields/bb65/bb65.yml b/app/boards/shields/bb65/bb65.yml new file mode 100644 index 00000000..f257b27d --- /dev/null +++ b/app/boards/shields/bb65/bb65.yml @@ -0,0 +1,10 @@ +file_format: "1" +id: bb65 +name: BB65 +type: shield +url: https://mechwild.com/product/bb65/ +requires: [blackpill] +features: + - keys + - encoder + - underglow diff --git a/app/boards/shields/bb65/boards/pillbug.conf b/app/boards/shields/bb65/boards/pillbug.conf new file mode 100644 index 00000000..dda71c13 --- /dev/null +++ b/app/boards/shields/bb65/boards/pillbug.conf @@ -0,0 +1,3 @@ +# Uncomment both to enable underglow +CONFIG_ZMK_RGB_UNDERGLOW=y +CONFIG_WS2812_STRIP=y diff --git a/app/boards/shields/bb65/boards/pillbug.overlay b/app/boards/shields/bb65/boards/pillbug.overlay new file mode 100644 index 00000000..5d39b732 --- /dev/null +++ b/app/boards/shields/bb65/boards/pillbug.overlay @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include + +&spi1 { + compatible = "nordic,nrf-spim"; + status = "okay"; + mosi-pin = <5>; + // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. + sck-pin = <27>; + miso-pin = <28>; + + led_strip: ws2812@0 { + compatible = "worldsemi,ws2812-spi"; + label = "WS2812"; + + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; + + /* WS2812 */ + chain-length = <10>; /* number of LEDs */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + + color-mapping = ; + }; +}; + +/ { + chosen { + zmk,underglow = &led_strip; + }; +}; \ No newline at end of file