From 66756b9b75690202bf02db42cc773901e43f80f2 Mon Sep 17 00:00:00 2001 From: jonny_ji7 Date: Thu, 28 Jul 2022 17:54:44 +0200 Subject: [PATCH] Fix bug: massage stick freeze not resetting When switching mode from MASSAGE to other mode while joystick input frozen (button). It was still frozen when switching back to MASSAGE mode later. This is confusing and is seen as a bug -> reset locked input variable to false on mode change --- main/control.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main/control.cpp b/main/control.cpp index 061e063..7bc9faf 100644 --- a/main/control.cpp +++ b/main/control.cpp @@ -282,7 +282,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew) { break; case controlMode_t::MASSAGE: - ESP_LOGW(TAG, "switching from MASSAGE mode -> restoring fading"); + ESP_LOGW(TAG, "switching from MASSAGE mode -> restoring fading, reset frozen input"); //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); @@ -290,6 +290,8 @@ void controlledArmchair::changeMode(controlMode_t modeNew) { //set upfading to default value motorLeft->setFade(fadeType_t::ACCEL, true); motorRight->setFade(fadeType_t::ACCEL, true); + //reset frozen input state + freezeInput = false; break; }