Mercurial > public > ostc4

changeset 1040:74be24428049 GasConsumption

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix Fontpack update for large blocks: The update of a font pack with a size > 768000 byte was interrupted and a manuel switch to bootloader had to be performed to get the font pack flashed. Rootcause was a missing address adjustment during the block read back function which caused a false error detection. Blocks > 768000 are read in two step while only one buffer is used for comparation. To fill the correct data into this buffer a dummy read of the flash data was added to get the data pointers to the correct offset. Another bug was regardings the read back itself where only the first byte was checked. After array indexing the complete buffer is noch verified.
author Ideenmodellierer
date Mon, 13 Oct 2025 20:54:25 +0200
parents f8e2895c91e5
children 93c98a28406c
files Discovery/Src/externLogbookFlash.c Discovery/Src/tComm.c
diffstat 2 files changed, 15 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/externLogbookFlash.c	Mon Oct 13 15:44:12 2025 +0200
+++ b/Discovery/Src/externLogbookFlash.c	Mon Oct 13 20:54:25 2025 +0200
@@ -334,7 +334,11 @@
 		}
 		else if(pSample2)
 		{
-			actualAddress += length1;
+			/* actualAddress += length1; do dummy read to get EEPROM to the correct address */
+			for(uint32_t i = 0; i<length1; i++)
+			{
+				ext_flash_read_block(&pSample2[0], EF_FIRMWARE2);
+			}
 			for(uint32_t i = 0; i<length2; i++)
 			{
 				ext_flash_read_block(&pSample2[i], EF_FIRMWARE2);
--- a/Discovery/Src/tComm.c	Mon Oct 13 15:44:12 2025 +0200
+++ b/Discovery/Src/tComm.c	Mon Oct 13 20:54:25 2025 +0200
@@ -1550,6 +1550,7 @@
     const uint8_t id_Region1_firmware = 0xFF;
     const uint8_t id_RTE = 0xFE;
     uint8_t textpointer = 0;
+    uint32_t index = 0;
 
     //Get length
     if(HAL_UART_Receive(&UartHandle, sBuffer, 4,5000)!= HAL_OK) // 58000
@@ -1720,7 +1721,7 @@
             return 0xFF;
     }
     else
-    //if(region == 2)
+    if(id == id_FONT)
     {
         uint8_t ptr = 0;
         ptr += gfx_number_to_string(7,0,&display_text[ptr],lengthTotal);
@@ -1735,7 +1736,7 @@
     }
 
 
-    // only non RTE !!
+    /* only non RTE !! (at this point RTE path already performed a return some lines above */
     uint8_t* pBufferCompare = (uint8_t*)getFrame(20);
     ByteCompareStatus = 0;
 
@@ -1749,14 +1750,14 @@
 
         if(lengthCompare != length1)
             ByteCompareStatus = 10000;
-        for(int i = 0; i < length1; i++)
+        for(index = 0; index < length1; index++)
         {
-            if(pBuffer1[0] != pBufferCompare[0])
+            if(pBuffer1[index] != pBufferCompare[index])
                 ByteCompareStatus++;
         }
     }
     else
-    //if(region == 2)
+    if(id == id_FONT)
     {
         /* upper region firmware can be larger (1MB) */
         if(ext_flash_read_firmware2(0, pBufferCompare,4, 0,0) != 0xFFFFFFFF)
@@ -1768,16 +1769,16 @@
             ByteCompareStatus = 10000;
         if(offsetTotal != offsetCompare)
             ByteCompareStatus += 20000;
-        for(int i = 0; i < length1; i++)
+        for(index = 0; index < length1; index++)
         {
-            if(pBuffer1[0] != pBufferCompare[0])
+            if(pBuffer1[index] != pBufferCompare[index])
                 ByteCompareStatus++;
         }
 
         lengthCompare = ext_flash_read_firmware2(0, 0,768000, pBufferCompare,768000);
-        for(int i = 0; i < length2; i++)
+        for(index = 0; index < length2; index++)
         {
-            if(pBuffer2[0] != pBufferCompare[0])
+            if(pBuffer2[index] != pBufferCompare[index])
                 ByteCompareStatus++;
         }
     }