Merge pull request #283 from Kampi/Add-RV-8263-C8-Driver

Add RV-8263-C8 driver
jakkra · Jul 17, 2024 · 5fd5a46 · 5fd5a46
2 parents 94c55c4 + 1fe7796
commit 5fd5a46
Show file tree

Hide file tree

Showing 31 changed files with 1,277 additions and 192 deletions.
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -56,13 +56,19 @@ include_directories(src/applications)
 include_directories(src/ui/watchfaces)
 
 if (CONFIG_DT_HAS_NORDIC_NPM1300_ENABLED)
-add_subdirectory(src/fuel_gauge)
+    add_subdirectory(src/fuel_gauge)
 else()
-add_subdirectory(src/basic_battery)
+    add_subdirectory(src/basic_battery)
 endif()
 
-target_sources(app PRIVATE src/main.c)
+# TODO
 target_sources(app PRIVATE src/zsw_clock.c)
+#if (CONFIG_RTC)
+#    target_sources(app PRIVATE src/zsw_rtc.c)
+#else()
+#endif()
+
+target_sources(app PRIVATE src/main.c)
 target_sources(app PRIVATE src/zsw_cpu_freq.c)
 target_sources(app PRIVATE src/zsw_retained_ram_storage.c)
 target_sources(app PRIVATE src/zsw_coredump.c)

diff --git a/app/Kconfig b/app/Kconfig
@@ -66,6 +66,30 @@ menu "ZSWatch"
         prompt "Activate the application 'PPT remote'"
         default n
 
+        menu "Configuration"
+            menu "Compass"
+                depends on APPLICATIONS_USE_COMPASS
+
+                config APPLICATIONS_CONFIGURATION_COMPASS_REFRESH_INTERVAL_MS
+                    int
+                prompt "Refresh interval in milliseconds"
+                default 50
+
+                config APPLICATIONS_CONFIGURATION_COMPASS_CALIBRATION_TIME_S
+                    int
+                prompt "Calibration time in seconds"
+                default 30
+            endmenu
+
+            menu "Sensors Summary"
+                depends on APPLICATIONS_USE_SENSORS_SUMMARY
+
+                config APPLICATIONS_CONFIGURATION_SENSORS_SUMMARY_REFRESH_INTERVAL_MS
+                    int
+                prompt "Refresh interval in milliseconds"
+                default 100
+            endmenu
+        endmenu
     endmenu
 
     menu "Watchface"
@@ -107,29 +131,6 @@ menu "ZSWatch"
                 default 85
         endmenu
 
-        menu "Sensors Summary"
-            depends on APPLICATIONS_USE_SENSORS_SUMMARY
-
-            config DEFAULT_CONFIGURATION_SENSORS_SUMMARY_REFRESH_INTERVAL_MS
-                int
-            prompt "Refresh interval in milliseconds"
-            default 100
-        endmenu
-
-        menu "Compass"
-            depends on APPLICATIONS_USE_COMPASS
-
-            config DEFAULT_CONFIGURATION_COMPASS_REFRESH_INTERVAL_MS
-                int
-            prompt "Refresh interval in milliseconds"
-            default 50
-
-            config DEFAULT_CONFIGURATION_COMPASS_CALIBRATION_TIME_S
-                int
-            prompt "Calibration time in seconds"
-            default 30
-        endmenu
-
         menu "Power Management"
             config POWER_MANAGEMENT_IDLE_TIMEOUT_SECONDS
                 int

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_3.overlay
@@ -83,6 +83,10 @@
     };
 };
 
+&uart0 {
+    status = "disabled";
+};
+
 &i2c1 {
     bmi270: bmi270@68 {
         compatible = "bosch,bmi270-plus";

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_4.overlay
@@ -127,6 +127,10 @@
 
 };
 
+&uart0 {
+    status = "disabled";
+};
+
 &i2c1 {
     bmi270: bmi270@68 {
         compatible = "bosch,bmi270-plus";

diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.conf
@@ -1,9 +1,7 @@
 CONFIG_ZSWATCH_PCB_REV=5
 CONFIG_BT_DIS_HW_REV_STR="5"
 
-#---------------
 # FLASH
-#-----------------
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
 CONFIG_STREAM_FLASH=y
@@ -46,3 +44,6 @@ CONFIG_SETTINGS_NVS=y
 CONFIG_NVS=y
 
 CONFIG_DEBUG_COREDUMP_BACKEND_OTHER=y
+
+CONFIG_RTC=y
+CONFIG_RTC_UPDATE=y
diff --git a/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay b/app/boards/arm/zswatch_nrf5340/zswatch_nrf5340_cpuapp_5.overlay
@@ -77,6 +77,7 @@
 				<NRF_PSEL(QSPI_IO3, 0, 16)>;
 			low-power-enable;
 		};
+
 		group2 {
 			psels = <NRF_PSEL(QSPI_CSN, 0, 18)>;
 			low-power-enable;
@@ -125,21 +126,25 @@
 
 	buttons: buttons {
         compatible = "gpio-keys";
+
         button1: button_1 {
             label = "top-right";
             gpios = <&gpio0 27 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
             zephyr,code = <INPUT_KEY_1>;
         };
+
         button2: button_2 {
             label = "bottom-left";
             gpios = <&gpio1 10 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
             zephyr,code = <INPUT_KEY_2>;
         };
+
         button3: button_3 {
             label = "bottom-right";
             gpios = <&gpio0 31 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
             zephyr,code = <INPUT_KEY_KP0>;
         };
+
         button4: button_4 {
             label = "top-left";
             gpios = <&gpio0 26 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>;
@@ -167,39 +172,54 @@
 
 	pwmleds {
         compatible = "pwm-leds";
+
         display_blk: pwm_led_0 {
             pwms = <&pwm0 0 PWM_USEC(15) PWM_POLARITY_INVERTED>;
         };
+
         vibrator_pwm: pwm_led_1 {
             pwms = <&pwm1 0 PWM_MSEC(20) 0>;
         };
+
 		buzzer_pwm: pwm_led_2 {
             pwms = <&pwm2 0 PWM_HZ(880) PWM_POLARITY_NORMAL>;
         };
     };
+};
 
+&uart0 {
+    status = "disabled";
 };
 
 &i2c1 {
-    bmi270: bmi270@68 {
-        compatible = "bosch,bmi270-plus";
-        reg = <0x68>;
-        status = "okay";
-        int-gpios = <&gpio1 4 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
-        // NOTE: The swap is performed AFTER the axis inversion. So we have to invert the y axis of the sensor
-        // to get the x axis of the watch coordinate system.
-        swap-xy;
-        invert-y;
-    };
+	rv_8263_c8: rv-8263-c8@51 {
+		compatible = "microcrystal,rv-8263-c8";
+		reg = <0x51>;
+		status = "okay";
+		clkout = <0>;
+		int-gpios = <&gpio1 13 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+	};
+
+	bmi270: bmi270@68 {
+		compatible = "bosch,bmi270-plus";
+		reg = <0x68>;
+		status = "okay";
+		int-gpios = <&gpio1 4 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>;
+		// NOTE: The swap is performed AFTER the axis inversion. So we have to invert the y axis of the sensor
+		// to get the x axis of the watch coordinate system.
+		swap-xy;
+		invert-y;
+	};
+
+	apds9306: apds9306@52 {
+		compatible = "avago,apds9306";
+		reg = <0x52>;
+		status = "okay";
+		gain = <0>;
+		resolution = <0>;
+		frequency = <0>;
+	};
 
-    apds9306: apds9306@52 {
-        compatible = "avago,apds9306";
-        reg = <0x52>;
-        status = "okay";
-        gain = <0>;
-        resolution = <0>;
-        frequency = <0>;
-    };
 	npm1300_pmic: pmic@6b {
 		compatible = "nordic,npm1300";
 		reg = <0x6b>;
@@ -254,6 +274,7 @@
 			thermistor-beta = <3380>; // Not used
 			charging-enable;
 		};
+
 		npm1300_buttons: buttons {
 			compatible = "gpio-keys";
 			status = "disabled";
@@ -287,6 +308,7 @@
 	pinctrl-0 = <&qspi_default>;
 	pinctrl-1 = <&qspi_sleep>;
 	pinctrl-names = "default", "sleep";
+
 	mx25u51245g: mx25u51245g@0 {
 		compatible = "nordic,qspi-nor";
 		reg = <0>;
@@ -312,6 +334,7 @@
 / {
 	fstab {
 		compatible = "zephyr,fstab";
+
 		lvgl_lfs: lvgl_lfs {
 			compatible = "zephyr,fstab,littlefs";
 			mount-point = "/lvgl_lfs";
@@ -339,10 +362,12 @@
 			label = "littlefs_storage";
 			reg = <0x00000000 0x00200000>;
 		};
+
 		lvgl_raw_partition: partition@200000 {
 			label = "lvgl_raw_partition";
 			reg = <0x00200000 0x00200000>;
 		};
+
 		storage_partition: partition@400000 {
 			label = "storage_partition";
 			reg = <0x400000 0x100000 >;

diff --git a/app/child_image/hci_ipc.conf b/app/child_image/hci_ipc.conf
@@ -1,47 +1,47 @@
-CONFIG_BT_EXT_ADV=y
-
-CONFIG_BT_CTLR=y
-CONFIG_BT_LL_SW_SPLIT=y
-
-CONFIG_BT_CTLR_ADV_EXT=y
-CONFIG_BT_CTLR_ADV_PERIODIC=y
-
-CONFIG_BT_CTLR_DF=y
-
-CONFIG_BT_CTLR_DF_SCAN_CTE_RX=n
-CONFIG_BT_CTLR_DF_ANT_SWITCH_RX=n
-CONFIG_BT_CTLR_DF_CTE_RX=n
-
-# Limit number of possible connection to decrease memory usage
-CONFIG_BT_MAX_CONN=1
-
-# Enable chaining of multiple CTEs in periodic advertising
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
-CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=16
-
-CONFIG_BT_CTLR_TX_PWR_0=y
-CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
-
-# Enable chaining of multiple CTEs in periodic advertising
-CONFIG_BT_CTLR_ADVANCED_FEATURES=y
-CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
-CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=16
-
-CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=n
-CONFIG_BT_BROADCASTER=y
-
-CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
-CONFIG_BT_CTLR_ADV_AUX_SET=2
-CONFIG_BT_TICKER_UPDATE=y
-
-CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
-# DFU over BT requires 
-# increase of ble throughput
-CONFIG_BT_BUF_ACL_RX_SIZE=502
-CONFIG_BT_BUF_ACL_TX_SIZE=502
-
-# Temporary fix as there is a strange behaviour with some Android
-# phones.
-CONFIG_BT_DATA_LEN_UPDATE=n
-#CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
+CONFIG_BT_EXT_ADV=y
+
+CONFIG_BT_CTLR=y
+CONFIG_BT_LL_SW_SPLIT=y
+
+CONFIG_BT_CTLR_ADV_EXT=y
+CONFIG_BT_CTLR_ADV_PERIODIC=y
+
+CONFIG_BT_CTLR_DF=y
+
+CONFIG_BT_CTLR_DF_SCAN_CTE_RX=n
+CONFIG_BT_CTLR_DF_ANT_SWITCH_RX=n
+CONFIG_BT_CTLR_DF_CTE_RX=n
+
+# Limit number of possible connection to decrease memory usage
+CONFIG_BT_MAX_CONN=1
+
+# Enable chaining of multiple CTEs in periodic advertising
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
+CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=16
+
+CONFIG_BT_CTLR_TX_PWR_0=y
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=191
+
+# Enable chaining of multiple CTEs in periodic advertising
+CONFIG_BT_CTLR_ADVANCED_FEATURES=y
+CONFIG_BT_CTLR_ADV_SYNC_PDU_BACK2BACK=y
+CONFIG_BT_CTLR_DF_PER_ADV_CTE_NUM_MAX=16
+
+CONFIG_BT_CTLR_DF_ANT_SWITCH_TX=n
+CONFIG_BT_BROADCASTER=y
+
+CONFIG_BT_EXT_ADV_MAX_ADV_SET=2
+CONFIG_BT_CTLR_ADV_AUX_SET=2
+CONFIG_BT_TICKER_UPDATE=y
+
+CONFIG_CLOCK_CONTROL_NRF_K32SRC_RC=y
+# DFU over BT requires 
+# increase of ble throughput
+CONFIG_BT_BUF_ACL_RX_SIZE=502
+CONFIG_BT_BUF_ACL_TX_SIZE=502
+
+# Temporary fix as there is a strange behaviour with some Android
+# phones.
+CONFIG_BT_DATA_LEN_UPDATE=n
+#CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
diff --git a/app/drivers/CMakeLists.txt b/app/drivers/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(display)
 add_subdirectory(input)
 
-add_subdirectory_ifdef(CONFIG_SENSOR sensor)
+add_subdirectory_ifdef(CONFIG_SENSOR sensor)
diff --git a/app/drivers/Kconfig b/app/drivers/Kconfig
@@ -1,6 +1,3 @@
 rsource "display/Kconfig"
 rsource "input/Kconfig"
-
-menu "Drivers"
-    rsource "sensor/Kconfig"
-endmenu
+rsource "sensor/Kconfig"
diff --git a/app/drivers/display/gc9a01/CMakeLists.txt b/app/drivers/display/gc9a01/CMakeLists.txt
@@ -1 +1 @@
-zephyr_sources(gc9a01.c)
+zephyr_sources(buydisplay_gc9a01.c)
diff --git a/app/drivers/display/gc9a01/Kconfig b/app/drivers/display/gc9a01/Kconfig
@@ -1,5 +1,5 @@
 menuconfig GC9A01
-    bool "GC9A01 compatible display controller driver"
+    bool "GC9A01 Display"
     default n
     select SPI
     help

diff --git a/app/drivers/display/gc9a01/gc9a01.c → ...rivers/display/gc9a01/buydisplay_gc9a01.c b/app/drivers/display/gc9a01/gc9a01.c → ...rivers/display/gc9a01/buydisplay_gc9a01.c