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

Add Omega as unit for Ohm in LCD menu

This commit is contained in:
Mario Hüttel 2020-06-16 20:05:32 +02:00
parent a7c91cee0e
commit 49927a25cf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stm-firmware/include/reflow-controller/ui/lcd.h
View File

@ -39,6 +39,8 @@
#define LCD_SHIMATTA_STRING "\xBC\xCF\xAF\xC0" #define LCD_SHIMATTA_STRING "\xBC\xCF\xAF\xC0"
#define LCD_DEGREE_SYMBOL_STRING "\xDF" #define LCD_DEGREE_SYMBOL_STRING "\xDF"
#define LCD_DEGREE_SYMBOL_CHAR '\xDF' #define LCD_DEGREE_SYMBOL_CHAR '\xDF'
#define LCD_OHM_SYMBOL_CHAR '\xF4'
#define LCD_OHM_SYMBOL_STRING "\xF4"
enum lcd_fsm_ret {LCD_FSM_NOP, LCD_FSM_CALL_AGAIN, LCD_FSM_WAIT_CALL}; enum lcd_fsm_ret {LCD_FSM_NOP, LCD_FSM_CALL_AGAIN, LCD_FSM_WAIT_CALL};

2
stm-firmware/reflow-menu.c
View File

@ -71,7 +71,7 @@ static void reflow_menu_monitor(struct lcd_menu *menu, enum menu_entry_func_entr
if (systick_ticks_have_passed(my_timestamp, 250)) { if (systick_ticks_have_passed(my_timestamp, 250)) {
my_timestamp = systick_get_global_tick(); my_timestamp = systick_get_global_tick();
adc_pt1000_get_current_resistance(&tmp); adc_pt1000_get_current_resistance(&tmp);
snprintf(line, sizeof(line), "Res: %.1f", tmp); snprintf(line, sizeof(line), "Res: %.1f " LCD_OHM_SYMBOL_STRING, tmp);
menu->update_display(0, line); menu->update_display(0, line);
res = temp_converter_convert_resistance_to_temp(tmp, &tmp); res = temp_converter_convert_resistance_to_temp(tmp, &tmp);