From 5527b98e881f213175469650f06c89b9646c9b76 Mon Sep 17 00:00:00 2001 From: hmngwy <1647347+hmngwy@users.noreply.github.com> Date: Mon, 1 Nov 2021 00:08:06 +0800 Subject: [PATCH 01/11] feat: Add Fifi shield --- app/boards/shields/fifi/Kconfig.defconfig | 52 +++++++++++++++ app/boards/shields/fifi/Kconfig.shield | 8 +++ .../shields/fifi/boards/nice_nano.overlay | 29 ++++++++ app/boards/shields/fifi/fifi.conf | 6 ++ app/boards/shields/fifi/fifi.dtsi | 66 +++++++++++++++++++ app/boards/shields/fifi/fifi.keymap | 56 ++++++++++++++++ app/boards/shields/fifi/fifi.zmk.yml | 14 ++++ app/boards/shields/fifi/fifi_left.conf | 0 app/boards/shields/fifi/fifi_left.overlay | 18 +++++ app/boards/shields/fifi/fifi_right.conf | 0 app/boards/shields/fifi/fifi_right.overlay | 22 +++++++ 11 files changed, 271 insertions(+) create mode 100644 app/boards/shields/fifi/Kconfig.defconfig create mode 100644 app/boards/shields/fifi/Kconfig.shield create mode 100644 app/boards/shields/fifi/boards/nice_nano.overlay create mode 100644 app/boards/shields/fifi/fifi.conf create mode 100644 app/boards/shields/fifi/fifi.dtsi create mode 100644 app/boards/shields/fifi/fifi.keymap create mode 100644 app/boards/shields/fifi/fifi.zmk.yml create mode 100644 app/boards/shields/fifi/fifi_left.conf create mode 100644 app/boards/shields/fifi/fifi_left.overlay create mode 100644 app/boards/shields/fifi/fifi_right.conf create mode 100644 app/boards/shields/fifi/fifi_right.overlay diff --git a/app/boards/shields/fifi/Kconfig.defconfig b/app/boards/shields/fifi/Kconfig.defconfig new file mode 100644 index 00000000000..01bb1a0ab33 --- /dev/null +++ b/app/boards/shields/fifi/Kconfig.defconfig @@ -0,0 +1,52 @@ +if SHIELD_FIFI_LEFT + +config ZMK_KEYBOARD_NAME + default "Fifi" + +config ZMK_SPLIT_BLE_ROLE_CENTRAL + default y + +endif + +if SHIELD_FIFI_LEFT || SHIELD_FIFI_RIGHT + +config ZMK_SPLIT + default y + +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 + +endif diff --git a/app/boards/shields/fifi/Kconfig.shield b/app/boards/shields/fifi/Kconfig.shield new file mode 100644 index 00000000000..d68e30c179d --- /dev/null +++ b/app/boards/shields/fifi/Kconfig.shield @@ -0,0 +1,8 @@ +# Copyright (c) 2020 Pete Johanson +# SPDX-License-Identifier: MIT + +config SHIELD_FIFI_LEFT + def_bool $(shields_list_contains,fifi_left) + +config SHIELD_FIFI_RIGHT + def_bool $(shields_list_contains,fifi_right) diff --git a/app/boards/shields/fifi/boards/nice_nano.overlay b/app/boards/shields/fifi/boards/nice_nano.overlay new file mode 100644 index 00000000000..83ebae04015 --- /dev/null +++ b/app/boards/shields/fifi/boards/nice_nano.overlay @@ -0,0 +1,29 @@ +&spi1 { + compatible = "nordic,nrf-spim"; + /* Cannot be used together with i2c0. */ + status = "okay"; + mosi-pin = <6>; + // 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 = "SK6812mini"; + + /* SPI */ + reg = <0>; /* ignored, but necessary for SPI bindings */ + spi-max-frequency = <4000000>; + + /* WS2812 */ + chain-length = <6>; /* There are per-key RGB, but the first 6 are underglow */ + spi-one-frame = <0x70>; + spi-zero-frame = <0x40>; + }; +}; + +/ { + chosen { + zmk,underglow = &led_strip; + }; +}; diff --git a/app/boards/shields/fifi/fifi.conf b/app/boards/shields/fifi/fifi.conf new file mode 100644 index 00000000000..c7e736fd6e4 --- /dev/null +++ b/app/boards/shields/fifi/fifi.conf @@ -0,0 +1,6 @@ +# Uncomment the following lines to enable the Fifi RGB Underglow +# CONFIG_ZMK_RGB_UNDERGLOW=y +# CONFIG_WS2812_STRIP=y + +# Uncomment the following line to enable the Fifi OLED Display +# CONFIG_ZMK_DISPLAY=y diff --git a/app/boards/shields/fifi/fifi.dtsi b/app/boards/shields/fifi/fifi.dtsi new file mode 100644 index 00000000000..3e4f0821445 --- /dev/null +++ b/app/boards/shields/fifi/fifi.dtsi @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include + +/ { + chosen { + zmk,kscan = &kscan0; + zmk,matrix_transform = &default_transform; + }; + + default_transform: keymap_transform_0 { + compatible = "zmk,matrix-transform"; + columns = <10>; + rows = <4>; +// | SW2 | SW3 | SW4 | SW5 | SW6 | | SW6 | SW5 | SW4 | SW3 | SW2 | +// | SW8 | SW9 | SW10 | SW11 | SW12 | | SW12 | SW11 | SW10 | SW9 | SW8 | +// | SW14 | SW15 | SW16 | SW17 | SW18 | | SW18 | SW17 | SW16 | SW15 | SW14 | +// | SW19 | SW20 | SW21 | | SW21 | SW20 | SW19 | + map = < +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(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(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(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) + >; + }; + + kscan0: kscan { + compatible = "zmk,kscan-gpio-matrix"; + label = "KSCAN"; + + diode-direction = "col2row"; + row-gpios + = <&pro_micro 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)> + , <&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)> + ; + + }; + + // TODO: drop-lighting RGB node(s)? +}; + +&pro_micro_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>; + }; +}; diff --git a/app/boards/shields/fifi/fifi.keymap b/app/boards/shields/fifi/fifi.keymap new file mode 100644 index 00000000000..53218a860c6 --- /dev/null +++ b/app/boards/shields/fifi/fifi.keymap @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ + +#include +#include +#include + +/ { + keymap { + compatible = "zmk,keymap"; + + default_layer { +// ----------------------------------------------------------------------------------------- +// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP | +// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | +// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC | +// | GUI | LWR | SPC | | ENT | RSE | ALT | + bindings = < + &kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC + &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 N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC + &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp RALT + >; + }; + lower_layer { +// ----------------------------------------------------------------------------------------- +// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP | +// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | | +// | SHFT | | | | | | | | | | | | | +// | GUI | | SPC | | ENT | | ALT | + bindings = < + &kp TAB &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC + &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans + &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans + &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT + >; + }; + + raise_layer { +// ----------------------------------------------------------------------------------------- +// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | +// | CTRL | | | | | | | - | = | [ | ] | \ | ` | +// | SHFT | | | | | | | _ | + | { | } | "|" | ~ | +// | GUI | | SPC | | ENT | | ALT | + bindings = < + &kp TAB &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC + &kp LCTRL &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE + &kp LSHFT &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE + &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT + >; + }; + }; +}; diff --git a/app/boards/shields/fifi/fifi.zmk.yml b/app/boards/shields/fifi/fifi.zmk.yml new file mode 100644 index 00000000000..d44a90f31bd --- /dev/null +++ b/app/boards/shields/fifi/fifi.zmk.yml @@ -0,0 +1,14 @@ +file_format: "1" +id: fifi +name: Fifi +type: shield +url: https://github.com/raychengy/fifi_split_keeb +requires: [pro_micro] +exposes: [i2c_oled] +features: + - keys + - display + - underglow +siblings: + - fifi_left + - fifi_right diff --git a/app/boards/shields/fifi/fifi_left.conf b/app/boards/shields/fifi/fifi_left.conf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/boards/shields/fifi/fifi_left.overlay b/app/boards/shields/fifi/fifi_left.overlay new file mode 100644 index 00000000000..c11522c44d8 --- /dev/null +++ b/app/boards/shields/fifi/fifi_left.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "fifi.dtsi" + +&kscan0 { + col-gpios + = <&pro_micro 21 GPIO_ACTIVE_HIGH> + , <&pro_micro 20 GPIO_ACTIVE_HIGH> + , <&pro_micro 19 GPIO_ACTIVE_HIGH> + , <&pro_micro 18 GPIO_ACTIVE_HIGH> + , <&pro_micro 15 GPIO_ACTIVE_HIGH> + , <&pro_micro 14 GPIO_ACTIVE_HIGH> + ; +}; diff --git a/app/boards/shields/fifi/fifi_right.conf b/app/boards/shields/fifi/fifi_right.conf new file mode 100644 index 00000000000..e69de29bb2d diff --git a/app/boards/shields/fifi/fifi_right.overlay b/app/boards/shields/fifi/fifi_right.overlay new file mode 100644 index 00000000000..2efb384f20f --- /dev/null +++ b/app/boards/shields/fifi/fifi_right.overlay @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2020 Pete Johanson + * + * SPDX-License-Identifier: MIT + */ + +#include "fifi.dtsi" + +&default_transform { + col-offset = <6>; +}; + +&kscan0 { + col-gpios + = <&pro_micro 14 GPIO_ACTIVE_HIGH> + , <&pro_micro 15 GPIO_ACTIVE_HIGH> + , <&pro_micro 18 GPIO_ACTIVE_HIGH> + , <&pro_micro 19 GPIO_ACTIVE_HIGH> + , <&pro_micro 20 GPIO_ACTIVE_HIGH> + , <&pro_micro 21 GPIO_ACTIVE_HIGH> + ; +}; From a1b4c95fe1c4b4eca92568f349b95d27b41893a8 Mon Sep 17 00:00:00 2001 From: hmngwy <1647347+hmngwy@users.noreply.github.com> Date: Mon, 1 Nov 2021 00:17:00 +0800 Subject: [PATCH 02/11] feat(shields): Add Fifi shield --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b790b665683..45888745b87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,6 +29,8 @@ jobs: - boardsource3x4 - corne_left - corne_right + - fifi_left + - fifi_right - cradio_left - cradio_right - crbn From 69fad7af6fa40541b6f371c8112b2f30e6673e71 Mon Sep 17 00:00:00 2001 From: hmngwy <1647347+hmngwy@users.noreply.github.com> Date: Mon, 1 Nov 2021 01:57:48 +0800 Subject: [PATCH 03/11] feat(shields): Add Fifi default keymap based on Microdox --- app/boards/shields/fifi/fifi.keymap | 68 ++++++++++++++++++----------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/app/boards/shields/fifi/fifi.keymap b/app/boards/shields/fifi/fifi.keymap index 53218a860c6..c9298ff8cf4 100644 --- a/app/boards/shields/fifi/fifi.keymap +++ b/app/boards/shields/fifi/fifi.keymap @@ -14,42 +14,58 @@ default_layer { // ----------------------------------------------------------------------------------------- -// | TAB | Q | W | E | R | T | | Y | U | I | O | P | BKSP | -// | CTRL | A | S | D | F | G | | H | J | K | L | ; | ' | -// | SHFT | Z | X | C | V | B | | N | M | , | . | / | ESC | -// | GUI | LWR | SPC | | ENT | RSE | ALT | +// | 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 TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp BSPC - &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 N &kp M &kp COMMA &kp DOT &kp FSLH &kp ESC - &kp LGUI &mo 1 &kp SPACE &kp RET &mo 2 &kp RALT + &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 >; }; - lower_layer { + nav_layer { // ----------------------------------------------------------------------------------------- -// | TAB | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BKSP | -// | BTCLR| BT1 | BT2 | BT3 | BT4 | BT5 | | LFT | DWN | UP | RGT | | | -// | SHFT | | | | | | | | | | | | | -// | GUI | | SPC | | ENT | | ALT | +// |BTCLR| | ESC | ~ | | | TAB | HOME | UP | END | DEL | +// | BT1 | GUI | ALT | CTRL | NUM | | / | LEFT | DOWN | RGT | BKSP | +// | BT2 | | | | | | \ | ENT | | | | +// | | | | | | | | bindings = < - &kp TAB &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &kp BSPC - &bt BT_CLR &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans &trans - &kp LSHFT &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT + &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 >; }; - raise_layer { + sym_layer { // ----------------------------------------------------------------------------------------- -// | TAB | ! | @ | # | $ | % | | ^ | & | * | ( | ) | BKSP | -// | CTRL | | | | | | | - | = | [ | ] | \ | ` | -// | SHFT | | | | | | | _ | + | { | } | "|" | ~ | -// | GUI | | SPC | | ENT | | ALT | +// | ! | @ | # | $ | % | | ^ | & | * | ( | ) | +// | | | | | | | - | = | { | } | "|" | +// | | | | | | | _ | + | [ | ] | \ | +// | GUI | | SPC | | ENT | | ALT | bindings = < - &kp TAB &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp KP_MULTIPLY &kp LPAR &kp RPAR &kp BSPC - &kp LCTRL &trans &trans &trans &trans &trans &kp MINUS &kp EQUAL &kp LBKT &kp RBKT &kp BSLH &kp GRAVE - &kp LSHFT &trans &trans &trans &trans &trans &kp UNDER &kp PLUS &kp LBRC &kp RBRC &kp PIPE &kp TILDE - &kp LGUI &trans &kp SPACE &kp RET &trans &kp RALT + &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 >; }; }; From ee341883fdc8bae4b8570cc8c891fcbfe1c1139e Mon Sep 17 00:00:00 2001 From: hmngwy <1647347+hmngwy@users.noreply.github.com> Date: Mon, 1 Nov 2021 02:06:43 +0800 Subject: [PATCH 04/11] chore: Use generic license header --- app/boards/shields/fifi/fifi.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/fifi/fifi.dtsi b/app/boards/shields/fifi/fifi.dtsi index 3e4f0821445..63673d2ba11 100644 --- a/app/boards/shields/fifi/fifi.dtsi +++ b/app/boards/shields/fifi/fifi.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2020 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From 9c57b0ea0c78a38a6be62664656055a81015ab0d Mon Sep 17 00:00:00 2001 From: Pat Ambrosio <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 09:59:30 +0800 Subject: [PATCH 05/11] Update app/boards/shields/fifi/Kconfig.shield Co-authored-by: Nick Winans --- app/boards/shields/fifi/Kconfig.shield | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/fifi/Kconfig.shield b/app/boards/shields/fifi/Kconfig.shield index d68e30c179d..5e2bd106536 100644 --- a/app/boards/shields/fifi/Kconfig.shield +++ b/app/boards/shields/fifi/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Pete Johanson +# Copyright (c) 2021 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_FIFI_LEFT From d33dca6cd16cdb61876bd64e5b7d629370a3d03c Mon Sep 17 00:00:00 2001 From: Pat Ambrosio <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 09:59:35 +0800 Subject: [PATCH 06/11] Update app/boards/shields/fifi/fifi.dtsi Co-authored-by: Nick Winans --- app/boards/shields/fifi/fifi.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/fifi/fifi.dtsi b/app/boards/shields/fifi/fifi.dtsi index 63673d2ba11..64c63ec56ed 100644 --- a/app/boards/shields/fifi/fifi.dtsi +++ b/app/boards/shields/fifi/fifi.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From 8224ddc36af151d8b9bb477cdb282cbf8bafff94 Mon Sep 17 00:00:00 2001 From: Pat Ambrosio <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 09:59:42 +0800 Subject: [PATCH 07/11] Update app/boards/shields/fifi/fifi.keymap Co-authored-by: Nick Winans --- app/boards/shields/fifi/fifi.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/fifi/fifi.keymap b/app/boards/shields/fifi/fifi.keymap index c9298ff8cf4..7ebed996d9b 100644 --- a/app/boards/shields/fifi/fifi.keymap +++ b/app/boards/shields/fifi/fifi.keymap @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 The ZMK Contributors + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From 03ea8561964f4204945671853ae47c91a1b25d59 Mon Sep 17 00:00:00 2001 From: Pat Ambrosio <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 09:59:52 +0800 Subject: [PATCH 08/11] Update app/boards/shields/fifi/fifi_right.overlay Co-authored-by: Nick Winans --- app/boards/shields/fifi/fifi_right.overlay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/fifi/fifi_right.overlay b/app/boards/shields/fifi/fifi_right.overlay index 2efb384f20f..31e99125213 100644 --- a/app/boards/shields/fifi/fifi_right.overlay +++ b/app/boards/shields/fifi/fifi_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From 798fc181d7a666afebc7fed6e1d53fefe183132d Mon Sep 17 00:00:00 2001 From: Pat Ambrosio <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 09:59:57 +0800 Subject: [PATCH 09/11] Update app/boards/shields/fifi/fifi_left.overlay Co-authored-by: Nick Winans --- app/boards/shields/fifi/fifi_left.overlay | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boards/shields/fifi/fifi_left.overlay b/app/boards/shields/fifi/fifi_left.overlay index c11522c44d8..03cf0f71964 100644 --- a/app/boards/shields/fifi/fifi_left.overlay +++ b/app/boards/shields/fifi/fifi_left.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Pete Johanson + * Copyright (c) 2021 The ZMK Contributors * * SPDX-License-Identifier: MIT */ From 5519d324ab86b1058df532f7fb50ef91e6894959 Mon Sep 17 00:00:00 2001 From: Pat Ambrosio <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 10:00:06 +0800 Subject: [PATCH 10/11] Update app/boards/shields/fifi/fifi.dtsi Co-authored-by: Nick Winans --- app/boards/shields/fifi/fifi.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/app/boards/shields/fifi/fifi.dtsi b/app/boards/shields/fifi/fifi.dtsi index 64c63ec56ed..66b6ac93cf4 100644 --- a/app/boards/shields/fifi/fifi.dtsi +++ b/app/boards/shields/fifi/fifi.dtsi @@ -42,7 +42,6 @@ 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 }; - // TODO: drop-lighting RGB node(s)? }; &pro_micro_i2c { From 5b7afc84f6d77be2bcb257f3847dcd331c74895e Mon Sep 17 00:00:00 2001 From: hmngwy <1647347+hmngwy@users.noreply.github.com> Date: Mon, 21 Feb 2022 10:23:25 +0800 Subject: [PATCH 11/11] chore: updated copyright lines --- .github/workflows/build.yml | 2 -- app/boards/shields/fifi/Kconfig.defconfig | 3 +++ app/boards/shields/fifi/Kconfig.shield | 2 +- app/boards/shields/fifi/fifi.dtsi | 2 +- app/boards/shields/fifi/fifi.keymap | 2 +- app/boards/shields/fifi/fifi_left.overlay | 2 +- app/boards/shields/fifi/fifi_right.overlay | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 45888745b87..b790b665683 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,8 +29,6 @@ jobs: - boardsource3x4 - corne_left - corne_right - - fifi_left - - fifi_right - cradio_left - cradio_right - crbn diff --git a/app/boards/shields/fifi/Kconfig.defconfig b/app/boards/shields/fifi/Kconfig.defconfig index 01bb1a0ab33..8b410910998 100644 --- a/app/boards/shields/fifi/Kconfig.defconfig +++ b/app/boards/shields/fifi/Kconfig.defconfig @@ -1,3 +1,6 @@ +# Copyright (c) 2022 The ZMK Contributors +# SPDX-License-Identifier: MIT + if SHIELD_FIFI_LEFT config ZMK_KEYBOARD_NAME diff --git a/app/boards/shields/fifi/Kconfig.shield b/app/boards/shields/fifi/Kconfig.shield index 5e2bd106536..978fabeea64 100644 --- a/app/boards/shields/fifi/Kconfig.shield +++ b/app/boards/shields/fifi/Kconfig.shield @@ -1,4 +1,4 @@ -# Copyright (c) 2021 The ZMK Contributors +# Copyright (c) 2022 The ZMK Contributors # SPDX-License-Identifier: MIT config SHIELD_FIFI_LEFT diff --git a/app/boards/shields/fifi/fifi.dtsi b/app/boards/shields/fifi/fifi.dtsi index 66b6ac93cf4..acf478612b2 100644 --- a/app/boards/shields/fifi/fifi.dtsi +++ b/app/boards/shields/fifi/fifi.dtsi @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The ZMK Contributors + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/fifi/fifi.keymap b/app/boards/shields/fifi/fifi.keymap index 7ebed996d9b..ec06342f1d9 100644 --- a/app/boards/shields/fifi/fifi.keymap +++ b/app/boards/shields/fifi/fifi.keymap @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The ZMK Contributors + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/fifi/fifi_left.overlay b/app/boards/shields/fifi/fifi_left.overlay index 03cf0f71964..82287234d8a 100644 --- a/app/boards/shields/fifi/fifi_left.overlay +++ b/app/boards/shields/fifi/fifi_left.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The ZMK Contributors + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */ diff --git a/app/boards/shields/fifi/fifi_right.overlay b/app/boards/shields/fifi/fifi_right.overlay index 31e99125213..2f60de6d6a7 100644 --- a/app/boards/shields/fifi/fifi_right.overlay +++ b/app/boards/shields/fifi/fifi_right.overlay @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 The ZMK Contributors + * Copyright (c) 2022 The ZMK Contributors * * SPDX-License-Identifier: MIT */