stm-firmware/include/reflow-controller/ui/menu.h

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

stm-firmware/shell.c

@@ -44,7 +44,7 @@
 extern struct stm_uart shell_uart;
 static shellmatta_instance_t shell;
 static char shell_buffer[512];
-static char history_buffer[600];
+static char history_buffer[1024];
 
 static shellmatta_retCode_t shell_cmd_ver(const shellmatta_handle_t   handle,
 					  const char                  *arguments,
@@ -59,8 +59,8 @@ static shellmatta_retCode_t shell_cmd_ver(const shellmatta_handle_t   handle,
 	unique_id_get(&high_id, &mid_id, &low_id);
 
 	shellmatta_printf(handle, "Reflow Oven Controller Firmware " xstr(GIT_VER) "\r\n"
-					"Compiled: " __DATE__ " at " __TIME__ "\r\n"
-					"Serial: %08X-%08X-%08X", high_id, mid_id, low_id);
+										   "Compiled: " __DATE__ " at " __TIME__ "\r\n"
+															 "Serial: %08X-%08X-%08X", high_id, mid_id, low_id);
 
 	return SHELLMATTA_OK;
 }

stm-firmware/ui/menu.c

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