mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
Merge 693030322b
into a2356f2f4a
This commit is contained in:
commit
784d17d244
|
@ -34,6 +34,10 @@ void MotorController::StopRinging() {
|
|||
nrf_gpio_pin_set(PinMap::Motor);
|
||||
}
|
||||
|
||||
bool MotorController::IsRinging() {
|
||||
return (xTimerIsTimerActive(longVib) == pdTRUE);
|
||||
}
|
||||
|
||||
void MotorController::StopMotor(TimerHandle_t /*xTimer*/) {
|
||||
nrf_gpio_pin_set(PinMap::Motor);
|
||||
}
|
||||
|
|
|
@ -15,6 +15,7 @@ namespace Pinetime {
|
|||
void RunForDuration(uint8_t motorDuration);
|
||||
void StartRinging();
|
||||
void StopRinging();
|
||||
bool IsRinging();
|
||||
|
||||
private:
|
||||
static void Ring(TimerHandle_t xTimer);
|
||||
|
|
|
@ -12,11 +12,13 @@ void Timer::StartTimer(std::chrono::milliseconds duration) {
|
|||
}
|
||||
|
||||
std::chrono::milliseconds Timer::GetTimeRemaining() {
|
||||
TickType_t remainingTime = 0;
|
||||
if (IsRunning()) {
|
||||
TickType_t remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount();
|
||||
return std::chrono::milliseconds(remainingTime * 1000 / configTICK_RATE_HZ);
|
||||
remainingTime = xTimerGetExpiryTime(timer) - xTaskGetTickCount();
|
||||
} else if (expired > 0) {
|
||||
remainingTime = xTaskGetTickCount() - expired;
|
||||
}
|
||||
return std::chrono::milliseconds(0);
|
||||
return std::chrono::milliseconds(remainingTime * 1000 / configTICK_RATE_HZ);
|
||||
}
|
||||
|
||||
void Timer::StopTimer() {
|
||||
|
@ -26,3 +28,11 @@ void Timer::StopTimer() {
|
|||
bool Timer::IsRunning() {
|
||||
return (xTimerIsTimerActive(timer) == pdTRUE);
|
||||
}
|
||||
|
||||
void Timer::SetExpiredTime() {
|
||||
expired = xTimerGetExpiryTime(timer);
|
||||
}
|
||||
|
||||
void Timer::ResetExpiredTime() {
|
||||
expired = 0;
|
||||
}
|
||||
|
|
|
@ -19,8 +19,13 @@ namespace Pinetime {
|
|||
|
||||
bool IsRunning();
|
||||
|
||||
void SetExpiredTime();
|
||||
|
||||
void ResetExpiredTime();
|
||||
|
||||
private:
|
||||
TimerHandle_t timer;
|
||||
TickType_t expired = 0;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -343,14 +343,17 @@ void DisplayApp::Refresh() {
|
|||
if (state != States::Running) {
|
||||
PushMessageToSystemTask(System::Messages::GoToRunning);
|
||||
}
|
||||
// Load timer app if not loaded
|
||||
if (currentApp != Apps::Timer) {
|
||||
LoadNewScreen(Apps::Timer, DisplayApp::FullRefreshDirections::Up);
|
||||
}
|
||||
// Once loaded, set the timer to ringing mode
|
||||
if (currentApp == Apps::Timer) {
|
||||
lv_disp_trig_activity(nullptr);
|
||||
auto* timer = static_cast<Screens::Timer*>(currentScreen.get());
|
||||
timer->Reset();
|
||||
} else {
|
||||
LoadNewScreen(Apps::Timer, DisplayApp::FullRefreshDirections::Up);
|
||||
timer->SetTimerRinging();
|
||||
}
|
||||
motorController.RunForDuration(35);
|
||||
motorController.StartRinging();
|
||||
break;
|
||||
case Messages::AlarmTriggered:
|
||||
if (currentApp == Apps::Alarm) {
|
||||
|
|
|
@ -17,7 +17,8 @@ static void btnEventHandler(lv_obj_t* obj, lv_event_t event) {
|
|||
}
|
||||
}
|
||||
|
||||
Timer::Timer(Controllers::Timer& timerController) : timer {timerController} {
|
||||
Timer::Timer(Controllers::Timer& timerController, Controllers::MotorController& motorController)
|
||||
: timer {timerController}, motorController {motorController} {
|
||||
|
||||
lv_obj_t* colonLabel = lv_label_create(lv_scr_act(), nullptr);
|
||||
lv_obj_set_style_local_text_font(colonLabel, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_76);
|
||||
|
@ -62,7 +63,9 @@ Timer::Timer(Controllers::Timer& timerController) : timer {timerController} {
|
|||
txtPlayPause = lv_label_create(lv_scr_act(), nullptr);
|
||||
lv_obj_align(txtPlayPause, btnPlayPause, LV_ALIGN_CENTER, 0, 0);
|
||||
|
||||
if (timer.IsRunning()) {
|
||||
if (motorController.IsRinging()) {
|
||||
SetTimerRinging();
|
||||
} else if (timer.IsRunning()) {
|
||||
SetTimerRunning();
|
||||
} else {
|
||||
SetTimerStopped();
|
||||
|
@ -103,7 +106,17 @@ void Timer::UpdateMask() {
|
|||
}
|
||||
|
||||
void Timer::Refresh() {
|
||||
if (timer.IsRunning()) {
|
||||
if (isRinging) {
|
||||
DisplayTime();
|
||||
// Stop buzzing after 10 seconds, but continue the counter
|
||||
if (motorController.IsRinging() && displaySeconds.Get().count() > 10) {
|
||||
motorController.StopRinging();
|
||||
}
|
||||
// Reset timer after 1 minute
|
||||
if (displaySeconds.Get().count() > 60) {
|
||||
Reset();
|
||||
}
|
||||
} else if (timer.IsRunning()) {
|
||||
DisplayTime();
|
||||
} else if (buttonPressing && xTaskGetTickCount() > pressTime + pdMS_TO_TICKS(150)) {
|
||||
lv_label_set_text_static(txtPlayPause, "Reset");
|
||||
|
@ -129,16 +142,31 @@ void Timer::SetTimerRunning() {
|
|||
minuteCounter.HideControls();
|
||||
secondCounter.HideControls();
|
||||
lv_label_set_text_static(txtPlayPause, "Pause");
|
||||
lv_obj_set_style_local_bg_color(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, Colors::bgAlt);
|
||||
}
|
||||
|
||||
void Timer::SetTimerStopped() {
|
||||
isRinging = false;
|
||||
minuteCounter.ShowControls();
|
||||
secondCounter.ShowControls();
|
||||
lv_label_set_text_static(txtPlayPause, "Start");
|
||||
lv_obj_set_style_local_bg_color(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GREEN);
|
||||
}
|
||||
|
||||
void Timer::SetTimerRinging() {
|
||||
isRinging = true;
|
||||
minuteCounter.HideControls();
|
||||
secondCounter.HideControls();
|
||||
lv_label_set_text_static(txtPlayPause, "Reset");
|
||||
lv_obj_set_style_local_bg_color(btnPlayPause, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_RED);
|
||||
timer.SetExpiredTime();
|
||||
}
|
||||
|
||||
void Timer::ToggleRunning() {
|
||||
if (timer.IsRunning()) {
|
||||
if (isRinging) {
|
||||
motorController.StopRinging();
|
||||
Reset();
|
||||
} else if (timer.IsRunning()) {
|
||||
DisplayTime();
|
||||
timer.StopTimer();
|
||||
SetTimerStopped();
|
||||
|
@ -151,6 +179,7 @@ void Timer::ToggleRunning() {
|
|||
}
|
||||
|
||||
void Timer::Reset() {
|
||||
timer.ResetExpiredTime();
|
||||
DisplayTime();
|
||||
SetTimerStopped();
|
||||
}
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
|
||||
#include "displayapp/screens/Screen.h"
|
||||
#include "components/datetime/DateTimeController.h"
|
||||
#include "components/motor/MotorController.h"
|
||||
#include "systemtask/SystemTask.h"
|
||||
#include "displayapp/LittleVgl.h"
|
||||
#include "displayapp/widgets/Counter.h"
|
||||
|
@ -15,13 +16,14 @@ namespace Pinetime::Applications {
|
|||
namespace Screens {
|
||||
class Timer : public Screen {
|
||||
public:
|
||||
Timer(Controllers::Timer& timerController);
|
||||
Timer(Controllers::Timer& timerController, Controllers::MotorController& motorController);
|
||||
~Timer() override;
|
||||
void Refresh() override;
|
||||
void Reset();
|
||||
void ToggleRunning();
|
||||
void ButtonPressed();
|
||||
void MaskReset();
|
||||
void SetTimerRinging();
|
||||
|
||||
private:
|
||||
void SetTimerRunning();
|
||||
|
@ -29,6 +31,7 @@ namespace Pinetime::Applications {
|
|||
void UpdateMask();
|
||||
void DisplayTime();
|
||||
Pinetime::Controllers::Timer& timer;
|
||||
Pinetime::Controllers::MotorController& motorController;
|
||||
|
||||
lv_obj_t* btnPlayPause;
|
||||
lv_obj_t* txtPlayPause;
|
||||
|
@ -43,6 +46,7 @@ namespace Pinetime::Applications {
|
|||
Widgets::Counter secondCounter = Widgets::Counter(0, 59, jetbrains_mono_76);
|
||||
|
||||
bool buttonPressing = false;
|
||||
bool isRinging = false;
|
||||
lv_coord_t maskPosition = 0;
|
||||
TickType_t pressTime = 0;
|
||||
Utility::DirtyValue<std::chrono::seconds> displaySeconds;
|
||||
|
@ -55,7 +59,7 @@ namespace Pinetime::Applications {
|
|||
static constexpr const char* icon = Screens::Symbols::hourGlass;
|
||||
|
||||
static Screens::Screen* Create(AppControllers& controllers) {
|
||||
return new Screens::Timer(controllers.timer);
|
||||
return new Screens::Timer(controllers.timer, controllers.motorController);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue