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

Add support for non-idle default mode, Set startup mode ADJUST

Browse Source
This commit is contained in:
jonny_l480 2024-08-31 20:13:03 +02:00
parent fd1189bb2f
commit a2b67c1a40
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board_single/main/config.cpp
View File

@ -135,7 +135,9 @@ motorctl_config_t configMotorControlRight = {
//------- control config ------- //------- control config -------
//------------------------------ //------------------------------
control_config_t configControl = { control_config_t configControl = {
.defaultMode = controlMode_t::JOYSTICK, // default mode after startup and toggling IDLE .defaultMode = controlMode_t::ADJUST_CHAIR, // default mode after startup and toggling IDLE
.idleAfterStartup = false, //when true: armchair is in IDLE mode after startup (2x press switches to defaultMode)
//when false: immediately switches to active defaultMode after startup
//--- timeouts --- //--- timeouts ---
.timeoutSwitchToIdleMs = 5 * 60 * 1000, // time of inactivity after which the mode gets switched to IDLE .timeoutSwitchToIdleMs = 5 * 60 * 1000, // time of inactivity after which the mode gets switched to IDLE
.timeoutNotifyPowerStillOnMs = 6 * 60 * 60 * 1000 // time in IDLE after which buzzer beeps in certain interval (notify "forgot to turn off") .timeoutNotifyPowerStillOnMs = 6 * 60 * 60 * 1000 // time in IDLE after which buzzer beeps in certain interval (notify "forgot to turn off")

15
board_single/main/control.cpp
View File

@ -88,6 +88,13 @@ controlledArmchair::controlledArmchair(
// create semaphore for preventing race condition: mode-change operations while currently still executing certain mode // create semaphore for preventing race condition: mode-change operations while currently still executing certain mode
handleIteration_mutex = xSemaphoreCreateMutex(); handleIteration_mutex = xSemaphoreCreateMutex();
//switch to default active mode if configured
if (config.idleAfterStartup == false)
{
ESP_LOGI(TAG, "idleAfterStartup is disabled -> switching to configured default mode...");
changeMode(config.defaultMode, true); //switch to default mode without beeping
}
} }
@ -434,7 +441,7 @@ void controlledArmchair::handleTimeout()
//----------- changeMode ------------ //----------- changeMode ------------
//----------------------------------- //-----------------------------------
//function to change to a specified control mode //function to change to a specified control mode
void controlledArmchair::changeMode(controlMode_t modeNew) void controlledArmchair::changeMode(controlMode_t modeNew, bool noBeep)
{ {
// variable to store configured accel limit before entering massage mode, to restore it later // variable to store configured accel limit before entering massage mode, to restore it later
static uint32_t massagePreviousAccel = motorLeft->getFade(fadeType_t::ACCEL); static uint32_t massagePreviousAccel = motorLeft->getFade(fadeType_t::ACCEL);
@ -472,7 +479,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
ESP_LOGI(TAG, "disabling debug output for 'evaluatedJoystick'"); ESP_LOGI(TAG, "disabling debug output for 'evaluatedJoystick'");
esp_log_level_set("evaluatedJoystick", ESP_LOG_WARN); // FIXME: loglevel from config esp_log_level_set("evaluatedJoystick", ESP_LOG_WARN); // FIXME: loglevel from config
#endif #endif
buzzer->beep(1, 200, 100); if (!noBeep) buzzer->beep(1, 200, 100);
break; break;
case controlMode_t::HTTP: case controlMode_t::HTTP:
@ -523,7 +530,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
case controlMode_t::IDLE: case controlMode_t::IDLE:
ESP_LOGW(TAG, "switching to IDLE mode: turning both motors off, beep"); ESP_LOGW(TAG, "switching to IDLE mode: turning both motors off, beep");
idleBothMotors(); idleBothMotors();
buzzer->beep(1, 900, 0); if (!noBeep) buzzer->beep(1, 900, 0);
break; break;
case controlMode_t::HTTP: case controlMode_t::HTTP:
@ -534,7 +541,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
case controlMode_t::ADJUST_CHAIR: case controlMode_t::ADJUST_CHAIR:
ESP_LOGW(TAG, "switching to ADJUST_CHAIR mode: turning both motors off, beep"); ESP_LOGW(TAG, "switching to ADJUST_CHAIR mode: turning both motors off, beep");
idleBothMotors(); idleBothMotors();
buzzer->beep(3, 100, 50); if (!noBeep) buzzer->beep(3, 100, 50);
break; break;
case controlMode_t::MENU_SETTINGS: case controlMode_t::MENU_SETTINGS:

4
board_single/main/control.hpp
View File

@ -29,6 +29,8 @@ extern const uint8_t controlModeMaxCount;
//struct with config parameters //struct with config parameters
typedef struct control_config_t { typedef struct control_config_t {
controlMode_t defaultMode; //default mode after startup and toggling IDLE controlMode_t defaultMode; //default mode after startup and toggling IDLE
bool idleAfterStartup; //when true: armchair is in IDLE mode after startup (2x press switches to defaultMode)
//when false: immediately switches to active defaultMode after startup when set to false
//timeout options //timeout options
uint32_t timeoutSwitchToIdleMs; //time of inactivity after which the mode gets switched to IDLE uint32_t timeoutSwitchToIdleMs; //time of inactivity after which the mode gets switched to IDLE
uint32_t timeoutNotifyPowerStillOnMs; uint32_t timeoutNotifyPowerStillOnMs;
@ -79,7 +81,7 @@ class controlledArmchair {
void startHandleLoop(); void startHandleLoop();
//function that changes to a specified control mode //function that changes to a specified control mode
void changeMode(controlMode_t modeNew); void changeMode(controlMode_t modeNew, bool noBeep = false);
//function that toggle between IDLE and previous active mode (or default if not switched to certain mode yet) //function that toggle between IDLE and previous active mode (or default if not switched to certain mode yet)
void toggleIdle(); void toggleIdle();