diff options
author | Joaquim <joaquim.org@gmail.com> | 2021-04-26 21:29:48 +0100 |
---|---|---|
committer | Joaquim <joaquim.org@gmail.com> | 2021-04-26 21:29:48 +0100 |
commit | cd0d85dff95bbc5f285d92eb78a642aab1ae4b8b (patch) | |
tree | fc568aa2516c8c64cc55eb0d08e9a929c11b454a /src/displayapp/screens/FirmwareUpdate.cpp | |
parent | 5fc07a8df7d18d1fa9c4971f2c7b69ea68db559b (diff) | |
parent | eedff2c06c292bda8dcb92fc04c67097fe72e22f (diff) |
Merge branch 'develop' of
https://github.com/JF002/InfiniTime into StepsApp
Diffstat (limited to 'src/displayapp/screens/FirmwareUpdate.cpp')
-rw-r--r-- | src/displayapp/screens/FirmwareUpdate.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/displayapp/screens/FirmwareUpdate.cpp b/src/displayapp/screens/FirmwareUpdate.cpp index 26cc9a9c..4086b152 100644 --- a/src/displayapp/screens/FirmwareUpdate.cpp +++ b/src/displayapp/screens/FirmwareUpdate.cpp @@ -5,11 +5,10 @@ using namespace Pinetime::Applications::Screens; +FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Ble& bleController) + : Screen(app), bleController {bleController} { -FirmwareUpdate::FirmwareUpdate(Pinetime::Applications::DisplayApp *app, Pinetime::Controllers::Ble& bleController) : - Screen(app), bleController{bleController} { - - lv_obj_t * backgroundLabel = lv_label_create(lv_scr_act(), nullptr); + lv_obj_t* backgroundLabel = lv_label_create(lv_scr_act(), nullptr); lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP); lv_obj_set_size(backgroundLabel, 240, 240); lv_obj_set_pos(backgroundLabel, 0, 0); @@ -38,21 +37,21 @@ FirmwareUpdate::~FirmwareUpdate() { } bool FirmwareUpdate::Refresh() { - switch(bleController.State()) { + switch (bleController.State()) { default: case Pinetime::Controllers::Ble::FirmwareUpdateStates::Idle: case Pinetime::Controllers::Ble::FirmwareUpdateStates::Running: - if(state != States::Running) + if (state != States::Running) state = States::Running; return DisplayProgression(); case Pinetime::Controllers::Ble::FirmwareUpdateStates::Validated: - if(state != States::Validated) { + if (state != States::Validated) { UpdateValidated(); state = States::Validated; } return running; case Pinetime::Controllers::Ble::FirmwareUpdateStates::Error: - if(state != States::Error) { + if (state != States::Error) { UpdateError(); state = States::Error; } |