diff --git a/.gitignore b/.gitignore index f379648..d646be4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,11 @@ test/ *.o *.out +# firmware build output +*.uf2 +*.hex +*.bin + # log *.log diff --git a/boards/shields/corne/corne_right.conf b/boards/shields/corne/corne_right.conf index 8480cd2..e69de29 100644 --- a/boards/shields/corne/corne_right.conf +++ b/boards/shields/corne/corne_right.conf @@ -1,3 +0,0 @@ -# Right OLED: rotating "KM" medal animation instead of the default cat -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=y diff --git a/boards/shields/lily58/lily58_right.conf b/boards/shields/lily58/lily58_right.conf index 8480cd2..e69de29 100644 --- a/boards/shields/lily58/lily58_right.conf +++ b/boards/shields/lily58/lily58_right.conf @@ -1,3 +0,0 @@ -# Right OLED: rotating "KM" medal animation instead of the default cat -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=y diff --git a/boards/shields/sofle/sofle_right.conf b/boards/shields/sofle/sofle_right.conf index 0eb8729..e813720 100644 --- a/boards/shields/sofle/sofle_right.conf +++ b/boards/shields/sofle/sofle_right.conf @@ -1,12 +1,2 @@ # Copyright (c) 2020 Ryan Cross # SPDX-License-Identifier: MIT - -# TEMPORARY DIAGNOSTIC: rotating diamond (gem), never previously used on this -# hardware, to confirm Kconfig changes are actually reaching the device. -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=n -CONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_GEM=y - -# TEMPORARY DIAGNOSTIC: this file's effect is otherwise invisible to verify -# byte-for-byte, so also flip something unrelated and unmistakable. -CONFIG_ZMK_KEYBOARD_NAME="SOFLECONFTEST" diff --git a/build.yaml b/build.yaml index 9592427..518bec2 100644 --- a/build.yaml +++ b/build.yaml @@ -63,7 +63,7 @@ include: # nice_nano_v2 + nice_oled + RGB (RIGHT) - board: nice_nano_v2 shield: corne_right nice_oled - cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Corne_Oled_RGB\" + cmake-args: -DCONFIG_ZMK_KEYBOARD_NAME=\"Corne_Oled_RGB\" -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=y artifact-name: nice_corne_right_oled_rgb snippet: rgb-config @@ -75,7 +75,7 @@ include: snippet: rgb-config studio-rpc-usb-uart - board: nice_nano_v2 shield: sofle_right nice_oled - cmake-args: -DCONFIG_ZMK_SLEEP=y -DCONFIG_ZMK_IDLE_TIMEOUT=60000 -DCONFIG_ZMK_KEYBOARD_NAME=\"SOFLECONFTEST\" -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=y + cmake-args: -DCONFIG_ZMK_SLEEP=y -DCONFIG_ZMK_IDLE_TIMEOUT=60000 -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=y artifact-name: nice_sofle_right_rgb_oled snippet: rgb-config @@ -100,7 +100,7 @@ include: snippet: studio-rpc-usb-uart - board: nice_nano_v2 shield: lily58_right nice_oled - cmake-args: -DCONFIG_ZMK_SLEEP=y -DCONFIG_ZMK_IDLE_TIMEOUT=60000 + cmake-args: -DCONFIG_ZMK_SLEEP=y -DCONFIG_ZMK_IDLE_TIMEOUT=60000 -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_CAT=n -DCONFIG_NICE_OLED_WIDGET_ANIMATION_PERIPHERAL_KM=y artifact-name: nice_lily58_right_oled # # peripheral_left diff --git a/nice_sofle_right_rgb_oled.uf2 b/nice_sofle_right_rgb_oled.uf2 deleted file mode 100644 index c01d89c..0000000 Binary files a/nice_sofle_right_rgb_oled.uf2 and /dev/null differ