diff options
| author | hubmartin <hub.martin@gmail.com> | 2021-08-29 09:43:50 (GMT) |
|---|---|---|
| committer | hubmartin <hub.martin@gmail.com> | 2021-08-29 09:43:50 (GMT) |
| commit | 8390d0ef7243261675aab3a5c19862eb3fc53e68 (patch) | |
| tree | a8429e8d2a455df8afe152197119075b5789e9fb /src/displayapp/screens/Metronome.cpp | |
| parent | 51c5257548efe678ec8e18d8cdea2476672f1238 (diff) | |
| parent | 6c023785e53c507f7cb20703f5f3a221ea095068 (diff) | |
Merge branch 'develop' into pinmap
Diffstat (limited to 'src/displayapp/screens/Metronome.cpp')
| -rw-r--r-- | src/displayapp/screens/Metronome.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp index 66f8f62..884a4a5 100644 --- a/src/displayapp/screens/Metronome.cpp +++ b/src/displayapp/screens/Metronome.cpp @@ -67,16 +67,16 @@ Metronome::Metronome(DisplayApp* app, Controllers::MotorController& motorControl 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); - app->SetTouchMode(DisplayApp::TouchModes::Polling); + taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this); } Metronome::~Metronome() { - app->SetTouchMode(DisplayApp::TouchModes::Gestures); + 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; @@ -89,7 +89,6 @@ bool Metronome::Refresh() { } } } - return running; } void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) { |