4f8c421168
Armchair functions as before (all tasks enabled).
Note: probably wrong encoder pin set in encoder.hpp
Old button menu works as usual (opimized code).
You can switch to new MENU state with 1x long press
and exit the menu with 1x long press
button.cpp: - use encoder queue instead of evaluated switch
- simplify code, rework actions
control.cpp: Add MENU state/mode
-> control task: turns motors off and idles
-> button task idles (button menu disabled)
-> display task switches state to handle menu
control.cpp: Optimize structure:
Add methods to freeze stick and toggle stick mapping
display.cpp: show status screen or handle menu depending on mode, simpilfy task
main.cpp: re-enable button task, disable buzzer logging
menu.cpp: Change events, Add menu exit condition
314 lines
10 KiB
C++
314 lines
10 KiB
C++
extern "C"{
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "freertos/FreeRTOS.h"
|
|
#include "freertos/task.h"
|
|
#include "freertos/queue.h"
|
|
#include "esp_log.h"
|
|
|
|
#include "ssd1306.h"
|
|
}
|
|
|
|
#include "menu.hpp"
|
|
#include "encoder.hpp"
|
|
|
|
|
|
//--- variables ---
|
|
static const char *TAG = "menu";
|
|
static menuState_t menuState = MAIN_MENU;
|
|
static int value = 0;
|
|
|
|
|
|
|
|
//================================
|
|
//===== CONFIGURE MENU ITEMS =====
|
|
//================================
|
|
// note: when line4 * and line5 * are empty the value is printed large
|
|
|
|
void maxDuty_action(int value)
|
|
{
|
|
//TODO actually store the value
|
|
ESP_LOGW(TAG, "set max duty to %d", value);
|
|
}
|
|
|
|
int maxDuty_currentValue()
|
|
{
|
|
//TODO get real current value
|
|
return 84;
|
|
}
|
|
|
|
menuItem_t item_first = {
|
|
maxDuty_action, // function action
|
|
maxDuty_currentValue,
|
|
-255, // valueMin
|
|
255, // valueMAx
|
|
2, // valueIncrement
|
|
"first item", // title
|
|
"line 1 - above", // line1 (above value)
|
|
"line 2 - above", // line2 (above value)
|
|
"line 4 - below", // line4 * (below value)
|
|
"line 5 - below", // line5 *
|
|
"line 6 - below", // line6
|
|
"line 7 - last", // line7
|
|
};
|
|
|
|
menuItem_t item_maxDuty = {
|
|
maxDuty_action, // function action
|
|
maxDuty_currentValue,
|
|
1, // valueMin
|
|
99, // valueMAx
|
|
1, // valueIncrement
|
|
"set max duty", // title
|
|
"", // line1 (above value)
|
|
" set max-duty: ", // line2 (above value)
|
|
"", // line4 * (below value)
|
|
"", // line5 *
|
|
" 1-99 ", // line6
|
|
" percent ", // line7
|
|
};
|
|
|
|
menuItem_t item_next = {
|
|
maxDuty_action, // function action
|
|
maxDuty_currentValue,
|
|
-500, // valueMin
|
|
4500, // valueMAx
|
|
50, // valueIncrement
|
|
"set large number", // title
|
|
"line 1 - above", // line1 (above value)
|
|
"line 2 - above", // line2 (above value)
|
|
"", // line4 * (below value)
|
|
"", // line5 *
|
|
"line 6 - below", // line6
|
|
"line 7 - last", // line7
|
|
|
|
};
|
|
|
|
menuItem_t item_last = {
|
|
maxDuty_action, // function action
|
|
maxDuty_currentValue,
|
|
0, // valueMin
|
|
100, // valueMAx
|
|
5, // valueIncrement
|
|
"last item", // title
|
|
"", // line1 (above value)
|
|
"", // line2 (above value)
|
|
"", // line4 * (below value)
|
|
"", // line5 *
|
|
"", // line6
|
|
"", // line7
|
|
};
|
|
|
|
//store all configured menu items in one array
|
|
menuItem_t menuItems[] = {item_first, item_maxDuty, item_next, item_last};
|
|
int itemCount = 4;
|
|
|
|
|
|
|
|
|
|
//--------------------------
|
|
//------ showItemList ------
|
|
//--------------------------
|
|
#define SELECTED_ITEM_LINE 4
|
|
#define FIRST_ITEM_LINE 1
|
|
#define LAST_ITEM_LINE 7
|
|
void showItemList(SSD1306_t *display, int selectedItem)
|
|
{
|
|
//--- variables ---
|
|
char buf[20];
|
|
int len;
|
|
|
|
//-- show title line --
|
|
len = snprintf(buf, 19, " --- menu --- ");
|
|
ssd1306_display_text(display, 0, buf, len, true);
|
|
|
|
//-- show item list --
|
|
for (int line = FIRST_ITEM_LINE; line <= LAST_ITEM_LINE; line++)
|
|
{ // loop through all lines
|
|
int printItemIndex = selectedItem - SELECTED_ITEM_LINE + line;
|
|
// TODO: when reaching end of items, instead of showing "empty" change position of selected item to still use the entire screen
|
|
if (printItemIndex < 0 || printItemIndex >= itemCount) // out of range of available items
|
|
{
|
|
len = snprintf(buf, 20, " -- empty -- ");
|
|
}
|
|
else
|
|
{
|
|
if (printItemIndex == selectedItem)
|
|
{
|
|
// add '> <' when selected item
|
|
len = snprintf(buf, 20, "> %-13s<", menuItems[printItemIndex].title);
|
|
}
|
|
else
|
|
{
|
|
len = snprintf(buf, 20, "%-16s", menuItems[printItemIndex].title);
|
|
}
|
|
}
|
|
// update display line
|
|
ssd1306_display_text(display, line, buf, len, line == SELECTED_ITEM_LINE);
|
|
// logging
|
|
ESP_LOGD(TAG, "showItemList: loop - line=%d, item=%d, (selected=%d '%s')", line, printItemIndex, selectedItem, menuItems[selectedItem].title);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
//---------------------------
|
|
//----- showValueSelect -----
|
|
//---------------------------
|
|
// TODO show previous value in one line?
|
|
// TODO update changed line only (value)
|
|
void showValueSelect(SSD1306_t *display, int selectedItem)
|
|
{
|
|
//--- variables ---
|
|
char buf[20];
|
|
int len;
|
|
|
|
//-- show title line --
|
|
len = snprintf(buf, 19, " -- set value -- ");
|
|
ssd1306_display_text(display, 0, buf, len, true);
|
|
|
|
//-- show text above value --
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line1);
|
|
ssd1306_display_text(display, 1, buf, len, false);
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line2);
|
|
ssd1306_display_text(display, 2, buf, len, false);
|
|
|
|
//-- show value and other configured lines --
|
|
// print value large, if 2 description lines are empty
|
|
if (strlen(menuItems[selectedItem].line4) == 0 && strlen(menuItems[selectedItem].line5) == 0 )
|
|
{
|
|
//print large value + line5 and line6
|
|
len = snprintf(buf, 20, " %d ", value);
|
|
ssd1306_display_text_x3(display, 3, buf, len, false);
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line6);
|
|
ssd1306_display_text(display, 6, buf, len, false);
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line7);
|
|
ssd1306_display_text(display, 7, buf, len, false);
|
|
}
|
|
else
|
|
{
|
|
// print value centered
|
|
int numDigits = snprintf(NULL, 0, "%d", value);
|
|
int numSpaces = (16 - numDigits) / 2;
|
|
snprintf(buf, sizeof(buf), "%*s%d%*s", numSpaces, "", value, 16 - numSpaces - numDigits, "");
|
|
ESP_LOGD(TAG, "showValueSelect: center number - value=%d, needed-spaces=%d, resulted-string='%s'", value, numSpaces, buf);
|
|
ssd1306_display_text(display, 3, buf, len, false);
|
|
// print description lines 4 to 7
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line4);
|
|
ssd1306_display_text(display, 4, buf, len, false);
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line5);
|
|
ssd1306_display_text(display, 5, buf, len, false);
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line6);
|
|
ssd1306_display_text(display, 6, buf, len, false);
|
|
len = snprintf(buf, 20, "%-16s", menuItems[selectedItem].line7);
|
|
ssd1306_display_text(display, 7, buf, len, false);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
//========================
|
|
//====== handleMenu ======
|
|
//========================
|
|
//controls menu with encoder input and displays the text on oled display
|
|
//function is repeatedly called when in menu state
|
|
void handleMenu(SSD1306_t *display)
|
|
{
|
|
static int selectedItem = 0;
|
|
rotary_encoder_event_t event; // store event data
|
|
|
|
switch (menuState)
|
|
{
|
|
//-------------------------
|
|
//---- State MAIN MENU ----
|
|
//-------------------------
|
|
case MAIN_MENU:
|
|
// update display
|
|
showItemList(display, selectedItem); // shows list of items with currently selected one on display
|
|
// wait for encoder event
|
|
if (xQueueReceive(encoderQueue, &event, portMAX_DELAY))
|
|
{
|
|
switch (event.type)
|
|
{
|
|
case RE_ET_CHANGED:
|
|
//--- scroll in list ---
|
|
if (event.diff < 0)
|
|
{
|
|
if (selectedItem != itemCount - 1)
|
|
selectedItem++;
|
|
ESP_LOGD(TAG, "showing next item: %d '%s'", selectedItem, menuItems[selectedItem].title);
|
|
//note: display will update at start of next run
|
|
}
|
|
else
|
|
{
|
|
if (selectedItem != 0)
|
|
selectedItem--;
|
|
ESP_LOGD(TAG, "showing previous item: %d '%s'", selectedItem, menuItems[selectedItem].title);
|
|
//note: display will update at start of next run
|
|
}
|
|
break;
|
|
|
|
case RE_ET_BTN_CLICKED:
|
|
//--- switch to edit value page ---
|
|
ESP_LOGI(TAG, "Button pressed - switching to state SET_VALUE");
|
|
// change state (menu to set value)
|
|
menuState = SET_VALUE;
|
|
// get currently configured value
|
|
value = menuItems[selectedItem].currentValue();
|
|
// clear display
|
|
ssd1306_clear_screen(display, false);
|
|
break;
|
|
|
|
//exit menu mode
|
|
case RE_ET_BTN_LONG_PRESSED:
|
|
control.changeMode(controlMode_t::IDLE);
|
|
ssd1306_clear_screen(display, false);
|
|
break;
|
|
|
|
case RE_ET_BTN_RELEASED:
|
|
case RE_ET_BTN_PRESSED:
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
|
|
//-------------------------
|
|
//---- State SET VALUE ----
|
|
//-------------------------
|
|
case SET_VALUE:
|
|
// wait for encoder event
|
|
showValueSelect(display, selectedItem);
|
|
|
|
if (xQueueReceive(encoderQueue, &event, portMAX_DELAY))
|
|
{
|
|
switch (event.type)
|
|
{
|
|
case RE_ET_CHANGED:
|
|
//-- change value --
|
|
// increment value
|
|
if (event.diff < 0)
|
|
value += menuItems[selectedItem].valueIncrement;
|
|
else
|
|
value -= menuItems[selectedItem].valueIncrement;
|
|
// limit to min/max range
|
|
if (value > menuItems[selectedItem].valueMax)
|
|
value = menuItems[selectedItem].valueMax;
|
|
if (value < menuItems[selectedItem].valueMin)
|
|
value = menuItems[selectedItem].valueMin;
|
|
break;
|
|
case RE_ET_BTN_CLICKED:
|
|
//-- apply value --
|
|
ESP_LOGI(TAG, "Button pressed - running action function with value=%d for item '%s'", value, menuItems[selectedItem].title);
|
|
menuItems[selectedItem].action(value);
|
|
menuState = MAIN_MENU;
|
|
break;
|
|
case RE_ET_BTN_PRESSED:
|
|
case RE_ET_BTN_RELEASED:
|
|
case RE_ET_BTN_LONG_PRESSED:
|
|
break;
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
} |