diff --git a/display.c b/display.c --- a/display.c +++ b/display.c @@ -4,6 +4,7 @@ #include "display.h" #include "config.h" #include "states.h" +#include "bootlib.h" #include "gpio.h" uint8_t goto_mode = 2; @@ -34,7 +35,6 @@ uint8_t final_setpoint = 0; //////////////////////////////////////////////////////////////////////////////////////////////// - uint8_t trigger_drawsetpoint = 1; int16_t last_temp = 21245; @@ -103,7 +103,10 @@ void display_process(therm_settings_t* s ssd1306_clearscreen(); ssd1306_DrawString("Entering Bootloader", 1, 0); ssd1306_DrawString("(hopefully)", 2, 0); - //HAL_Delay(1000); + HAL_Delay(1000); + bootloader_enter(); + +/* HAL_RCC_DeInit(); SysTick->CTRL = 0; SysTick->LOAD = 0; @@ -112,7 +115,7 @@ void display_process(therm_settings_t* s __set_MSP(0x200010000); *((unsigned long *)0x200017F0) = 0xDEADBEEF; // 6KB STM32F042 NVIC_SystemReset(); - +*/ status->state = STATE_IDLE; } break;