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

Compare commits

base: mhu:b18186423fb1359bcb5afda6eec5202ab2038287
Branches Tags
mhu:dev
mhu:temp-profile-checker
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test
..
compare: mhu:5e00441d99b06519836562eb1358b3b4b34af275
Branches Tags
mhu:dev
mhu:temp-profile-checker
mhu:master
mhu:jenkins
mhu:error-mem-viewer
mhu:v0.5
mhu:v0.4
mhu:v0.3
mhu:v0.2-test
mhu:v0.1-hardware-test

No commits in common. "b18186423fb1359bcb5afda6eec5202ab2038287" and "5e00441d99b06519836562eb1358b3b4b34af275" have entirely different histories.
b18186423f ... 5e00441d99

2 changed files with 2 additions and 4 deletions
Show Stats Expand all files Collapse all files

1
stm-firmware/sd.c
View File

@ -22,7 +22,6 @@
#include "fatfs/ff.h" #include "fatfs/ff.h"
#include "fatfs/shimatta_sdio_driver/shimatta_sdio.h" #include "fatfs/shimatta_sdio_driver/shimatta_sdio.h"
#include <stdint.h> #include <stdint.h>
#include <string.h>
#include <helper-macros/helper-macros.h> #include <helper-macros/helper-macros.h>
#include <reflow-controller/digio.h> #include <reflow-controller/digio.h>

3
stm-firmware/ui/gui.c
View File

@ -22,7 +22,6 @@
#include <reflow-controller/ui/gui-config.h> #include <reflow-controller/ui/gui-config.h>
#include <reflow-controller/ui/menu.h> #include <reflow-controller/ui/menu.h>
#include <reflow-controller/ui/lcd.h> #include <reflow-controller/ui/lcd.h>
#include <reflow-controller/sd.h>
#include <reflow-controller/ui/rotary-encoder.h> #include <reflow-controller/ui/rotary-encoder.h>
#include <reflow-controller/systick.h> #include <reflow-controller/systick.h>
#include <reflow-controller/adc-meas.h> #include <reflow-controller/adc-meas.h>
@ -790,7 +789,7 @@ static void gui_menu_root_entry(struct lcd_menu *menu, enum menu_entry_func_entr
if (entry_type != MENU_ENTRY_CONTINUE) { if (entry_type != MENU_ENTRY_CONTINUE) {
menu_changed = true; menu_changed = true;
menu_display_clear(menu); menu_display_clear(menu);
update_display_buffer(0, sd_card_is_mounted() ? "Main Menu [SD]" : "Main Menu [--]"); update_display_buffer(0, "Main Menu");
menu_ack_rotary_delta(menu); menu_ack_rotary_delta(menu);
if (entry_type == MENU_ENTRY_FIRST_ENTER) { if (entry_type == MENU_ENTRY_FIRST_ENTER) {
list.entry_names = root_entry_names; list.entry_names = root_entry_names;