From 50aa243e14ba7a7e41f8388bf071feb46fd575d2 Mon Sep 17 00:00:00 2001 From: Kyle McCreery Date: Thu, 8 Sep 2022 00:06:32 -0400 Subject: [PATCH] Added base puckbuddy config --- app/boards/shields/murphpad/murphpad.overlay | 6 +- .../shields/puckbuddy/Kconfig.defconfig | 39 +++++++ app/boards/shields/puckbuddy/Kconfig.shield | 5 + .../shields/puckbuddy/boards/pillbug.conf | 3 + .../shields/puckbuddy/boards/pillbug.overlay | 38 +++++++ app/boards/shields/puckbuddy/puckbuddy.conf | 9 ++ app/boards/shields/puckbuddy/puckbuddy.keymap | 102 ++++++++++++++++++ .../shields/puckbuddy/puckbuddy.overlay | 86 +++++++++++++++ app/boards/shields/puckbuddy/puckbuddy.yml | 12 +++ 9 files changed, 297 insertions(+), 3 deletions(-) create mode 100644 app/boards/shields/puckbuddy/Kconfig.defconfig create mode 100644 app/boards/shields/puckbuddy/Kconfig.shield create mode 100644 app/boards/shields/puckbuddy/boards/pillbug.conf create mode 100644 app/boards/shields/puckbuddy/boards/pillbug.overlay create mode 100644 app/boards/shields/puckbuddy/puckbuddy.conf create mode 100644 app/boards/shields/puckbuddy/puckbuddy.keymap create mode 100644 app/boards/shields/puckbuddy/puckbuddy.overlay create mode 100644 app/boards/shields/puckbuddy/puckbuddy.yml diff --git a/app/boards/shields/murphpad/murphpad.overlay b/app/boards/shields/murphpad/murphpad.overlay index c66f2aef..125be868 100644 --- a/app/boards/shields/murphpad/murphpad.overlay +++ b/app/boards/shields/murphpad/murphpad.overlay @@ -22,15 +22,15 @@ , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> , <&pro_micro 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 18 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&pro_micro 19 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> ; col-gpios = <&pro_micro 9 GPIO_ACTIVE_HIGH> , <&pro_micro 6 GPIO_ACTIVE_HIGH> , <&pro_micro 5 GPIO_ACTIVE_HIGH> , <&pro_micro 4 GPIO_ACTIVE_HIGH> - , <&pro_micro 10 GPIO_ACTIVE_HIGH> + , <&pro_micro 10 GPIO_ACTIVE_HIGH> ; }; diff --git a/app/boards/shields/puckbuddy/Kconfig.defconfig b/app/boards/shields/puckbuddy/Kconfig.defconfig new file mode 100644 index 00000000..fe98be89 --- /dev/null +++ b/app/boards/shields/puckbuddy/Kconfig.defconfig @@ -0,0 +1,39 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +if SHIELD_PUCKBUDDY + +config ZMK_KEYBOARD_NAME + default "PuckBuddy" + +if ZMK_DISPLAY + +config I2C + default y + +config SSD1306 + default y + +config SSD1306_REVERSE_MODE + default y + +endif # ZMK_DISPLAY + +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/puckbuddy/Kconfig.shield b/app/boards/shields/puckbuddy/Kconfig.shield new file mode 100644 index 00000000..cd505dd8 --- /dev/null +++ b/app/boards/shields/puckbuddy/Kconfig.shield @@ -0,0 +1,5 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + +config SHIELD_PUCKBUDDY + def_bool $(shields_list_contains,puckbuddy) diff --git a/app/boards/shields/puckbuddy/boards/pillbug.conf b/app/boards/shields/puckbuddy/boards/pillbug.conf new file mode 100644 index 00000000..dda71c13 --- /dev/null +++ b/app/boards/shields/puckbuddy/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/puckbuddy/boards/pillbug.overlay b/app/boards/shields/puckbuddy/boards/pillbug.overlay new file mode 100644 index 00000000..75c65d5d --- /dev/null +++ b/app/boards/shields/puckbuddy/boards/pillbug.overlay @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + + #include + +&spi1 { + compatible = "nordic,nrf-spim"; + status = "okay"; + mosi-pin = <2>; + // 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 = <3>; /* number of LEDs */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + + color-mapping = ; + }; +}; + +/ { + chosen { + zmk,underglow = &led_strip; + }; +}; \ No newline at end of file diff --git a/app/boards/shields/puckbuddy/puckbuddy.conf b/app/boards/shields/puckbuddy/puckbuddy.conf new file mode 100644 index 00000000..479fa14d --- /dev/null +++ b/app/boards/shields/puckbuddy/puckbuddy.conf @@ -0,0 +1,9 @@ +# 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 + +# Uncomment to enable OLED +CONFIG_ZMK_DISPLAY=y diff --git a/app/boards/shields/puckbuddy/puckbuddy.keymap b/app/boards/shields/puckbuddy/puckbuddy.keymap new file mode 100644 index 00000000..c0cecd88 --- /dev/null +++ b/app/boards/shields/puckbuddy/puckbuddy.keymap @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include +#include +#include + + +#define TIMEOUT 300 + +&encoder_1 { + status = "okay"; +}; + +&encoder_2 { + 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 2>; + bindings = <&bootloader>; + }; + combo_bt_nxt { + timeout-ms = ; + key-positions = <1 4>; + bindings = <&bt BT_NXT>; + }; + }; + + sensors { + compatible = "zmk,keymap-sensors"; + sensors = <&encoder_1 &encoder_2>; + }; + + + keymap0: keymap { + compatible = "zmk,keymap"; + + default_layer { + label = "default layer"; + bindings = < + &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 + &kp N6 &kp N7 + &kp N8 &kp N9 + &kp N0 &kp A + &kp B &kp C &kp D &kp E + >; + sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>; + + }; + + fn_layer { + label = "fn layer"; + bindings = < + &trans &trans &trans &trans &trans + &trans &trans + &trans &trans + &trans &trans + &trans &trans &trans &trans + >; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN &inc_dec_kp C_VOL_UP C_VOL_DN>; + + }; + + lock_layer { + label = "fn layer"; + bindings = < + &none &none &none &none &none + &none &none + &none &none + &none &none + &none &none &none &none + >; + sensor-bindings = <&inc_dec_kp PG_UP PG_DN &inc_dec_kp C_VOL_UP C_VOL_DN>; + + }; + }; +}; diff --git a/app/boards/shields/puckbuddy/puckbuddy.overlay b/app/boards/shields/puckbuddy/puckbuddy.overlay new file mode 100644 index 00000000..a907b008 --- /dev/null +++ b/app/boards/shields/puckbuddy/puckbuddy.overlay @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2022 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zephyr,display = &oled; + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&blackpill 25 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 26 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 27 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&blackpill 28 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + ; + col-gpios + = <&blackpill 21 GPIO_ACTIVE_HIGH> + , <&blackpill 29 GPIO_ACTIVE_HIGH> + , <&blackpill 40 GPIO_ACTIVE_HIGH> + , <&blackpill 41 GPIO_ACTIVE_HIGH> + ; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <12>; + rows = <4>; + map = < + RC(0,0) RC(0,1) RC(1,1) RC(2,1) RC(0,2) + RC(1,0) RC(1,2) + RC(2,0) RC(2,2) + RC(3,0) RC(3,2) + RC(0,3) RC(1,3) RC(2,3) RC(3,3) + >; + }; + + encoder_1: encoder_1 { + compatible = "alps,ec11"; + label = "Encoder 1"; + a-gpios = <&blackpill 18 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + b-gpios = <&blackpill 19bb (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; + + encoder_2: encoder_2 { + compatible = "alps,ec11"; + label = "Encoder 2"; + a-gpios = <&blackpill 39 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + b-gpios = <&blackpill 38 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + resolution = <4>; + status = "disabled"; + }; + +}; + +&blackpill_i2c { + status = "okay"; + + oled: ssd1306@3c { + compatible = "solomon,ssd1306fb"; + reg = <0x3c>; + label = "DISPLAY"; + width = <128>; + height = <32>; + segment-offset = <0>; + page-offset = <0>; + display-offset = <0>; + multiplex-ratio = <31>; + //segment-remap; + //com-invdir; + com-sequential; + prechargep = <0x22>; + }; +}; \ No newline at end of file diff --git a/app/boards/shields/puckbuddy/puckbuddy.yml b/app/boards/shields/puckbuddy/puckbuddy.yml new file mode 100644 index 00000000..5e1b2fa0 --- /dev/null +++ b/app/boards/shields/puckbuddy/puckbuddy.yml @@ -0,0 +1,12 @@ +file_format: "1" +id: puckbuddy +name: PuckBuddy +type: shield +url: https://mechwild.com/product/puckbuddy/ +requires: [blackpill] +exposes: [i2c_oled] +features: + - keys + - display + - encoder + - underglow