diff --git a/Core/Src/main.c b/Core/Src/main.c index 2525898..ca00b13 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -181,9 +181,9 @@ int main(void) } case PRIBOR_TYPE_UF: { - if (flag_load_ems_b0 == 0) flag_load_ems_b0 = load_flash_to_ems(FLASH_BASE_WR, BASE_ADDR_KEMS_B); - if (flag_load_ems_b1 == 0) flag_load_ems_b1 = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B0, BASE_ADDR_EMS_B0); - if (flag_load_kems_b == 0) flag_load_kems_b = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B1, BASE_ADDR_EMS_B1); + if (flag_load_kems_b == 0) flag_load_kems_b = load_flash_to_ems(FLASH_BASE_WR, BASE_ADDR_KEMS_B); + if (flag_load_ems_b0 == 0) flag_load_ems_b0 = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B0, BASE_ADDR_EMS_B0); + if (flag_load_ems_b1 == 0) flag_load_ems_b1 = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B1, BASE_ADDR_EMS_B1); break; } } diff --git a/Debug/yau-07b.list b/Debug/yau-07b.list index cf1bc35..995adce 100644 --- a/Debug/yau-07b.list +++ b/Debug/yau-07b.list @@ -1786,7 +1786,7 @@ int main(void) } case PRIBOR_TYPE_UF: { - if (flag_load_ems_b0 == 0) flag_load_ems_b0 = load_flash_to_ems(FLASH_BASE_WR, BASE_ADDR_KEMS_B); + if (flag_load_kems_b == 0) flag_load_kems_b = load_flash_to_ems(FLASH_BASE_WR, BASE_ADDR_KEMS_B); 8001218: 4b28 ldr r3, [pc, #160] @ (80012bc ) 800121a: 781b ldrb r3, [r3, #0] 800121c: f083 0301 eor.w r3, r3, #1 @@ -1800,7 +1800,7 @@ int main(void) 8001232: 461a mov r2, r3 8001234: 4b21 ldr r3, [pc, #132] @ (80012bc ) 8001236: 701a strb r2, [r3, #0] - if (flag_load_ems_b1 == 0) flag_load_ems_b1 = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B0, BASE_ADDR_EMS_B0); + if (flag_load_ems_b0 == 0) flag_load_ems_b0 = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B0, BASE_ADDR_EMS_B0); 8001238: 4b21 ldr r3, [pc, #132] @ (80012c0 ) 800123a: 781b ldrb r3, [r3, #0] 800123c: f083 0301 eor.w r3, r3, #1 @@ -1814,7 +1814,7 @@ int main(void) 8001252: 461a mov r2, r3 8001254: 4b1a ldr r3, [pc, #104] @ (80012c0 ) 8001256: 701a strb r2, [r3, #0] - if (flag_load_kems_b == 0) flag_load_kems_b = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B1, BASE_ADDR_EMS_B1); + if (flag_load_ems_b1 == 0) flag_load_ems_b1 = load_flash_to_ems(FLASH_BASE_WR + FLASH_BASE_EMS_B1, BASE_ADDR_EMS_B1); 8001258: 4b1b ldr r3, [pc, #108] @ (80012c8 ) 800125a: 781b ldrb r3, [r3, #0] 800125c: f083 0301 eor.w r3, r3, #1 @@ -1852,10 +1852,10 @@ int main(void) 80012b0: 200007b8 .word 0x200007b8 80012b4: 200007c0 .word 0x200007c0 80012b8: 08060000 .word 0x08060000 - 80012bc: 200007c1 .word 0x200007c1 - 80012c0: 200007c2 .word 0x200007c2 + 80012bc: 200007c3 .word 0x200007c3 + 80012c0: 200007c1 .word 0x200007c1 80012c4: 080604b0 .word 0x080604b0 - 80012c8: 200007c3 .word 0x200007c3 + 80012c8: 200007c2 .word 0x200007c2 80012cc: 08060960 .word 0x08060960 080012d0 : diff --git a/Release/yau-07b.list b/Release/yau-07b.list index 11ffc03..c5574c6 100644 --- a/Release/yau-07b.list +++ b/Release/yau-07b.list @@ -1288,10 +1288,10 @@ Disassembly of section .text: 8000e80: 20000e54 .word 0x20000e54 8000e84: 20000e50 .word 0x20000e50 8000e88: 20000e48 .word 0x20000e48 - 8000e8c: 20000e42 .word 0x20000e42 + 8000e8c: 20000e40 .word 0x20000e40 8000e90: 08060000 .word 0x08060000 - 8000e94: 20000e41 .word 0x20000e41 - 8000e98: 20000e40 .word 0x20000e40 + 8000e94: 20000e42 .word 0x20000e42 + 8000e98: 20000e41 .word 0x20000e41 8000e9c: 08060960 .word 0x08060960 8000ea0: 20000e43 .word 0x20000e43 8000ea4: 080604b0 .word 0x080604b0