From 3a481c2e34aab4bac11ee6fb5ce8b18a5fce5bdf Mon Sep 17 00:00:00 2001 From: KemoNine Date: Thu, 17 Dec 2020 23:49:51 +0000 Subject: [PATCH] Remove base tidbit code as it's been merged to main zmk sources --- .../boards/shields/tidbit/Kconfig.defconfig | 45 ------- .../boards/shields/tidbit/Kconfig.shield | 5 - .../config/boards/shields/tidbit/README.md | 50 -------- .../shields/tidbit/boards/nice_nano.conf | 4 - .../shields/tidbit/boards/nice_nano.overlay | 34 ----- .../shields/tidbit/boards/proton_c.conf | 1 - .../config/boards/shields/tidbit/tidbit.conf | 11 -- .../config/boards/shields/tidbit/tidbit.dtsi | 116 ------------------ .../boards/shields/tidbit/tidbit.keymap | 53 -------- .../boards/shields/tidbit/tidbit.overlay | 7 -- .../boards/shields/tidbit/tidbit_19key.conf | 11 -- .../boards/shields/tidbit/tidbit_19key.keymap | 54 -------- .../shields/tidbit/tidbit_19key.overlay | 8 -- 13 files changed, 399 deletions(-) delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.defconfig delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.shield delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/README.md delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.conf delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.overlay delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/boards/proton_c.conf delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit.conf delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit.dtsi delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit.keymap delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit.overlay delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.conf delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.keymap delete mode 100644 keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.overlay diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.defconfig b/keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.defconfig deleted file mode 100644 index 30cf3c22..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.defconfig +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# SPDX-License-Identifier: MIT - -if SHIELD_TIDBIT - -config ZMK_KEYBOARD_NAME - default "tidbit" - -endif - -if ZMK_DISPLAY - -config I2C - default y - -config SSD1306 - default y - -config SSD1306_REVERSE_MODE - default y - -endif # ZMK_DISPLAY - -if LVGL - -config LVGL_HOR_RES_MAX - default 128 - -config LVGL_VER_RES_MAX - default 32 - -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 diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.shield b/keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.shield deleted file mode 100644 index c1e8ecca..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/Kconfig.shield +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# SPDX-License-Identifier: MIT - -config SHIELD_TIDBIT - def_bool $(shields_list_contains,tidbit) diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/README.md b/keyboards/zmk-config/config/boards/shields/tidbit/README.md deleted file mode 100644 index 5e7b5ee8..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/README.md +++ /dev/null @@ -1,50 +0,0 @@ -# Building ZMK for the Tidbit - -Some general notes/commands for building standard Tidbit layouts from the assembly documentation. - -## Standard "Non Dense" Build - -``` - -west build -p --board nice_nano -d build/tidbit/default -- -DSHIELD=tidbit - -``` - -## Dense "19 keys" Build - -``` - -west build -p --board nice_nano -d build/tidbit/19_key -- -DSHIELD=tidbit_19key - -``` - -## LED Notes - -If you built your tidbit without the LEDs *and* are using a Nice!Nano board, you'll need to add the following at the *end* of your local tidbit config. - -``` - -CONFIG_ZMK_RGB_UNDERGLOW=n -CONFIG_WS2812_STRIP=n - -``` - -## Encoder Notes - -If you built your tidbit without encoders, you'll need to add the following at the *end* of your local tidbit config. - -``` - -CONFIG_EC11=n -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=n - -``` - -## OLED Builds - -If using an OLED screen you'll need to include the following at the *end* of your local tidbit config. - -``` -CONFIG_ZMK_DISPLAY=y - -``` diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.conf b/keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.conf deleted file mode 100644 index 14bed3d0..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Enable underglow -CONFIG_ZMK_RGB_UNDERGLOW=y -# Use the STRIP config specific to the LEDs you're using -CONFIG_WS2812_STRIP=y \ No newline at end of file diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.overlay b/keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.overlay deleted file mode 100644 index 84532206..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/boards/nice_nano.overlay +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -&spi1 { - compatible = "nordic,nrf-spim"; - status = "okay"; - mosi-pin = <9>; - // Unused pins, needed for SPI definition, but not used by the ws2812 driver itself. - sck-pin = <5>; - miso-pin = <7>; - - 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 = <8>; /* number of LEDs */ - spi-one-frame = <0x70>; - spi-zero-frame = <0x40>; - }; -}; - -/ { - chosen { - zmk,underglow = &led_strip; - }; -}; diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/boards/proton_c.conf b/keyboards/zmk-config/config/boards/shields/tidbit/boards/proton_c.conf deleted file mode 100644 index ab2b50b6..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/boards/proton_c.conf +++ /dev/null @@ -1 +0,0 @@ -CONFIG_SENSOR=y \ No newline at end of file diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.conf b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.conf deleted file mode 100644 index 2909a855..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# SPDX-License-Identifier: MIT - -# Enable Encoders -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y - -# Enable underglow -#CONFIG_ZMK_RGB_UNDERGLOW=y -# Use the STRIP config specific to the LEDs you're using -#CONFIG_WS2812_STRIP=y diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.dtsi b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.dtsi deleted file mode 100644 index 16ab3651..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.dtsi +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include - -/ { - kscan0: kscan { - compatible = "zmk,kscan-gpio-matrix"; - label = "KSCAN"; - - diode-direction = "row2col"; - - row-gpios - = <&pro_micro_d 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 7 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 6 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_d 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - - col-gpios - = <&pro_micro_a 3 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 2 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - , <&pro_micro_a 0 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> - ; - - }; - - default_transform: keymap_transform_0 { - compatible = "zmk,matrix-transform"; - columns = <4>; - rows = <5>; - - map = < - RC(0,1) RC(0,2) RC(0,3) - RC(1,0) RC(1,1) RC(1,2) RC(1,3) - RC(2,0) RC(2,1) RC(2,2) RC(2,3) - RC(3,0) RC(3,1) RC(3,2) RC(3,3) - RC(4,0) RC(4,1) RC(4,2) RC(4,3) - >; - }; - - encoder_1_top_row: encoder_1_top_row { - compatible = "alps,ec11"; - label = "Top Row Encoder"; - a-gpios = <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "disabled"; - }; - - encoder_1: encoder_1 { - compatible = "alps,ec11"; - label = "Encoder 1"; - a-gpios = <&pro_micro_d 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "disabled"; - }; - - encoder_2: encoder_2 { - compatible = "alps,ec11"; - label = "Encoder 2"; - a-gpios = <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "disabled"; - }; - - encoder_3: encoder_3 { - compatible = "alps,ec11"; - label = "Encoder 3"; - a-gpios = <&pro_micro_d 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "disabled"; - }; - - encoder_4: encoder_4 { - compatible = "alps,ec11"; - label = "Encoder 4"; - a-gpios = <&pro_micro_d 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - b-gpios = <&pro_micro_d 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; - resolution = <4>; - status = "disabled"; - }; - - chosen { - zmk,kscan = &kscan0; - zmk,matrix_transform = &default_transform; - }; -}; - -&pro_micro_i2c { - status = "disabled"; - - 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>; - }; -}; diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.keymap b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.keymap deleted file mode 100644 index b0b2752a..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.keymap +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include -#include -#include -#include - -&encoder_1_top_row { - status = "okay"; -}; - -&pro_micro_i2c { - status = "okay"; -}; - -/ { - sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&encoder_1_top_row>; - }; - - keymap { - compatible = "zmk,keymap"; - - default_layer { - bindings = < - &kp KP_NUMLOCK &kp KP_ASTERISK &kp KP_MINUS - &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_PLUS - &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp &none - &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 < 1 KP_ENTER - &none &kp KP_NUMBER_0 &kp KP_DOT &none - >; - - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; - }; - - func_layer { - bindings = < - &none &reset &bootloader - &out OUT_TOG &out OUT_USB &out OUT_BLE &none - &bt BT_SEL 0 &bt BT_PRV &bt BT_NXT &bt BT_CLR - &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &tog 0 - &kp C_MUTE &none &none &none - >; - - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; - }; - }; -}; diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.overlay b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.overlay deleted file mode 100644 index dc425618..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit.overlay +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include "tidbit.dtsi" diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.conf b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.conf deleted file mode 100644 index 2909a855..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (c) 2020 The ZMK Contributors -# SPDX-License-Identifier: MIT - -# Enable Encoders -CONFIG_EC11=y -CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y - -# Enable underglow -#CONFIG_ZMK_RGB_UNDERGLOW=y -# Use the STRIP config specific to the LEDs you're using -#CONFIG_WS2812_STRIP=y diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.keymap b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.keymap deleted file mode 100644 index c5f3e4c9..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.keymap +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include "tidbit.dtsi" -#include -#include -#include -#include - -&encoder_4 { - status = "okay"; -}; - -&pro_micro_i2c { - status = "okay"; -}; - -/ { - sensors { - compatible = "zmk,keymap-sensors"; - sensors = <&encoder_4>; - }; - - keymap { - compatible = "zmk,keymap"; - - default_layer { - bindings = < - &tog 1 &kp KP_NUMLOCK &kp KP_SLASH - &kp KP_NUMBER_7 &kp KP_NUMBER_8 &kp KP_NUMBER_9 &kp KP_ASTERISK - &kp KP_NUMBER_4 &kp KP_NUMBER_5 &kp KP_NUMBER_6 &kp KP_MINUS - &kp KP_NUMBER_1 &kp KP_NUMBER_2 &kp KP_NUMBER_3 &kp KP_PLUS - &kp C_MUTE &kp KP_NUMBER_0 &kp KP_DOT &kp KP_ENTER - >; - - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; - }; - - func_layer { - bindings = < - &tog 0 &reset &bootloader - &out OUT_TOG &out OUT_USB &out OUT_BLE &none - &bt BT_SEL 0 &bt BT_PRV &bt BT_NXT &bt BT_CLR - &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &none - &kp C_MUTE &none &none &none - >; - - sensor-bindings = <&inc_dec_kp C_VOLUME_UP C_VOLUME_DOWN>; - }; - }; -}; diff --git a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.overlay b/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.overlay deleted file mode 100644 index dc46233e..00000000 --- a/keyboards/zmk-config/config/boards/shields/tidbit/tidbit_19key.overlay +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2020 The ZMK Contributors - * - * SPDX-License-Identifier: MIT - */ - -#include "tidbit.dtsi" -#include "tidbit_19key.keymap"