Merge branch 'develop' into upstream-dev

src/CMakeLists.txt

@@ -324,6 +324,96 @@ list(APPEND IMAGE_FILES
 
         displayapp/icons/bluetooth/os_bt_connected.c
         displayapp/icons/bluetooth/os_bt_disconnected.c
+
+        displayapp/icons/navigation/arrive-left.c
+        displayapp/icons/navigation/arrive-right.c
+        displayapp/icons/navigation/arrive-straight.c
+        displayapp/icons/navigation/arrive.c
+        displayapp/icons/navigation/close.c
+        displayapp/icons/navigation/continue-left.c
+        displayapp/icons/navigation/continue-right.c
+        displayapp/icons/navigation/continue-slight-left.c
+        displayapp/icons/navigation/continue-slight-right.c
+        displayapp/icons/navigation/continue-straight.c
+        displayapp/icons/navigation/continue-uturn.c
+        displayapp/icons/navigation/continue.c
+        displayapp/icons/navigation/depart-left.c
+        displayapp/icons/navigation/depart-right.c
+        displayapp/icons/navigation/depart-straight.c
+        displayapp/icons/navigation/end-of-road-left.c
+        displayapp/icons/navigation/end-of-road-right.c
+        displayapp/icons/navigation/ferry.c
+        displayapp/icons/navigation/flag.c
+        displayapp/icons/navigation/fork-left.c
+        displayapp/icons/navigation/fork-right.c
+        displayapp/icons/navigation/fork-slight-left.c
+        displayapp/icons/navigation/fork-slight-right.c
+        displayapp/icons/navigation/fork-straight.c
+        displayapp/icons/navigation/invalid.c
+        displayapp/icons/navigation/invalid-left.c
+        displayapp/icons/navigation/invalid-right.c
+        displayapp/icons/navigation/invalid-slight-left.c
+        displayapp/icons/navigation/invalid-slight-right.c
+        displayapp/icons/navigation/invalid-straight.c
+        displayapp/icons/navigation/invalid-uturn.c
+        displayapp/icons/navigation/merge-left.c
+        displayapp/icons/navigation/merge-right.c
+        displayapp/icons/navigation/merge-slight-left.c
+        displayapp/icons/navigation/merge-slight-right.c
+        displayapp/icons/navigation/merge-straight.c
+        displayapp/icons/navigation/new-name-left.c
+        displayapp/icons/navigation/new-name-right.c
+        displayapp/icons/navigation/new-name-sharp-left.c
+        displayapp/icons/navigation/new-name-sharp-right.c
+        displayapp/icons/navigation/new-name-slight-left.c
+        displayapp/icons/navigation/new-name-slight-right.c
+        displayapp/icons/navigation/new-name-straight.c
+        displayapp/icons/navigation/notification-left.c
+        displayapp/icons/navigation/notification-right.c
+        displayapp/icons/navigation/notification-sharp-left.c
+        displayapp/icons/navigation/notification-sharp-right.c
+        displayapp/icons/navigation/notification-slight-left.c
+        displayapp/icons/navigation/notification-slight-right.c
+        displayapp/icons/navigation/notification-straight.c
+        displayapp/icons/navigation/off-ramp-left.c
+        displayapp/icons/navigation/off-ramp-right.c
+        displayapp/icons/navigation/off-ramp-sharp-left.c
+        displayapp/icons/navigation/off-ramp-sharp-right.c
+        displayapp/icons/navigation/off-ramp-slight-left.c
+        displayapp/icons/navigation/off-ramp-slight-right.c
+        displayapp/icons/navigation/off-ramp-straight.c
+        displayapp/icons/navigation/on-ramp-left.c
+        displayapp/icons/navigation/on-ramp-right.c
+        displayapp/icons/navigation/on-ramp-sharp-left.c
+        displayapp/icons/navigation/on-ramp-sharp-right.c
+        displayapp/icons/navigation/on-ramp-slight-left.c
+        displayapp/icons/navigation/on-ramp-slight-right.c
+        displayapp/icons/navigation/on-ramp-straight.c
+        displayapp/icons/navigation/rotary.c
+        displayapp/icons/navigation/rotary-left.c
+        displayapp/icons/navigation/rotary-right.c
+        displayapp/icons/navigation/rotary-sharp-left.c
+        displayapp/icons/navigation/rotary-sharp-right.c
+        displayapp/icons/navigation/rotary-slight-left.c
+        displayapp/icons/navigation/rotary-slight-right.c
+        displayapp/icons/navigation/rotary-straight.c
+        displayapp/icons/navigation/roundabout.c
+        displayapp/icons/navigation/roundabout-left.c
+        displayapp/icons/navigation/roundabout-right.c
+        displayapp/icons/navigation/roundabout-sharp-left.c
+        displayapp/icons/navigation/roundabout-sharp-right.c
+        displayapp/icons/navigation/roundabout-slight-left.c
+        displayapp/icons/navigation/roundabout-slight-right.c
+        displayapp/icons/navigation/roundabout-straight.c
+        displayapp/icons/navigation/turn-left.c
+        displayapp/icons/navigation/turn-right.c
+        displayapp/icons/navigation/turn-sharp-left.c
+        displayapp/icons/navigation/turn-sharp-right.c
+        displayapp/icons/navigation/turn-slight-left.c
+        displayapp/icons/navigation/turn-slight-right.c
+        displayapp/icons/navigation/turn-stright.c
+        displayapp/icons/navigation/updown.c
+        displayapp/icons/navigation/uturn.c
         )
 
 list(APPEND SOURCE_FILES
@@ -347,10 +437,12 @@ list(APPEND SOURCE_FILES
         displayapp/screens/Label.cpp
         displayapp/screens/FirmwareUpdate.cpp
         displayapp/screens/Music.cpp
+        displayapp/screens/Navigation.cpp
         displayapp/screens/FirmwareValidation.cpp
         displayapp/screens/ApplicationList.cpp
         displayapp/screens/Notifications.cpp
         displayapp/screens/Twos.cpp
+        displayapp/screens/HeartRate.cpp
         main.cpp
         drivers/St7789.cpp
         drivers/SpiNorFlash.cpp
@@ -359,6 +451,7 @@ list(APPEND SOURCE_FILES
         drivers/Watchdog.cpp
         drivers/DebugPins.cpp
         drivers/InternalFlash.cpp
+        drivers/Hrs3300.cpp
         components/battery/BatteryController.cpp
         components/ble/BleController.cpp
         components/ble/NotificationManager.cpp
@@ -372,9 +465,11 @@ list(APPEND SOURCE_FILES
         components/ble/CurrentTimeService.cpp
         components/ble/AlertNotificationService.cpp
         components/ble/MusicService.cpp
+        components/ble/NavigationService.cpp
         components/ble/BatteryInformationService.cpp
         components/ble/ImmediateAlertService.cpp
         components/ble/ServiceDiscovery.cpp
+        components/ble/HeartRateService.cpp
         components/firmwarevalidator/FirmwareValidator.cpp
         components/motor/MotorController.cpp
         drivers/Cst816s.cpp
@@ -388,6 +483,12 @@ list(APPEND SOURCE_FILES
 
         systemtask/SystemTask.cpp
         drivers/TwiMaster.cpp
+
+        heartratetask/HeartRateTask.cpp
+        components/heartrate/Ppg.cpp
+        components/heartrate/Biquad.cpp
+        components/heartrate/Ptagc.cpp
+        components/heartrate/HeartRateController.cpp
         )
 
 list(APPEND GRAPHICS_SOURCE_FILES
@@ -435,6 +536,7 @@ set(INCLUDE_FILES
         displayapp/screens/ApplicationList.h
         displayapp/Apps.h
         displayapp/screens/Notifications.h
+        displayapp/screens/HeartRate.h
         drivers/St7789.h
         drivers/SpiNorFlash.h
         drivers/SpiMaster.h
@@ -442,6 +544,7 @@ set(INCLUDE_FILES
         drivers/Watchdog.h
         drivers/DebugPins.h
         drivers/InternalFlash.h
+        drivers/Hrs3300.h
         components/battery/BatteryController.h
         components/ble/BleController.h
         components/ble/NotificationManager.h
@@ -457,6 +560,7 @@ set(INCLUDE_FILES
         components/ble/ImmediateAlertService.h
         components/ble/ServiceDiscovery.h
         components/ble/BleClient.h
+        components/ble/HeartRateService.h.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h