j/armchair_fw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Screensaver, Fix timeout

Browse Source 
Add screensaver status screen to prevent oled burn-in:
  Display task switches to screensaver status-screen
  when certain time of inactivity is exceeded
This commit is contained in:
jonny_l480 2024-03-01 23:59:00 +01:00
parent bc9504d4ab
commit 0d082a52d8
4 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board_single/main/control.cpp
View File

@ -337,7 +337,7 @@ void controlledArmchair::resetTimeout(){
// switch to IDLE when no activity (prevent accidential movement)
// notify "power still on" when in IDLE for a very long time (prevent battery drain when forgotten to turn off)
// this function has to be run repeatedly (can be slow interval)
#define TIMEOUT_POWER_STILL_ON_BEEP_INTERVAL_MS 30 * 60 * 1000 // beep every 30 minutes for someone to notice
#define TIMEOUT_POWER_STILL_ON_BEEP_INTERVAL_MS 10 * 60 * 1000 // beep every 30 minutes for someone to notice
// note: timeout durations are configured in config.cpp
void controlledArmchair::handleTimeout()
{
@ -347,25 +347,26 @@ void controlledArmchair::handleTimeout()
noActivityDurationMs / 1000 / 60,
noActivityDurationMs / 1000 % 60,
config.timeoutSwitchToIdleMs / 1000,
config.timeoutNotifyPowerStillOnMs / 1000);
config.timeoutNotifyPowerStillOnMs / 1000 / 60 / 60);
// timeout to IDLE when not idling already
if (mode != controlMode_t::IDLE && noActivityDurationMs > config.timeoutSwitchToIdleMs)
{
ESP_LOGW(TAG, "timeout check: [TIMEOUT], no activity for more than %ds -> switch to IDLE", config.timeoutSwitchToIdleMs / 1000);
changeMode(controlMode_t::IDLE);
//TODO switch to previous status-screen when activity detected
}
// repeatedly notify via buzzer when in IDLE for a very long time to prevent battery drain ("forgot to turn off")
// note: ignores user input while in IDLE
else if (esp_log_timestamp() - timestamp_lastModeChange > config.timeoutNotifyPowerStillOnMs)
else if ((esp_log_timestamp() - timestamp_lastModeChange) > config.timeoutNotifyPowerStillOnMs)
{
// beep in certain intervals
if (esp_log_timestamp() - timestamp_lastTimeoutBeep > TIMEOUT_POWER_STILL_ON_BEEP_INTERVAL_MS)
if ((esp_log_timestamp() - timestamp_lastTimeoutBeep) > TIMEOUT_POWER_STILL_ON_BEEP_INTERVAL_MS)
{
ESP_LOGD(TAG, "timeout: [TIMEOUT] in IDLE for more than %.3f hours", (float)(esp_log_timestamp() - timestamp_lastModeChange) / 1000 / 60 / 60);
ESP_LOGW(TAG, "timeout: [TIMEOUT] in IDLE since %.3f hours -> beeping", (float)(esp_log_timestamp() - timestamp_lastModeChange) / 1000 / 60 / 60);
// TODO dont beep at certain times ranges (e.g. at night)
timestamp_lastTimeoutBeep = esp_log_timestamp();
buzzer->beep(4, 100, 50);
buzzer->beep(6, 100, 50);
}
}
}

2
board_single/main/control.hpp
View File

@ -97,6 +97,8 @@ class controlledArmchair {
void setMaxDuty(float maxDutyNew) { writeMaxDuty(maxDutyNew); };
float getMaxDuty() const {return joystickGenerateCommands_config.maxDuty; };
uint32_t getInactivityDurationMs() {return esp_log_timestamp() - timestamp_lastActivity;};
private:
//--- functions ---

47
board_single/main/display.cpp
View File

@ -234,7 +234,7 @@ float getBatteryPercent()
//shows overview on entire display:
//Battery percentage, voltage, current, mode, rpm, speed
#define STATUS_SCREEN_OVERVIEW_UPDATE_INTERVAL 500
void showStatusScreenOverview(display_task_parameters_t * objects)
void showStatusScreenOverview(display_task_parameters_t *objects)
{
//-- battery percentage --
// TODO update when no load (currentsensors = ~0A) only
@ -265,7 +265,6 @@ void showStatusScreenOverview(display_task_parameters_t * objects)
vTaskDelay(STATUS_SCREEN_OVERVIEW_UPDATE_INTERVAL / portTICK_PERIOD_MS);
}
//############################
//##### showScreen Speed #####
//############################
@ -331,6 +330,42 @@ void showStatusScreenMotors(display_task_parameters_t *objects)
}
//###############################
//#### showScreen Sreensaver ####
//###############################
// show minimal text scrolling across screen to prevent burn in
// indicates that armchair is still on (probably "forgotten to be turned off")
#define STATUS_SCREEN_TIMEOUT_NEXT_LINE_SEC 6
void showStatusScreenScreensaver(display_task_parameters_t *objects)
{
// to prevent burn-in only showing minimal and scrolling text
ssd1306_clear_screen(&dev, false);
ssd1306_hardware_scroll(&dev, SCROLL_RIGHT);
// loop through all lines (also scroll down)
for (int line = 0; line < 7; line++)
{
ssd1306_clear_screen(&dev, false);
displayTextLine(&dev, line, false, false, "IDLE since");
displayTextLine(&dev, line + 1, false, false, "%.1fh, B:%02.0f%%", (float)objects->control->getInactivityDurationMs() / 1000 / 60 / 60, getBatteryPercent());
// check exit condition while waiting some time before switching to next line
int secondsPassed = 0;
while (secondsPassed < STATUS_SCREEN_TIMEOUT_NEXT_LINE_SEC)
{
secondsPassed ++;
vTaskDelay(1000 / portTICK_PERIOD_MS);
// switch to default status screen, when IDLE mode is exited (timeout has ended)
if (objects->control->getCurrentMode() != controlMode_t::IDLE)
{
display_selectStatusPage(STATUS_SCREEN_OVERVIEW);
ssd1306_hardware_scroll(&dev, SCROLL_STOP);
return;
}
}
}
ssd1306_hardware_scroll(&dev, SCROLL_STOP);
}
//########################
//#### showStartupMsg ####
//########################
@ -363,6 +398,8 @@ void display_selectStatusPage(displayStatusPage_t newStatusPage){
//======= display task =======
//============================
// TODO: separate task for each loop?
#define DISPLAY_IDLE_TIMEOUT_SCREENSAVER_MS 15*60*1000
void display_task(void *pvParameters)
{
ESP_LOGW(TAG, "Initializing display and starting handle loop");
@ -403,7 +440,13 @@ void display_task(void *pvParameters)
case STATUS_SCREEN_MOTORS:
showStatusScreenMotors(objects);
break;
case STATUS_SCREEN_SCREENSAVER:
showStatusScreenScreensaver(objects);
break;
}
// switch to screensaver when no user activity for a long time, to prevent burn in
if (objects->control->getInactivityDurationMs() > DISPLAY_IDLE_TIMEOUT_SCREENSAVER_MS)
selectedStatusPage = STATUS_SCREEN_SCREENSAVER;
}
// TODO add pages and menus
}

2
board_single/main/display.hpp
View File

@ -49,7 +49,7 @@ typedef struct display_task_parameters_t {
// enum for selecting the currently shown status page (display content when not in MENU mode)
typedef enum displayStatusPage_t {STATUS_SCREEN_OVERVIEW=0, STATUS_SCREEN_SPEED, STATUS_SCREEN_JOYSTICK, STATUS_SCREEN_MOTORS} displayStatusPage_t;
typedef enum displayStatusPage_t {STATUS_SCREEN_OVERVIEW=0, STATUS_SCREEN_SPEED, STATUS_SCREEN_JOYSTICK, STATUS_SCREEN_MOTORS, STATUS_SCREEN_SCREENSAVER} displayStatusPage_t;
// get precise battery voltage (using lookup table)
float getBatteryVoltage();