Skip to content

Commit 7914813

Browse files
fixed timeout
1 parent 4762413 commit 7914813

8 files changed

Lines changed: 10 additions & 8 deletions

File tree

Core/App/Bootloader.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ bootloader_error_t const __b_wait_for_ack(bootloader_order_t order){
210210
if (__b_wait_until_fdcan_message_received() != BOOTLOADER_OK) {
211211
return BOOTLOADER_ERROR;
212212
}
213+
213214
fdcan_packet_t packet;
214215
fdcan_read(&packet);
215216
if (packet.identifier != order) {

Core/App/Bootloader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#define BOOTLOADER_BLOCK_SIZE ((uint8_t)8U)
1818

19-
#define BOOTLOADER_MAX_TIMEOUT ((uint32_t) 2000)
19+
#define BOOTLOADER_MAX_TIMEOUT ((uint32_t) 1000)
2020

2121

2222
/****************************************************************************************

Debug/Core/App/Bootloader.o

0 Bytes
Binary file not shown.

Debug/Core/App/Bootloader.su

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
../Core/App/Bootloader.c:193:12:__b_data_copy_to_packet 24 static
88
../Core/App/Bootloader.c:201:12:__b_data_copy_from_packet 24 static
99
../Core/App/Bootloader.c:209:26:__b_wait_for_ack 88 static
10-
../Core/App/Bootloader.c:226:12:__b_send_ack 16 static
11-
../Core/App/Bootloader.c:232:12:__b_send_nack 16 static
12-
../Core/App/Bootloader.c:238:16:__b_get_addr_from_data 24 static
13-
../Core/App/Bootloader.c:244:12:__b_clean_fdcan_packet_data 24 static
14-
../Core/App/Bootloader.c:252:12:__b_clean_fdcan_packet_all 24 static
15-
../Core/App/Bootloader.c:263:26:__b_wait_until_fdcan_message_received 8 static
10+
../Core/App/Bootloader.c:227:12:__b_send_ack 16 static
11+
../Core/App/Bootloader.c:233:12:__b_send_nack 16 static
12+
../Core/App/Bootloader.c:239:16:__b_get_addr_from_data 24 static
13+
../Core/App/Bootloader.c:245:12:__b_clean_fdcan_packet_data 24 static
14+
../Core/App/Bootloader.c:253:12:__b_clean_fdcan_packet_all 24 static
15+
../Core/App/Bootloader.c:264:26:__b_wait_until_fdcan_message_received 8 static

Debug/Core/Src/main.o

0 Bytes
Binary file not shown.

Debug/HUPV-Bootloader.bin

0 Bytes
Binary file not shown.

Debug/HUPV-Bootloader.elf

0 Bytes
Binary file not shown.

Debug/HUPV-Bootloader.list

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,7 @@ bootloader_error_t const __b_wait_for_ack(bootloader_order_t order){
735735
80e079a: 2301 movs r3, #1
736736
80e079c: e011 b.n 80e07c2 <__b_wait_for_ack+0x3c>
737737
}
738+
738739
fdcan_packet_t packet;
739740
fdcan_read(&packet);
740741
80e079e: f107 030c add.w r3, r7, #12
@@ -910,7 +911,7 @@ bootloader_error_t const __b_wait_until_fdcan_message_received(void){
910911
80e0886: 4b08 ldr r3, [pc, #32] ; (80e08a8 <__b_wait_until_fdcan_message_received+0x30>)
911912
80e0888: 681b ldr r3, [r3, #0]
912913
80e088a: 6a5b ldr r3, [r3, #36] ; 0x24
913-
80e088c: f644 6220 movw r2, #20000 ; 0x4e20
914+
80e088c: f242 7210 movw r2, #10000 ; 0x2710
914915
80e0890: 4293 cmp r3, r2
915916
80e0892: d901 bls.n 80e0898 <__b_wait_until_fdcan_message_received+0x20>
916917
return BOOTLOADER_ERROR;

0 commit comments

Comments
 (0)