Skip to content

Dim screen before sleep #464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JF002 merged 5 commits into from
Jul 24, 2021
Merged

Dim screen before sleep #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5e84a6
Implement dimming
Riksu9000 Jul 3, 2021
0a28b73
Merge branch 'develop' into implement_dimming
Riksu9000 Jul 11, 2021
f7d66de
Re remove unused brightnessController
Riksu9000 Jul 11, 2021
a3047ab
Merge branch 'develop' into implement_dimming
Riksu9000 Jul 23, 2021
7b09bc1
Merge branch 'develop' into implement_dimming
Riksu9000 Jul 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/displayapp/DisplayApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,15 @@ void DisplayApp::Refresh() {
lastWakeTime = xTaskGetTickCount();
if (messageReceived) {
switch (msg) {
case Messages::GoToSleep:
case Messages::DimScreen:
// Backup brightness is the brightness to return to after dimming or sleeping
brightnessController.Backup();
brightnessController.Set(Controllers::BrightnessController::Levels::Low);
break;
case Messages::RestoreBrightness:
brightnessController.Restore();
break;
case Messages::GoToSleep:
while (brightnessController.Level() != Controllers::BrightnessController::Levels::Off) {
brightnessController.Lower();
vTaskDelay(100);
Expand Down Expand Up @@ -230,6 +237,8 @@ void DisplayApp::Refresh() {
}
} else if (returnTouchEvent == gesture) {
LoadApp(returnToApp, returnDirection);
brightnessController.Set(settingsController.GetBrightness());
brightnessController.Backup();
} else if (touchMode == TouchModes::Gestures) {
if (gesture == TouchEvents::Tap) {
lvgl.SetNewTapEvent(info.x, info.y);
Expand All @@ -243,6 +252,8 @@ void DisplayApp::Refresh() {
} else {
if (!currentScreen->OnButtonPushed()) {
LoadApp(returnToApp, returnDirection);
brightnessController.Set(settingsController.GetBrightness());
brightnessController.Backup();
}
}
break;
Expand Down
6 changes: 4 additions & 2 deletions src/displayapp/Messages.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@ namespace Pinetime {
NewNotification,
TimerDone,
BleFirmwareUpdateStarted,
UpdateTimeOut
UpdateTimeOut,
DimScreen,
RestoreBrightness
};
}
}
}
}
45 changes: 34 additions & 11 deletions src/systemtask/SystemTask.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ namespace {
}
}

void DimTimerCallback(TimerHandle_t xTimer) {

NRF_LOG_INFO("DimTimerCallback");
auto sysTask = static_cast<SystemTask*>(pvTimerGetTimerID(xTimer));
sysTask->OnDim();
}

void IdleTimerCallback(TimerHandle_t xTimer) {

NRF_LOG_INFO("IdleTimerCallback");
Expand Down Expand Up @@ -105,7 +112,7 @@ void SystemTask::Work() {
APP_GPIOTE_INIT(2);

app_timer_init();

spi.Init();
spiNorFlash.Init();
spiNorFlash.Wakeup();
Expand All @@ -114,7 +121,6 @@ void SystemTask::Work() {

nimbleController.Init();
nimbleController.StartAdvertising();
brightnessController.Init();
lcd.Init();

twiMaster.Init();
Expand Down Expand Up @@ -179,8 +185,9 @@ void SystemTask::Work() {
nrf_gpio_cfg_sense_input(pinPowerPresentIrq, NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_HIGH);
}

idleTimer = xTimerCreate("idleTimer", pdMS_TO_TICKS(settingsController.GetScreenTimeOut()), pdFALSE, this, IdleTimerCallback);
xTimerStart(idleTimer, 0);
idleTimer = xTimerCreate("idleTimer", pdMS_TO_TICKS(2000), pdFALSE, this, IdleTimerCallback);
dimTimer = xTimerCreate("dimTimer", pdMS_TO_TICKS(settingsController.GetScreenTimeOut() - 2000), pdFALSE, this, DimTimerCallback);
xTimerStart(dimTimer, 0);

// Suppress endless loop diagnostic
#pragma clang diagnostic push
Expand Down Expand Up @@ -208,7 +215,7 @@ void SystemTask::Work() {
doNotGoToSleep = true;
break;
case Messages::UpdateTimeOut:
xTimerChangePeriod(idleTimer, pdMS_TO_TICKS(settingsController.GetScreenTimeOut()), 0);
xTimerChangePeriod(dimTimer, pdMS_TO_TICKS(settingsController.GetScreenTimeOut() - 2000), 0);
break;
case Messages::GoToRunning:
spi.Wakeup();
Expand All @@ -220,7 +227,7 @@ void SystemTask::Work() {
}

nimbleController.StartAdvertising();
xTimerStart(idleTimer, 0);
xTimerStart(dimTimer, 0);
spiNorFlash.Wakeup();
lcd.Wakeup();

Expand All @@ -230,6 +237,7 @@ void SystemTask::Work() {

isSleeping = false;
isWakingUp = false;
isDimmed = false;
break;
case Messages::TouchWakeUp: {
twiMaster.Wakeup();
Expand All @@ -246,6 +254,7 @@ void SystemTask::Work() {
isGoingToSleep = true;
NRF_LOG_INFO("[systemtask] Going to sleep");
xTimerStop(idleTimer, 0);
xTimerStop(dimTimer, 0);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::GoToSleep);
heartRateApp.PushMessage(Pinetime::Applications::HeartRateTask::Messages::GoToSleep);
break;
Expand Down Expand Up @@ -283,13 +292,15 @@ void SystemTask::Work() {
NVIC_SystemReset();
}
doNotGoToSleep = false;
xTimerStart(idleTimer, 0);
xTimerStart(dimTimer, 0);
break;
case Messages::OnTouchEvent:
ReloadIdleTimer();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
break;
case Messages::OnButtonEvent:
ReloadIdleTimer();
displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonPushed);
break;
case Messages::OnDisplayTaskSleeping:
if (BootloaderVersion::IsValid()) {
Expand Down Expand Up @@ -381,7 +392,6 @@ void SystemTask::OnButtonPushed() {
if (!isSleeping) {
NRF_LOG_INFO("[systemtask] Button pushed");
PushMessage(Messages::OnButtonEvent);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::ButtonPushed);
} else {
if (!isWakingUp) {
NRF_LOG_INFO("[systemtask] Button pushed, waking up");
Expand All @@ -402,7 +412,6 @@ void SystemTask::OnTouchEvent() {
return;
if (!isSleeping) {
PushMessage(Messages::OnTouchEvent);
displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
} else if (!isWakingUp) {
if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap) or
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) {
Expand Down Expand Up @@ -430,15 +439,29 @@ void SystemTask::PushMessage(System::Messages msg) {
}
}

void SystemTask::OnDim() {
if (doNotGoToSleep)
return;
NRF_LOG_INFO("Dim timeout -> Dim screen")
displayApp.PushMessage(Pinetime::Applications::Display::Messages::DimScreen);
xTimerStart(idleTimer, 0);
isDimmed = true;
}

void SystemTask::OnIdle() {
if (doNotGoToSleep)
return;
NRF_LOG_INFO("Idle timeout -> Going to sleep")
PushMessage(Messages::GoToSleep);
}

void SystemTask::ReloadIdleTimer() const {
void SystemTask::ReloadIdleTimer() {
if (isSleeping || isGoingToSleep)
return;
xTimerReset(idleTimer, 0);
if (isDimmed) {
displayApp.PushMessage(Pinetime::Applications::Display::Messages::RestoreBrightness);
isDimmed = false;
}
xTimerReset(dimTimer, 0);
xTimerStop(idleTimer, 0);
}
7 changes: 4 additions & 3 deletions src/systemtask/SystemTask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ namespace Pinetime {
void OnTouchEvent();

void OnIdle();
void OnDim();

Pinetime::Controllers::NimbleController& nimble() {
return nimbleController;
Expand Down Expand Up @@ -99,15 +100,14 @@ namespace Pinetime {
std::atomic<bool> isSleeping {false};
std::atomic<bool> isGoingToSleep {false};
std::atomic<bool> isWakingUp {false};
std::atomic<bool> isDimmed {false};
Pinetime::Drivers::Watchdog& watchdog;
Pinetime::Controllers::NotificationManager& notificationManager;
Pinetime::Controllers::MotorController& motorController;
Pinetime::Drivers::Hrs3300& heartRateSensor;
Pinetime::Drivers::Bma421& motionSensor;
Pinetime::Controllers::Settings& settingsController;
Pinetime::Controllers::HeartRateController& heartRateController;

Controllers::BrightnessController brightnessController;
Pinetime::Controllers::MotionController& motionController;

Pinetime::Applications::DisplayApp& displayApp;
Expand All @@ -126,9 +126,10 @@ namespace Pinetime {

static void Process(void* instance);
void Work();
void ReloadIdleTimer() const;
void ReloadIdleTimer();
bool isBleDiscoveryTimerRunning = false;
uint8_t bleDiscoveryTimer = 0;
TimerHandle_t dimTimer;
TimerHandle_t idleTimer;
bool doNotGoToSleep = false;

Expand Down