Merge develop

This commit is contained in:
JF 2020-05-24 16:51:50 +02:00
commit 073717980f
57 changed files with 775 additions and 423 deletions

View file

@ -352,6 +352,8 @@ list(APPEND SOURCE_FILES
Components/Ble/CurrentTimeClient.cpp
Components/Ble/AlertNotificationClient.cpp
Components/Ble/DfuService.cpp
Components/Ble/CurrentTimeService.cpp
Components/Ble/AlertNotificationService.cpp
drivers/Cst816s.cpp
FreeRTOS/port.c
FreeRTOS/port_cmsis_systick.c