diff options
author | Riku Isokoski <riksu9000@gmail.com> | 2021-08-30 10:15:19 +0300 |
---|---|---|
committer | Riku Isokoski <riksu9000@gmail.com> | 2021-08-30 10:15:19 +0300 |
commit | 21d37d1e234b217b3e71dc65eb19db197ee21bad (patch) | |
tree | d1082c3dbcddd6d56fbb0f14fc9100f1efbfe441 /src/displayapp/screens/Metronome.cpp | |
parent | 085c9ab2e15b35af01d73e823a87994a7a24a76f (diff) | |
parent | 6c023785e53c507f7cb20703f5f3a221ea095068 (diff) |
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
Diffstat (limited to 'src/displayapp/screens/Metronome.cpp')
-rw-r--r-- | src/displayapp/screens/Metronome.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp index 5fbe5f36..884a4a51 100644 --- a/src/displayapp/screens/Metronome.cpp +++ b/src/displayapp/screens/Metronome.cpp @@ -66,14 +66,17 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl lv_obj_set_size(playPause, 115, 50); lv_obj_align(playPause, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, 0, 0); lv_obj_set_style_local_value_str(playPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Symbols::play); + + taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); } Metronome::~Metronome() { + lv_task_del(taskRefresh); systemTask.PushMessage(System::Messages::EnableSleeping); lv_obj_clean(lv_scr_act()); } -bool Metronome::Refresh() { +void Metronome::Refresh() { if (metronomeStarted) { if (xTaskGetTickCount() - startTime > 60 * configTICK_RATE_HZ / bpm) { startTime += 60 * configTICK_RATE_HZ / bpm; @@ -86,7 +89,6 @@ bool Metronome::Refresh() { } } } - return running; } void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) { |