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

make display faster

Browse Source
This commit is contained in:
Mario Hüttel 2020-05-09 19:56:47 +02:00
parent 2187c1a712
commit a25d3bc8c9
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
stm-firmware/main.c
View File

@ -152,6 +152,7 @@ int main()
static struct pid_controller pid; static struct pid_controller pid;
uint64_t pid_timestamp = 0ULL; uint64_t pid_timestamp = 0ULL;
uint64_t display_timestamp = 0ULL; uint64_t display_timestamp = 0ULL;
enum lcd_fsm_ret lcd_ret;
setup_nvic_priorities(); setup_nvic_priorities();
systick_setup(); systick_setup();
@ -194,13 +195,15 @@ int main()
pt1000_value_status = adc_pt1000_get_current_resistance(&pt1000_value); pt1000_value_status = adc_pt1000_get_current_resistance(&pt1000_value);
//snprintf(&disp[2][0], 21, "Foobar");
if (pt1000_value_status >= 0) { if (pt1000_value_status >= 0) {
(void)temp_converter_convert_resistance_to_temp(pt1000_value, (float *)&current_temperature); (void)temp_converter_convert_resistance_to_temp(pt1000_value, (float *)&current_temperature);
if (systick_ticks_have_passed(pid_timestamp, 250)) { if (systick_ticks_have_passed(pid_timestamp, 250)) {
pid_out = pid_sample(&pid, 100.0 - current_temperature); pid_out = pid_sample(&pid, 100.0 - current_temperature);
pid_timestamp = systick_get_global_tick(); pid_timestamp = systick_get_global_tick();
snprintf(&disp[2][0], 21, "Temp: %.1f C", current_temperature); //snprintf(&disp[2][0], 21, "Temp: %.1f C", current_temperature);
led_set(1, !led_get(1)); led_set(1, !led_get(1));
} }
} }
@ -221,11 +224,16 @@ int main()
strcpy(&disp[1][0], "Line 2"); strcpy(&disp[1][0], "Line 2");
strcpy(&disp[3][0], "Shimatta Reflow"); strcpy(&disp[3][0], "Shimatta Reflow");
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);
} }
__WFI();
if (lcd_ret == LCD_FSM_CALL_AGAIN) {
/* Nothing */
} else {
__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: