Updates for Zephyr 3.0 upgrade.

petejohanson · Apr 3, 2022 · b857db3 · b857db3
1 parent 03cddaa
commit b857db3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/boards/arm/zaphod/CMakeLists.txt b/boards/arm/zaphod/CMakeLists.txt
@@ -1,12 +1,3 @@
-set_property(GLOBAL APPEND PROPERTY extra_post_build_commands
-  COMMAND ${PYTHON_EXECUTABLE} ${ZEPHYR_BASE}/../tools/uf2/utils/uf2conv.py
-  -c 
-  -b 0x1000
-  -f 0xADA52840
-  -o ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.uf2
-  ${PROJECT_BINARY_DIR}/${CONFIG_KERNEL_BIN_NAME}.bin
-)
-
 zephyr_library()
 zephyr_library_include_directories(${ZEPHYR_LVGL_MODULE_DIR})
 zephyr_library_include_directories(${ZEPHYR_BASE}/lib/gui/lvgl/)

diff --git a/boards/arm/zaphod/zaphod.dts b/boards/arm/zaphod/zaphod.dts
@@ -16,8 +16,10 @@
 		zephyr,code-partition = &code_partition;
 		zephyr,sram = &sram0;
 		zephyr,flash = &flash0;
+		zephyr,display = &ls0xx;
 		zmk,kscan = &kscan;
 		zmk,matrix_transform = &transform;
+		zephyr,console = &cdc_acm_uart;
 	};
 
 	leds {
@@ -102,7 +104,7 @@
 	miso-pin = <8>;
 	cs-gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
 
-	ls0xx@0 {
+	ls0xx: ls0xx@0 {
 		compatible = "sharp,ls0xx";
 		label = "DISPLAY";
 		spi-max-frequency = <2000000>;
@@ -115,6 +117,11 @@
 
 &usbd {
 	status = "okay";
+	compatible = "nordic,nrf-usbd";
+	cdc_acm_uart: cdc_acm_uart {
+		compatible = "zephyr,cdc-acm-uart";
+		label = "CDC_ACM_0";
+	};
 };
 
 

diff --git a/boards/arm/zaphod/zaphod_defconfig b/boards/arm/zaphod/zaphod_defconfig
@@ -20,6 +20,7 @@ CONFIG_LVGL_CUSTOM_COLOR_TRANSP_GREEN=0x00
 CONFIG_LVGL_CUSTOM_COLOR_TRANSP_BLUE=0x00
 
 CONFIG_USE_DT_CODE_PARTITION=y
+CONFIG_BUILD_OUTPUT_UF2=y
 
 CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_NVS=y

diff --git a/boards/arm/zaphod/zaphod_status_screen.c b/boards/arm/zaphod/zaphod_status_screen.c
@@ -52,7 +52,7 @@ lv_obj_t *zmk_display_status_screen() {
     lv_style_set_text_line_space(&global_style, LV_STATE_DEFAULT, 1);
 
     screen = lv_obj_create(NULL, NULL);
-    lv_obj_add_style(screen, LV_LABEL_PART_MAIN, &global_style);
+    lv_obj_add_style(screen, LV_OBJ_PART_MAIN, &global_style);
 
 #if IS_ENABLED(CONFIG_ZMK_WIDGET_BATTERY_STATUS)
     zmk_widget_battery_status_init(&battery_status_widget, screen);