From 5d7d781ca808c73286e45fe2d995a1a9ae2105b6 Mon Sep 17 00:00:00 2001 From: Nabeel <16357000+Nabizzle@users.noreply.github.com> Date: Fri, 13 Oct 2023 16:46:13 -0400 Subject: [PATCH 1/3] feat: Adds nice!view functionality to repository Makes the required changes to allow the use of a nice!view. Adding the nice_view_adapter and nice_view shields to the build.yaml file lead to errors during the compilation of the files. In order to address the errors, The Kconfig.defconfig file was edited to remove the ZMK_DISPLAY and LVGL sections and in the temper.dtsi file, the zephyr,display = &oled line had to be deleted. I also removed the deep sleep config and replaced it with the display config in the temper.config file --- build.yaml | 4 +-- .../boards/shields/temper/Kconfig.defconfig | 30 ------------------- config/boards/shields/temper/temper.conf | 4 +-- config/boards/shields/temper/temper.dtsi | 1 - 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/build.yaml b/build.yaml index 427ef4f8..ca50216f 100644 --- a/build.yaml +++ b/build.yaml @@ -14,6 +14,6 @@ --- include: - board: nice_nano_v2 - shield: temper_left + shield: temper_left nice_view_adapter nice_view - board: nice_nano_v2 - shield: temper_right + shield: temper_right nice_view_adapter nice_view diff --git a/config/boards/shields/temper/Kconfig.defconfig b/config/boards/shields/temper/Kconfig.defconfig index b056a2b6..a79578b6 100644 --- a/config/boards/shields/temper/Kconfig.defconfig +++ b/config/boards/shields/temper/Kconfig.defconfig @@ -13,34 +13,4 @@ if SHIELD_TEMPER_LEFT || SHIELD_TEMPER_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 LV_Z_VDB_SIZE - default 64 - -config LV_Z_DPI - default 148 - -config LV_Z_BITS_PER_PIXEL - default 1 - -choice LV_COLOR_DEPTH - default LV_COLOR_DEPTH_1 -endchoice - -endif # LVGL - endif diff --git a/config/boards/shields/temper/temper.conf b/config/boards/shields/temper/temper.conf index f6631784..1d7bd753 100644 --- a/config/boards/shields/temper/temper.conf +++ b/config/boards/shields/temper/temper.conf @@ -1,2 +1,2 @@ -# Uncomment the following line to enable deep sleep -CONFIG_ZMK_SLEEP=y \ No newline at end of file +# Uncomment the following line to enable the Temper OLED Display +CONFIG_ZMK_DISPLAY=y \ No newline at end of file diff --git a/config/boards/shields/temper/temper.dtsi b/config/boards/shields/temper/temper.dtsi index 7405c422..134a36d1 100644 --- a/config/boards/shields/temper/temper.dtsi +++ b/config/boards/shields/temper/temper.dtsi @@ -8,7 +8,6 @@ / { chosen { - zephyr,display = &oled; zmk,kscan = &kscan0; zmk,matrix_transform = &default_transform; }; From 9c65df9a79248729158456d97b5a74bba9349777 Mon Sep 17 00:00:00 2001 From: Nabeel Chowdhury <16357000+Nabizzle@users.noreply.github.com> Date: Sat, 13 Jan 2024 20:21:14 -0500 Subject: [PATCH 2/3] doc: Adds drawing gaming layer --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca7ae59c..32819871 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: 'Parse ZMK keymap' run: keymap -c ./keymap_img/temper_keymap_config.yaml parse -c 10 -z ./config/boards/shields/temper/temper.keymap --base-keymap ./keymap_img/temper_keymap_base.yaml > ./keymap_img/temper_keymap.yaml - name: 'Draw keymap' - run: keymap -c ./keymap_img/temper_keymap_config.yaml draw --select-layers default num nav fun -k chocofi ./keymap_img/temper_keymap.yaml > ./keymap_img/temper_keymap.svg + run: keymap -c ./keymap_img/temper_keymap_config.yaml draw --select-layers default num nav fun game -k chocofi ./keymap_img/temper_keymap.yaml > ./keymap_img/temper_keymap.svg - name: 'Commit keymap image' run: | git config --global user.name 'GitHub Actions' From 95e60b37e271505b449378d5b419ef11015c6a22 Mon Sep 17 00:00:00 2001 From: Nabeel Chowdhury <16357000+Nabizzle@users.noreply.github.com> Date: Sat, 13 Jan 2024 21:41:11 -0500 Subject: [PATCH 3/3] Removes this change --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32819871..ca7ae59c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: 'Parse ZMK keymap' run: keymap -c ./keymap_img/temper_keymap_config.yaml parse -c 10 -z ./config/boards/shields/temper/temper.keymap --base-keymap ./keymap_img/temper_keymap_base.yaml > ./keymap_img/temper_keymap.yaml - name: 'Draw keymap' - run: keymap -c ./keymap_img/temper_keymap_config.yaml draw --select-layers default num nav fun game -k chocofi ./keymap_img/temper_keymap.yaml > ./keymap_img/temper_keymap.svg + run: keymap -c ./keymap_img/temper_keymap_config.yaml draw --select-layers default num nav fun -k chocofi ./keymap_img/temper_keymap.yaml > ./keymap_img/temper_keymap.svg - name: 'Commit keymap image' run: | git config --global user.name 'GitHub Actions'