all working 💪

Author: PabloGonzalezSegarra

Core/App/Bootloader.c

@@ -133,7 +133,7 @@ void const __b_write_memory(fdcan_packet_t* packet){
 	uint32_t buffer[SECTOR_SIZE_IN_32BITS_WORDS];
 	sector_t sector;
 	uint32_t address;
-	uint16_t i;
+	uint16_t i, counter = 1;
 
 	sector = packet->data[0];
 	address = flash_get_sector_starting_address(sector);
@@ -145,6 +145,11 @@ void const __b_write_memory(fdcan_packet_t* packet){
 
 	__b_send_ack(packet);
 
+	if (__b_wait_for_ack(packet->identifier) != BOOTLOADER_OK) {
+		__b_send_nack(packet);
+		return;
+	}
+
 	for (i = 0; i < SECTOR_SIZE_IN_32BITS_WORDS; i +=16) {
 		__b_wait_until_fdcan_message_received();
 		if (fdcan_read(packet) != FDCAN_OK) {
@@ -159,6 +164,18 @@ void const __b_write_memory(fdcan_packet_t* packet){
 		}
 
 		__b_data_copy_from_packet(packet, ((uint8_t*)&(buffer[i])));
+
+		if (counter >= BOOTLOADER_BLOCK_SIZE) {
+			__b_send_ack(packet);
+			if (__b_wait_for_ack(packet->identifier) != BOOTLOADER_OK) {
+				__b_send_nack(packet);
+				return;
+			}
+			counter = 1;
+		}else{
+			counter++;
+		}
+
 	}
 
 	flash_write(address, buffer, SECTOR_SIZE_IN_32BITS_WORDS);

Core/App/Bootloader.h

@@ -16,7 +16,7 @@
 
 #define BOOTLOADER_BLOCK_SIZE 	((uint8_t)8U)
 
-#define BOOTLOADER_MAX_TIMEOUT  ((uint32_t) 1000)
+#define BOOTLOADER_MAX_TIMEOUT  ((uint32_t) 2000)
 
 
 /****************************************************************************************

Debug/Core/App/Bootloader.o

@@ -2,14 +2,14 @@
 ../Core/App/Bootloader.c:73:12:__b_get_version	16	static
 ../Core/App/Bootloader.c:85:12:__b_read_memory	131104	static
 ../Core/App/Bootloader.c:132:12:__b_write_memory	131104	static
-../Core/App/Bootloader.c:169:12:__b_erase_memory	24	static
-../Core/App/Bootloader.c:189:12:__b_go	16	static
-../Core/App/Bootloader.c:193:12:__b_data_copy_to_packet	24	static
-../Core/App/Bootloader.c:201:12:__b_data_copy_from_packet	24	static
-../Core/App/Bootloader.c:209:26:__b_wait_for_ack	88	static
-../Core/App/Bootloader.c:227:12:__b_send_ack	16	static
-../Core/App/Bootloader.c:233:12:__b_send_nack	16	static
-../Core/App/Bootloader.c:239:16:__b_get_addr_from_data	24	static
-../Core/App/Bootloader.c:245:12:__b_clean_fdcan_packet_data	24	static
-../Core/App/Bootloader.c:253:12:__b_clean_fdcan_packet_all	24	static
-../Core/App/Bootloader.c:264:26:__b_wait_until_fdcan_message_received	8	static
+../Core/App/Bootloader.c:186:12:__b_erase_memory	24	static
+../Core/App/Bootloader.c:206:12:__b_go	16	static
+../Core/App/Bootloader.c:210:12:__b_data_copy_to_packet	24	static
+../Core/App/Bootloader.c:218:12:__b_data_copy_from_packet	24	static
+../Core/App/Bootloader.c:226:26:__b_wait_for_ack	88	static
+../Core/App/Bootloader.c:244:12:__b_send_ack	16	static
+../Core/App/Bootloader.c:250:12:__b_send_nack	16	static
+../Core/App/Bootloader.c:256:16:__b_get_addr_from_data	24	static
+../Core/App/Bootloader.c:262:12:__b_clean_fdcan_packet_data	24	static
+../Core/App/Bootloader.c:270:12:__b_clean_fdcan_packet_all	24	static
+../Core/App/Bootloader.c:281:26:__b_wait_until_fdcan_message_received	8	static