# HG changeset patch # User heinrichsweikamp # Date 1556029292 0 # Node ID f4c16ea0354a562c88e90d5d6011216d06992a6a # Parent 1b9be6040d8279117c7fc99d528790611638f10b# Parent cc2406b835ffc3b9ec186ca7614c2cd6a2dd7bc3 Merged in janlmulder/ostc4/bm-3 (pull request #19) Buelhmann cleanup , 2 small functional changes, and 1 bugfix diff -r cc2406b835ff -r f4c16ea0354a BootLoader/Src/base_bootlader.c --- a/BootLoader/Src/base_bootlader.c Tue Apr 23 13:05:20 2019 +0200 +++ b/BootLoader/Src/base_bootlader.c Tue Apr 23 14:21:32 2019 +0000 @@ -555,7 +555,7 @@ } if(status == HAL_OK) { - tInfo_write("programm flash"); + tInfo_write("program flash"); status = firmware_programFlashMemory(pBuffer,firmware_load_result); if(status != HAL_OK) { @@ -628,7 +628,7 @@ } if(status == HAL_OK) { - tInfo_write("programm flash"); + tInfo_write("program flash"); status = firmware2_variable_upperpart_programFlashMemory(firmware_load_result,pOffset,pBuffer,firmware_load_result,0); if(status != HAL_OK) { diff -r cc2406b835ff -r f4c16ea0354a Current build/OSTC4update_190410.bin Binary file Current build/OSTC4update_190410.bin has changed diff -r cc2406b835ff -r f4c16ea0354a Current build/OSTC4update_190413.bin Binary file Current build/OSTC4update_190413.bin has changed