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

Modify fading when switching from/to MASSAGE mode

Browse Source 
In massage mode it is required that the motors react quicker, Added the
following functionality to control.cpp:

- when changing to MASSAGE mode the downfading is disabled and upfading is
reduced
- when changing from MASSAGE mode downfading is enabled and upfading reset
to default value
This commit is contained in:
jonny_ji7 2022-07-24 17:13:12 +02:00
parent cac22ca4e1
commit fea8c94a73
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
main/control.cpp
View File

@ -259,7 +259,6 @@ void controlledArmchair::changeMode(controlMode_t modeNew) {
ESP_LOGI(TAG, "disabling http server..."); ESP_LOGI(TAG, "disabling http server...");
http_stop_server(); http_stop_server();
//FIXME: make wifi function work here - currently starting wifi at startup (see notes main.cpp) //FIXME: make wifi function work here - currently starting wifi at startup (see notes main.cpp)
//stop wifi //stop wifi
//TODO: decide whether ap or client is currently used - which has to be disabled? //TODO: decide whether ap or client is currently used - which has to be disabled?
@ -268,6 +267,17 @@ void controlledArmchair::changeMode(controlMode_t modeNew) {
//wifi_deinit_ap(); //wifi_deinit_ap();
ESP_LOGI(TAG, "done stopping http mode"); ESP_LOGI(TAG, "done stopping http mode");
break; break;
case controlMode_t::MASSAGE:
ESP_LOGW(TAG, "switching from MASSAGE mode -> restoring fading");
//TODO: fix issue when downfading was disabled before switching to massage mode - currently it gets enabled again here...
//enable downfading (set to default value)
motorLeft->setFade(fadeType_t::DECEL, true);
motorRight->setFade(fadeType_t::DECEL, true);
//set upfading to default value
motorLeft->setFade(fadeType_t::ACCEL, true);
motorRight->setFade(fadeType_t::ACCEL, true);
break;
} }
@ -300,6 +310,19 @@ void controlledArmchair::changeMode(controlMode_t modeNew) {
http_init_server(); http_init_server();
ESP_LOGI(TAG, "done initializing http mode"); ESP_LOGI(TAG, "done initializing http mode");
break; break;
case controlMode_t::MASSAGE:
ESP_LOGW(TAG, "switching to MASSAGE mode -> reducing fading");
uint32_t shake_msFadeAccel = 400; //TODO: move this to config
//disable downfading (max. deceleration)
motorLeft->setFade(fadeType_t::DECEL, false);
motorRight->setFade(fadeType_t::DECEL, false);
//reduce upfading (increase acceleration)
motorLeft->setFade(fadeType_t::ACCEL, shake_msFadeAccel);
motorRight->setFade(fadeType_t::ACCEL, shake_msFadeAccel);
break;
} }
//--- update mode to new mode --- //--- update mode to new mode ---