mhu/reflow-oven-control-sw
2
0
Fork 0
Code Issues 4 Pull Requests Releases 4 Wiki Activity

Issue #6: Improve LCD menu and implement function to see safety flags

Browse Source
This commit is contained in:
Mario Hüttel
2020-11-16 20:01:15 +01:00
parent d51c73d694
commit 8603f84142
3 changed files with 100 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
stm-firmware/ui/menu.c
View File

@@ -27,6 +27,7 @@ void menu_handle(struct lcd_menu *menu, int16_t rotary_encoder_delta, enum butto
{
menu_func_t tmp;
if (!menu)
return;
@@ -38,6 +39,9 @@ void menu_handle(struct lcd_menu *menu, int16_t rotary_encoder_delta, enum butto
tmp = menu->active_entry;
if (menu->active_entry_type == MENU_ENTRY_FIRST_ENTER && push_button != BUTTON_IDLE) {
menu->inputs.button_ready = false;
}
if (menu->active_entry_type == MENU_ENTRY_FIRST_ENTER) {
menu->active_entry(menu, menu->active_entry_type, menu->init_parent);
@@ -48,6 +52,9 @@ void menu_handle(struct lcd_menu *menu, int16_t rotary_encoder_delta, enum butto
if (menu->active_entry_type != MENU_ENTRY_CONTINUE && tmp == menu->active_entry) {
menu->active_entry_type = MENU_ENTRY_CONTINUE;
}
if (push_button == BUTTON_IDLE)
menu->inputs.button_ready = true;
}
void menu_init(struct lcd_menu *menu, menu_func_t root_node, void (*display_update)(uint8_t row, const char *data))
@@ -59,6 +66,7 @@ void menu_init(struct lcd_menu *menu, menu_func_t root_node, void (*display_upda
menu->active_entry = root_node;
menu->init_parent = NULL;
menu->inputs.push_button = BUTTON_IDLE;
menu->inputs.button_ready = false;
menu->inputs.rotary_encoder_delta = 0;
menu->active_entry_type = MENU_ENTRY_FIRST_ENTER;
menu->update_display = display_update;
@@ -243,6 +251,16 @@ enum button_state menu_get_button_state(const struct lcd_menu *menu)
return ret;
}
bool menu_get_button_ready_state(const struct lcd_menu *menu)
{
bool ret = false;
if (menu)
ret = menu->inputs.button_ready;
return ret;
}
void menu_display_clear(struct lcd_menu *menu)
{
uint8_t i;