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

Fix possible error in menu implementation

Browse Source
This commit is contained in:
Mario Hüttel 2020-06-04 21:47:31 +02:00
parent 92c0c5cd8c
commit fc2372f754
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stm-firmware/include/reflow-controller/ui/menu.h
View File

@ -24,7 +24,6 @@
#include <stdint.h> #include <stdint.h>
#include <reflow-controller/button.h> #include <reflow-controller/button.h>
#include <stdbool.h> #include <stdbool.h>
#include <reflow-controller/ui/lcd.h>
struct lcd_menu; struct lcd_menu;

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

@ -31,13 +31,15 @@ void menu_handle(struct lcd_menu *menu, uint16_t rotary_encoder_delta, enum butt
menu->inputs.push_button = push_button; menu->inputs.push_button = push_button;
menu->inputs.rotary_encoder_delta = rotary_encoder_delta; menu->inputs.rotary_encoder_delta = rotary_encoder_delta;
if (menu->active_entry == NULL)
menu->active_entry = menu->root_entry;
tmp = menu->active_entry; tmp = menu->active_entry;
if (menu->active_entry_type == MENU_ENTRY_FIRST_ENTER) { if (menu->active_entry_type == MENU_ENTRY_FIRST_ENTER) {
if (menu->active_entry)
menu->active_entry(menu, menu->active_entry_type, menu->init_parent); menu->active_entry(menu, menu->active_entry_type, menu->init_parent);
} else { } else {
if (menu->active_entry)
menu->active_entry(menu, menu->active_entry_type, NULL); menu->active_entry(menu, menu->active_entry_type, NULL);
} }