Mercurial > public > ostc4

comparison BootLoader/Src/base_bootlader.c @ 986:5e7ad81e9ac2 BootloaderOstc5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed dependencies to OSTC HW version
author Ideenmodellierer
date Sun, 30 Mar 2025 21:33:18 +0200
parents d29e752660c5
children 45a2bd04b156
comparison
equal deleted inserted replaced
985:aeafa631147d 986:5e7ad81e9ac2
221 #include "stm32f4xx_hal.h" 221 #include "stm32f4xx_hal.h"
222 #include "stm32f4xx_hal_rcc.h" 222 #include "stm32f4xx_hal_rcc.h"
223 #include "stm32f4xx_hal_flash_ex.h" 223 #include "stm32f4xx_hal_flash_ex.h"
224 #include "stm32f4xx_hal_wwdg.h" 224 #include "stm32f4xx_hal_wwdg.h"
225 225
226 #ifdef BOOTLOADER_STANDALONE
227 #include "Fonts/Font_T144_plus.h" 226 #include "Fonts/Font_T144_plus.h"
228 #include "Fonts/Font_T84.h" 227 #include "Fonts/Font_T84.h"
229 #include "Fonts/Font_T105.h" 228 #include "Fonts/Font_T105.h"
230 #include "Fonts/Font_T54.h" 229 #include "Fonts/Font_T54.h"
231 #include "Fonts/Font_T48_plus.h" 230 #include "Fonts/Font_T48_plus.h"
232 #include "Fonts/Font_T24.h" 231 #include "Fonts/Font_T24.h"
233 #include "Fonts/Font_T42.h" 232 #include "Fonts/Font_T42.h"
234 #include "Fonts/image_battery.h" 233 #include "Fonts/image_battery.h"
235 #include "Fonts/image_heinrichs_weikamp.h" 234 #include "Fonts/image_heinrichs_weikamp.h"
236 #include "Fonts/image_ostc.h" 235 #include "Fonts/image_ostc.h"
237 #endif
238 236
239 // From Discovery/Inc (shall be shared...) 237 // From Discovery/Inc (shall be shared...)
240 #include "data_exchange_main.h" 238 #include "data_exchange_main.h"
241 #include "display.h" 239 #include "display.h"
242 #include "gfx_engine.h" 240 #include "gfx_engine.h"
714 tInfo_write(""); 712 tInfo_write("");
715 tInfo_write(textVersion); 713 tInfo_write(textVersion);
716 if(tComm_Set_Bluetooth_Name(0) == 0xFF) 714 if(tComm_Set_Bluetooth_Name(0) == 0xFF)
717 { 715 {
718 tInfo_write("init bluetooth"); 716 tInfo_write("init bluetooth");
719 if(isNewDisplay()) 717 tComm_StartBlueModBaseInit();
720 {
721 tComm_StartBlueModBaseInit();
722 }
723 else
724 {
725 tComm_StartBlueModConfig();
726 }
727 } 718 }
728 else 719 else
729 { 720 {
730 tInfo_write("bluetooth set"); 721 tInfo_write("bluetooth set");
731 tComm_StartBlueModConfig(); 722 tComm_StartBlueModConfig();