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

Fix menu immediately exiting, Optimize mode-select

Browse Source 
Tested newly implemented menu on armchair and made several Fixes:

- reduce long delay when changing to menu modes (control handle)
- add unused line to mode select menu, also drop "click to confirm"
- fix and optimize getNextSelectableModeIndex function to get n next (recursive, offset)

- button: clear encoder queue before changing to menu mode
- fix menu immediately exiting on x5 press (missing break)
This commit is contained in:
jonny_l480 2024-05-30 09:05:29 +02:00
parent c58c6b9b35
commit b1c010bf15
3 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
board_single/main/button.cpp
View File

@ -75,13 +75,14 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
// ## switch to MENU_SETTINGS state ## // ## switch to MENU_SETTINGS state ##
if (lastPressLong) if (lastPressLong)
{ {
control->changeMode(controlMode_t::MENU_MODE_SELECT);
ESP_LOGW(TAG, "1x long press -> clear encoder queue and change to mode 'menu mode select'"); ESP_LOGW(TAG, "1x long press -> clear encoder queue and change to mode 'menu mode select'");
buzzer->beep(5, 50, 30);
// clear encoder event queue (prevent menu from exiting immediately due to long press event just happend) // clear encoder event queue (prevent menu from exiting immediately due to long press event just happend)
vTaskDelay(200 / portTICK_PERIOD_MS);
//TODO move encoder queue clear to changeMode() method?
rotary_encoder_event_t ev; rotary_encoder_event_t ev;
while (xQueueReceive(encoderQueue, &ev, 0) == pdPASS); while (xQueueReceive(encoderQueue, &ev, 0) == pdPASS);
buzzer->beep(5, 50, 30); control->changeMode(controlMode_t::MENU_MODE_SELECT);
vTaskDelay(200 / portTICK_PERIOD_MS);
} }
// ## toggle joystick freeze ## // ## toggle joystick freeze ##
else if (control->getCurrentMode() == controlMode_t::MASSAGE) else if (control->getCurrentMode() == controlMode_t::MASSAGE)
@ -125,13 +126,14 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
case 5: case 5:
// ## switch to MENU_SETTINGS state ## // ## switch to MENU_SETTINGS state ##
control->changeMode(controlMode_t::MENU_SETTINGS);
ESP_LOGW(TAG, "5x press -> clear encoder queue and change to mode 'menu settings'"); ESP_LOGW(TAG, "5x press -> clear encoder queue and change to mode 'menu settings'");
// clear encoder event queue (prevent menu from exiting immediately due to long press event just happend)
rotary_encoder_event_t ev;
while (xQueueReceive(encoderQueue, &ev, 0) == pdPASS);
buzzer->beep(20, 20, 10); buzzer->beep(20, 20, 10);
vTaskDelay(200 / portTICK_PERIOD_MS); vTaskDelay(200 / portTICK_PERIOD_MS);
// clear encoder event queue (prevent menu from using previous events)
rotary_encoder_event_t ev;
while (xQueueReceive(encoderQueue, &ev, 0) == pdPASS);
control->changeMode(controlMode_t::MENU_SETTINGS);
break;
case 6: case 6:
// ## switch to MASSAGE mode ## // ## switch to MASSAGE mode ##

4
board_single/main/control.cpp
View File

@ -296,7 +296,7 @@ void controlledArmchair::handle()
case controlMode_t::MENU_SETTINGS: case controlMode_t::MENU_SETTINGS:
case controlMode_t::MENU_MODE_SELECT: case controlMode_t::MENU_MODE_SELECT:
// nothing to do here, display task handles the menu // nothing to do here, display task handles the menu
vTaskDelay(1000 / portTICK_PERIOD_MS); vTaskDelay(500 / portTICK_PERIOD_MS);
break; break;
// TODO: add other modes here // TODO: add other modes here
@ -535,7 +535,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
case controlMode_t::MASSAGE: case controlMode_t::MASSAGE:
ESP_LOGW(TAG, "switching to MASSAGE mode -> reducing fading"); ESP_LOGW(TAG, "switching to MASSAGE mode -> reducing fading");
uint32_t shake_msFadeAccel = 500; // TODO: move this to config uint32_t shake_msFadeAccel = 200; // TODO: move this to config
// disable downfading (max. deceleration) // disable downfading (max. deceleration)
motorLeft->setFade(fadeType_t::DECEL, false); motorLeft->setFade(fadeType_t::DECEL, false);

49
board_single/main/menu.cpp
View File

@ -663,8 +663,8 @@ void showItemList(SSD1306_t *display, int selectedItem)
//--- getNextSelectableModeIndex --- //--- getNextSelectableModeIndex ---
//---------------------------------- //----------------------------------
// local function that returns index of the next (or previous) selectable control-mode index // local function that returns index of the next (or previous) selectable control-mode index
// used for mode select menu // used for mode select menu. offset defines the step size (e.g. get 3rd next menu index)
int getNextSelectableModeIndex(int modeIndex, bool reverseDirection = false) int getNextSelectableModeIndex(int modeIndex, bool reverseDirection = false, uint8_t offset = 1)
{ {
// those modes are selectable via mode-select menu - NOTE: Add other new modes here // those modes are selectable via mode-select menu - NOTE: Add other new modes here
static const controlMode_t selectableModes[] = {controlMode_t::IDLE, static const controlMode_t selectableModes[] = {controlMode_t::IDLE,
@ -675,11 +675,10 @@ int getNextSelectableModeIndex(int modeIndex, bool reverseDirection = false)
controlMode_t::MENU_SETTINGS}; controlMode_t::MENU_SETTINGS};
static const int selectableModesCount = sizeof(selectableModes) / sizeof(controlMode_t); static const int selectableModesCount = sizeof(selectableModes) / sizeof(controlMode_t);
//// verify range // when step size is greater than 1 define new modeIndex by recursively calling the function first
// if (modeIndex < 0 || modeIndex > controlModeMaxCount) { if (offset > 1){
// ESP_LOGE(TAG, "getSelectableModeItem - index '%d' is out of range! There are max %d modes.", modeIndex, controlModeMaxCount); modeIndex = getNextSelectableModeIndex(modeIndex, reverseDirection, offset - 1);
// return 0; }
// }
// search next mode that is present in selectableModes // search next mode that is present in selectableModes
bool rotatedAlready = false; bool rotatedAlready = false;
@ -714,7 +713,7 @@ int getNextSelectableModeIndex(int modeIndex, bool reverseDirection = false)
// index matches one in the selectable modes -> success // index matches one in the selectable modes -> success
return modeIndex; return modeIndex;
} }
ESP_LOGD(TAG, "mode index %d is no selectable mode -> trying next", modeIndex); ESP_LOGV(TAG, "mode index %d is no selectable mode -> trying next", modeIndex);
} }
} }
@ -729,23 +728,28 @@ void showModeList(SSD1306_t *display, int selectedMode)
// TODO add blinking of a line to indicate selecting // TODO add blinking of a line to indicate selecting
// line 1 " - select mode -" // line 1 " - select mode -"
// line 2 " prev mode " // line 2 " 2nd prev mode "
// line 3 "SEL MODE LARGE 1/3" // line 3 " prev mode "
// line 4 "SEL MODE LARGE 2/3" // line 4 "SEL MODE LARGE 1/3"
// line 5 "SEL MODE LARGE 4/3" // line 5 "SEL MODE LARGE 2/3"
// line 6 " next mode " // line 6 "SEL MODE LARGE 4/3"
// line 7 "click to confirm" // line 7 " next mode "
// line 8 " 2nd next mode "
// print title (0) // print title (0)
displayTextLine(display, 0, false, true, "- select mode -"); // inverted displayTextLine(display, 0, false, true, "- select mode -"); // inverted
// print mode before (1) // print 2nd mode before (1)
displayTextLineCentered(display, 1, false, false, "%s", controlModeToStr(getNextSelectableModeIndex(selectedMode, true))); displayTextLineCentered(display, 1, false, false, "%s", controlModeToStr(getNextSelectableModeIndex(selectedMode, true, 2)));
// print selected mode large (2-4) // print mode before (2)
displayTextLineCentered(display, 2, true, false, "%s", controlModeToStr(selectedMode)); displayTextLineCentered(display, 2, false, false, "%s", controlModeToStr(getNextSelectableModeIndex(selectedMode, true)));
// print mode after (5) // print selected mode large (3-5)
displayTextLineCentered(display, 5, false, false, "%s", controlModeToStr(getNextSelectableModeIndex(selectedMode))); displayTextLineCentered(display, 3, true, false, "%s", controlModeToStr(selectedMode));
// print mode after (6)
displayTextLineCentered(display, 6, false, false, "%s", controlModeToStr(getNextSelectableModeIndex(selectedMode)));
// print mode after (7)
displayTextLineCentered(display, 7, false, false, "%s", controlModeToStr(getNextSelectableModeIndex(selectedMode, false, 2)));
// print message (6) // print message (6)
displayTextLineCentered(display, 6, false, true, "click to confirm"); //displayTextLineCentered(display, 7, false, true, "click to confirm");
} }
@ -1031,7 +1035,6 @@ void handleMenu_modeSelect(display_task_parameters_t *objects, SSD1306_t *displa
{ {
selectedMode = getNextSelectableModeIndex(selectedMode, true); selectedMode = getNextSelectableModeIndex(selectedMode, true);
objects->buzzer->beep(1, 20, 0); objects->buzzer->beep(1, 20, 0);
objects->buzzer->beep(1, 20, 0);
ESP_LOGD(TAG, "showing previous item: %d '%s'", selectedMode, controlModeToStr(selectedMode)); ESP_LOGD(TAG, "showing previous item: %d '%s'", selectedMode, controlModeToStr(selectedMode));
// note: display will update at start of next run // note: display will update at start of next run
} }
@ -1041,7 +1044,7 @@ void handleMenu_modeSelect(display_task_parameters_t *objects, SSD1306_t *displa
//--- confirm mode and exit --- //--- confirm mode and exit ---
objects->buzzer->beep(1, 50, 10); objects->buzzer->beep(1, 50, 10);
ESP_LOGI(TAG, "Button pressed - confirming selected mode '%s'", controlModeToStr(selectedMode)); ESP_LOGI(TAG, "Button pressed - confirming selected mode '%s'", controlModeToStr(selectedMode));
objects->control->changeMode((controlMode_t)selectedMode); objects->control->changeMode((controlMode_t)selectedMode); //note: changeMode may take some time since it waits for control-handle loop iteration to finish which has quite large delay in menu state
// clear display // clear display
ssd1306_clear_screen(display, false); ssd1306_clear_screen(display, false);
// reset first run // reset first run