# HG changeset patch # User heinrichsweikamp # Date 1736774609 -3600 # Node ID c19c8f17a9f33d64b3bc5e71b5ca350a410bb4ba # Parent a8c0e6d07b8e511bc46579378f013cf9f7270ad2 hard-coded hardwaredata for testing purposes diff -r a8c0e6d07b8e -r c19c8f17a9f3 BootLoader/Src/base_bootlader.c --- a/BootLoader/Src/base_bootlader.c Sat Jan 11 17:12:39 2025 +0100 +++ b/BootLoader/Src/base_bootlader.c Mon Jan 13 14:23:29 2025 +0100 @@ -269,7 +269,7 @@ .release_year = 25, .release_month = 1, - .release_day = 11, + .release_day = 13, .release_sub = 0, /* max 48 with trailing 0 */ @@ -282,24 +282,29 @@ .magic[3] = FIRMWARE_MAGIC_END }; -#if 0 -const SHardwareData HardwareData __attribute__((at(HARDWAREDATA_ADDRESS))) = { +const SHardwareData HardwareData __attribute__((section(".HARDWAREDATA_ADDRESS"))) = +{ // first 52 bytes .primarySerial = 0xFFFF, - .primaryLicence = 0xFF, - .revision8bit = 0xFF, - .production_year = 0xFF, - .production_month = 0xFF, - .production_day = 0xFF, + .primaryLicence = 0x00, + .revision8bit = 0x02, + .production_year = 0x19, + .production_month = 0x01, + .production_day = 0x10, .production_bluetooth_name_set = 0xFF, .production_info = { - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, + 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x4F,0x53,0x54,0x43, + 0x20,0x35,0x20,0x65,0x6E,0x64,0x2D,0x32,0x30,0x32,0x34, + 0x20,0x68,0x61,0x72,0x64,0x77,0x61,0x72,0x65,0x20,0x20, + 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20}, + +/* 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}, - +*/ // other 12 bytes (64 in total) .secondarySerial = 0xFFFF, .secondaryLicence = 0xFF, @@ -310,7 +315,7 @@ .secondary_bluetooth_name_set = 0xFF, .secondary_info = {0xFF,0xFF,0xFF,0xFF} }; -#endif + RTC_HandleTypeDef RtcHandle; TIM_HandleTypeDef TimHandle; /* used in stm32f4xx_it.c too */ @@ -704,7 +709,7 @@ tComm_init(); tInfo_button_text("exit","","sleep"); - tInfo_newpage("bootloader 250111"); + tInfo_newpage("bootloader 250113"); tInfo_write("start bluetooth"); tInfo_write(""); tInfo_write(textVersion);