diff options
| author | Kieran Cawthray <kieranc@gmail.com> | 2021-06-29 21:10:36 +0200 |
|---|---|---|
| committer | Kieran Cawthray <kieranc@gmail.com> | 2021-06-29 21:10:36 +0200 |
| commit | 4f21748aa2a4693bd4b243ab0ebe11482d1aaf09 (patch) | |
| tree | 762dd147b5d08db903da93883e7dc8dcaf6292cd /src/main.cpp | |
| parent | 660a8597f6edc66deec94782817613e1a4f84a6d (diff) | |
| parent | f317d54218659af437d840d00fd349e7919a243f (diff) | |
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4c2c5de8..5832a78f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -28,6 +28,7 @@ #include <drivers/Hrs3300.h> #include <drivers/Bma421.h> +#include "BootloaderVersion.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" #include "components/ble/NotificationManager.h" @@ -306,6 +307,9 @@ int main(void) { debounceTimer = xTimerCreate("debounceTimer", 200, pdFALSE, (void*) 0, DebounceTimerCallback); debounceChargeTimer = xTimerCreate("debounceTimerCharge", 200, pdFALSE, (void*) 0, DebounceTimerChargeCallback); + // retrieve version stored by bootloader + Pinetime::BootloaderVersion::SetVersion(NRF_TIMER2->CC[0]); + lvgl.Init(); systemTask.Start(); |