chore: zephyr 3.5

calebdw · Feb 13, 2024 · 198ebf7 · 198ebf7
1 parent 19a36ec
commit 198ebf7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/config/boards/shields/nice_view_custom/Kconfig.defconfig b/config/boards/shields/nice_view_custom/Kconfig.defconfig
@@ -6,7 +6,7 @@ if SHIELD_NICE_VIEW_CUSTOM
 config LV_Z_VDB_SIZE
     default 100
 
-config LV_Z_DPI
+config LV_DPI_DEF
     default 161
 
 config LV_Z_BITS_PER_PIXEL
@@ -24,6 +24,9 @@ choice ZMK_DISPLAY_STATUS_SCREEN
     default ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
 endchoice
 
+config LV_Z_MEM_POOL_SIZE
+    default 4096 if ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
+
 config ZMK_DISPLAY_STATUS_SCREEN_CUSTOM
     imply NICE_VIEW_WIDGET_STATUS
 

diff --git a/config/boards/shields/nice_view_custom/widgets/peripheral_status.c b/config/boards/shields/nice_view_custom/widgets/peripheral_status.c
@@ -7,7 +7,7 @@
 
 #include <zephyr/kernel.h>
 #include <zephyr/bluetooth/services/bas.h>
-#include <zephyr/random/rand32.h>
+#include <zephyr/random/random.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

diff --git a/config/boards/shields/nice_view_custom/widgets/status.c b/config/boards/shields/nice_view_custom/widgets/status.c
@@ -153,7 +153,7 @@ static void draw_middle(lv_obj_t *widget, lv_color_t cbuf[], const struct status
                            &arc_dsc);
 
         if (selected) {
-            lv_canvas_draw_arc(canvas, circle_offsets[i][0], circle_offsets[i][1], 9, 0, 359,
+            lv_canvas_draw_arc(canvas, circle_offsets[i][0], circle_offsets[i][1], 9, 0, 360,
                                &arc_dsc_filled);
         }
 
@@ -180,7 +180,7 @@ static void draw_bottom(lv_obj_t *widget, lv_color_t cbuf[], const struct status
 
     // Draw layer
     if (state->layer_label == NULL) {
-        char text[9] = {};
+        char text[10] = {};
 
         sprintf(text, "LAYER %i", state->layer_index);
 

diff --git a/config/corne.conf b/config/corne.conf
@@ -15,5 +15,8 @@ CONFIG_NICE_VIEW_WIDGET_INVERTED=y
 CONFIG_ZMK_KSCAN_DEBOUNCE_PRESS_MS=1
 CONFIG_ZMK_KSCAN_DEBOUNCE_RELEASE_MS=7
 
+# Experimental Zephyr 3.5 BLE connection handling
+CONFIG_ZMK_BLE_EXPERIMENTAL_CONN=y
+
 # Uncomment the following line to enable USB Logging (this increases power usage by a significant amount, turn it off when not in use)
 # CONFIG_ZMK_USB_LOGGING=y