Compare commits

..

No commits in common. "8f2418eb7c6798f32da9b62e0bb13fd28b636f11" and "8a0572d698cdbc7f764c3ae3c63a8e91ab108fc2" have entirely different histories.

2 changed files with 8 additions and 12 deletions

View File

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

View File

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