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

Adjust button commands (dont toggle modes)

Browse Source 
Adjust button actions to match the current README
This commit is contained in:
jonny 2024-02-29 23:50:12 +01:00
parent 2bf2276dbe
commit 3aa6bcc403
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
board_single/main/button.cpp
View File

@ -96,8 +96,8 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
// ## switch to ADJUST_CHAIR mode ## // ## switch to ADJUST_CHAIR mode ##
if (lastPressLong) if (lastPressLong)
{ {
ESP_LOGW(TAG, "cmd %d: toggle ADJUST_CHAIR", count); ESP_LOGW(TAG, "cmd %d: switch to ADJUST_CHAIR", count);
control->toggleMode(controlMode_t::ADJUST_CHAIR); control->changeMode(controlMode_t::ADJUST_CHAIR);
} }
// ## toggle IDLE ## // ## toggle IDLE ##
else { else {
@ -114,14 +114,14 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
case 4: case 4:
// ## switch to HTTP mode ## // ## switch to HTTP mode ##
ESP_LOGW(TAG, "cmd %d: toggle between HTTP and JOYSTICK", count); ESP_LOGW(TAG, "cmd %d: switch to HTTP", count);
control->toggleModes(controlMode_t::HTTP, controlMode_t::JOYSTICK); //toggle between HTTP and JOYSTICK mode control->changeMode(controlMode_t::HTTP); //switch to HTTP mode
break; break;
case 6: case 6:
// ## switch to MASSAGE mode ## // ## switch to MASSAGE mode ##
ESP_LOGW(TAG, "cmd %d: toggle between MASSAGE and JOYSTICK", count); ESP_LOGW(TAG, "switch to MASSAGE");
control->toggleModes(controlMode_t::MASSAGE, controlMode_t::JOYSTICK); //toggle between MASSAGE and JOYSTICK mode control->changeMode(controlMode_t::MASSAGE); //switch to MASSAGE mode
break; break;
case 8: case 8:
@ -129,7 +129,7 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
//toggle deceleration fading between on and off //toggle deceleration fading between on and off
//decelEnabled = motorLeft->toggleFade(fadeType_t::DECEL); //decelEnabled = motorLeft->toggleFade(fadeType_t::DECEL);
//motorRight->toggleFade(fadeType_t::DECEL); //motorRight->toggleFade(fadeType_t::DECEL);
decelEnabled = motorLeft->toggleFade(fadeType_t::ACCEL); decelEnabled = motorLeft->toggleFade(fadeType_t::ACCEL); //TODO remove/simplify this using less functions
motorRight->toggleFade(fadeType_t::ACCEL); motorRight->toggleFade(fadeType_t::ACCEL);
ESP_LOGW(TAG, "cmd %d: toggle deceleration fading to: %d", count, (int)decelEnabled); ESP_LOGW(TAG, "cmd %d: toggle deceleration fading to: %d", count, (int)decelEnabled);
if (decelEnabled){ if (decelEnabled){