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

Merge branch 'dev' into ui

Browse Source
This commit is contained in:
Mario Hüttel 2020-05-09 20:01:56 +02:00
commit 8f2418eb7c
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stm-firmware/main.c
View File

@ -155,7 +155,6 @@ const char *oven_controller_hello_world = "Hello world :)\n";
static inline void setup_system() static inline void setup_system()
{ {
setup_nvic_priorities(); setup_nvic_priorities();
systick_setup(); systick_setup();
@ -186,6 +185,7 @@ int main()
int32_t pid_controller_output; int32_t pid_controller_output;
uint64_t display_timestamp = 0ULL; uint64_t display_timestamp = 0ULL;
char disp[4][21] = {0}; char disp[4][21] = {0};
enum lcd_fsm_ret lcd_ret = LCD_FSM_NOP;
target_temperature = 25.0f; target_temperature = 25.0f;
@ -209,7 +209,6 @@ int main()
pt1000_value_status = adc_pt1000_get_current_resistance(&pt1000_value); pt1000_value_status = adc_pt1000_get_current_resistance(&pt1000_value);
if (systick_ticks_have_passed(pid_timestamp, 250)) { if (systick_ticks_have_passed(pid_timestamp, 250)) {
pid_timestamp = systick_get_global_tick(); pid_timestamp = systick_get_global_tick();
if (pt1000_value_status >= 0 && pid_controller_active) if (pt1000_value_status >= 0 && pid_controller_active)
@ -242,12 +241,17 @@ int main()
if (uart_receive_status >= 1) if (uart_receive_status >= 1)
shell_handle_input(shell_handle, uart_input, uart_input_len); shell_handle_input(shell_handle, uart_input, uart_input_len);
if (systick_ticks_have_passed(display_timestamp, 1)) { if (systick_ticks_have_passed(display_timestamp, 1) || lcd_ret == LCD_FSM_CALL_AGAIN) {
lcd_ret = lcd_fsm_write_buffer(disp);
display_timestamp = systick_get_global_tick(); display_timestamp = systick_get_global_tick();
lcd_fsm_write_buffer(disp);
} }
if (lcd_ret == LCD_FSM_CALL_AGAIN) {
/* Nothing */
} else {
__WFI(); __WFI();
} }
}
} }

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

@ -405,18 +405,18 @@ enum lcd_fsm_ret lcd_fsm_write_buffer(const char (*display_buffer)[21])
case 5: case 5:
lcd_fsm_write_data(true, (char_cnt >= line_len) ? ' ' : shadow_display[row_cnt][char_cnt]); lcd_fsm_write_data(true, (char_cnt >= line_len) ? ' ' : shadow_display[row_cnt][char_cnt]);
lcd_fsm_enable(true); lcd_fsm_enable(true);
ret = LCD_FSM_WAIT_CALL; ret = LCD_FSM_CALL_AGAIN;
state_cnt++; state_cnt++;
break; break;
case 6: case 6:
lcd_fsm_enable(false); lcd_fsm_enable(false);
ret = LCD_FSM_WAIT_CALL; ret = LCD_FSM_CALL_AGAIN;
state_cnt++; state_cnt++;
break; break;
case 7: case 7:
lcd_fsm_write_data(false, (char_cnt >= line_len) ? ' ' : shadow_display[row_cnt][char_cnt]); lcd_fsm_write_data(false, (char_cnt >= line_len) ? ' ' : shadow_display[row_cnt][char_cnt]);
lcd_fsm_enable(true); lcd_fsm_enable(true);
ret = LCD_FSM_WAIT_CALL; ret = LCD_FSM_CALL_AGAIN;
state_cnt++; state_cnt++;
break; break;
case 8: case 8: