From abbcf8f2435028ebae3a9523e60d591eb28dadf2 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 17:44:13 +0100 Subject: [PATCH 1/8] Update build.yaml --- build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.yaml b/build.yaml index 4edaaab..5ce2192 100644 --- a/build.yaml +++ b/build.yaml @@ -14,8 +14,8 @@ --- include: - board: nice_nano_v2 - shield: sofle_left nice_view + shield: sofle_left nice_view_adapter nice_view - board: nice_nano_v2 - shield: sofle_right nice_view + shield: sofle_right nice_view_adapter nice_view - board: nice_nano_v2 shield: settings_reset From 84884fc3caa2866dc6601cbca5298d53d95d563e Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 17:49:44 +0100 Subject: [PATCH 2/8] Update sofle.keymap --- config/sofle.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sofle.keymap b/config/sofle.keymap index 2ac3c7c..feab0c1 100644 --- a/config/sofle.keymap +++ b/config/sofle.keymap @@ -9,7 +9,7 @@ #include &nice_view_spi { - cs-gpios = <&pro_micro 0 GPIO_ACTIVE_HIGH>; + cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>; }; / { From ac8d2c31c77676eafa2d11a8c2593d2c0a4b2c58 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 17:56:02 +0100 Subject: [PATCH 3/8] Update sofle.keymap --- config/sofle.keymap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/sofle.keymap b/config/sofle.keymap index feab0c1..3dcfa06 100644 --- a/config/sofle.keymap +++ b/config/sofle.keymap @@ -9,7 +9,7 @@ #include &nice_view_spi { - cs-gpios = <&pro_micro 4 GPIO_ACTIVE_HIGH>; + cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>; }; / { From b2ef55320a0b6741f54fd17707802330066824e2 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 18:00:08 +0100 Subject: [PATCH 4/8] Update sofle.keymap --- config/sofle.keymap | 4 ---- 1 file changed, 4 deletions(-) diff --git a/config/sofle.keymap b/config/sofle.keymap index 3dcfa06..a1f35ae 100644 --- a/config/sofle.keymap +++ b/config/sofle.keymap @@ -8,10 +8,6 @@ #include #include -&nice_view_spi { - cs-gpios = <&pro_micro 1 GPIO_ACTIVE_HIGH>; -}; - / { keymap { compatible = "zmk,keymap"; From 491b7be25457146fcd9fe36a4a9e91e4e831ce50 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 18:03:03 +0100 Subject: [PATCH 5/8] Update sofle.conf --- config/sofle.conf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/sofle.conf b/config/sofle.conf index 9c6acd3..1745f7b 100644 --- a/config/sofle.conf +++ b/config/sofle.conf @@ -2,7 +2,11 @@ # SPDX-License-Identifier: MIT # Uncomment the following line to enable the Sofle OLED Display -#CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_WIDGET_OUTPUT_STATUS=y +CONFIG_ZMK_WIDGET_LAYER_STATUS=y +CONFIG_ZMK_WIDGET_WPM_STATUS=y +CONFIG_ZMK_WIDGET_BATTERY_STATUS=y # Uncomment these two lines to add support for encoders CONFIG_EC11=y From f3cb8ccd2430f1fb5e77238e0ae603c9841e2b81 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 18:12:52 +0100 Subject: [PATCH 6/8] Update sofle.conf --- config/sofle.conf | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/sofle.conf b/config/sofle.conf index 1745f7b..95db8a0 100644 --- a/config/sofle.conf +++ b/config/sofle.conf @@ -3,10 +3,7 @@ # Uncomment the following line to enable the Sofle OLED Display CONFIG_ZMK_DISPLAY=y -CONFIG_ZMK_WIDGET_OUTPUT_STATUS=y -CONFIG_ZMK_WIDGET_LAYER_STATUS=y CONFIG_ZMK_WIDGET_WPM_STATUS=y -CONFIG_ZMK_WIDGET_BATTERY_STATUS=y # Uncomment these two lines to add support for encoders CONFIG_EC11=y From 172497dc674431c48f590b47e98b680e60b882e1 Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 18:17:50 +0100 Subject: [PATCH 7/8] Update sofle.keymap --- config/sofle.keymap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/sofle.keymap b/config/sofle.keymap index a1f35ae..2ac3c7c 100644 --- a/config/sofle.keymap +++ b/config/sofle.keymap @@ -8,6 +8,10 @@ #include #include +&nice_view_spi { + cs-gpios = <&pro_micro 0 GPIO_ACTIVE_HIGH>; +}; + / { keymap { compatible = "zmk,keymap"; From b4e22be86db6c2798f57584725e341d9a162840d Mon Sep 17 00:00:00 2001 From: Daniel Bauer Date: Fri, 18 Nov 2022 18:25:21 +0100 Subject: [PATCH 8/8] Update sofle.conf --- config/sofle.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/sofle.conf b/config/sofle.conf index 95db8a0..1745f7b 100644 --- a/config/sofle.conf +++ b/config/sofle.conf @@ -3,7 +3,10 @@ # Uncomment the following line to enable the Sofle OLED Display CONFIG_ZMK_DISPLAY=y +CONFIG_ZMK_WIDGET_OUTPUT_STATUS=y +CONFIG_ZMK_WIDGET_LAYER_STATUS=y CONFIG_ZMK_WIDGET_WPM_STATUS=y +CONFIG_ZMK_WIDGET_BATTERY_STATUS=y # Uncomment these two lines to add support for encoders CONFIG_EC11=y