HFR 작업 내용 Download 완료 / Bank image 이름 업데이트

Bluecell_Src/Bluecell_operate.c

@@ -3070,7 +3070,7 @@ typedef enum{
         PrevMBIC_DL_ShutdownCount[i] = 0xFF;        
     }
 
-  printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);
+//  printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);
 
   //  printf("bluecell_Currdatastatus.Type : %02x \r\n",bluecell_Currdatastatus.Type);
 #if 1 // PYJ.2020.06.17_BEGIN -- 
@@ -3082,7 +3082,7 @@ typedef enum{
     
     HAL_GPIO_WritePin(PATH_EN_UL1_GPIO_Port,PATH_EN_UL1_Pin,bluecell_Currdatastatus.ATT_UL1_PATH);   
     HAL_GPIO_WritePin(PATH_EN_UL2_GPIO_Port,PATH_EN_UL2_Pin,bluecell_Currdatastatus.ATT_UL2_PATH);   
-    printf("bluecell_Currdatastatus.ATT_UL2_PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL2_PATH);
+//    printf("bluecell_Currdatastatus.ATT_UL2_PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL2_PATH);
     HAL_GPIO_WritePin(PATH_EN_UL3_GPIO_Port,PATH_EN_UL3_Pin,bluecell_Currdatastatus.ATT_UL3_PATH);   
     HAL_GPIO_WritePin(PATH_EN_UL4_GPIO_Port,PATH_EN_UL4_Pin,bluecell_Currdatastatus.ATT_UL4_PATH);   
 #endif // PYJ.2020.06.17_END -- 
@@ -3210,7 +3210,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPUVERSION1;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPUVERSION2;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPUVERSION3;
-    
+//    printf("Version [3] : %x\r\n ",bluecell_Currdatastatus.CPUVERSION3);
 
 
     /*CPU_Current_Bank*/
@@ -3248,9 +3248,12 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = CPU_Bank1_Image_Name;
     data[MBIC_PAYLOADSTART + i++] = 32; // LENGTH
     Length += 32;  
+    uint8_t* tmpstr = &bluecell_Currdatastatus.CPU_Bank1_Image_Name;
     for(int a = 0; a < 32; a++){
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank1_Image_Name[a];
+//        printf("%x ",tmpstr[a]);
     }
+//    printf("\r\n");
 
     /*CPU_Bank2_Image_Version*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
@@ -3325,7 +3328,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 1; // LENGTH
     Length += 1;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Type;
-    printf(" bluecell_Currdatastatus.Type : %x \r\n", bluecell_Currdatastatus.Type);
+//    printf(" bluecell_Currdatastatus.Type : %x \r\n", bluecell_Currdatastatus.Type);
      /*PCB_Version*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
     data[MBIC_PAYLOADSTART + i++] = PCB_Version;

Bluecell_Src/MBIC_Bootloader.c

@@ -14,7 +14,7 @@
 #include "CRC.h"
 #include "uart.h"
 
-extern __IO bool EraseInit;
+extern bool EraseInit;
 
 extern uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress);
 extern void MBIC_DataErase_Func(uint8_t bank_num);
@@ -211,14 +211,13 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     static uint32_t Prev_Download_DataIndex = 0;    
     uint32_t TotalFrame = 0;
     uint32_t CurrFrame = 0;
-    uint32_t PrevFrame = 0 ;
     static uint32_t prevFrame = 0xFF;
-    
+     uint8_t* tmpstr;
     uint16_t DataLength = 0;
     uint16_t Crcret = 0;
     uint16_t RecvCrc = 0;
     uint32_t i = 0 ;
-    uint32_t FirmFile_Length  = 0;
+    int32_t FirmFile_Length  = 0;
     uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
     static uint8_t BankNum = 0;
     static bool CRCERR = false;
@@ -249,14 +248,14 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 //        printf("%c",*data++);
     switch(cmd){
         case MBIC_Notice_REQ:
+            EraseInit = false;
             Download_Option = 0;
             Curr_Download_DataIndex = 0;
             Prev_Download_DataIndex = 0;
-            
+            prevFrame = 0xFF;
             printf("MBIC DOWNLOAD REQUEST \r\n");
             cmd = MBIC_Notice_RSP;
             CRCERR = false;
-            EraseInit = false;
             /*TOTAL FRAME NUMBER*/
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
@@ -274,7 +273,11 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
-           
+              if(bluecell_Currdatastatus.CPU_Current_Bank == HFR_BANK1){
+                BankNum = HFR_BANK2;
+              }else{
+                BankNum = HFR_BANK1;
+              }           
 //            MBIC_DataBankWrite(1);
             //if()
 //            MBIC_DataErase_Func(bluecell_Currdatastatus.CPU_Bank_Select);
@@ -319,18 +322,31 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 #endif // PYJ.2020.06.24_END -- 
 //            printf("Data End\r\n");
 //            Bank_Flash_write(data,FLASH_USER_BANK1_START_ADDR);
-              if(Currdata[MBIC_BOOT_VERSION + 3] == Bank1data[MBIC_BOOT_VERSION + 3]){
-                BankNum = HFR_BANK2;
+
+              if(prevFrame != CurrFrame){
+                MBIC_APIFLASH_Func(&data[MBIC_PAYLOADSTART + 12],1024,BankNum);
               }else{
-                BankNum = HFR_BANK1;
+                if(MBIC_Address < FLASH_USER_BANK2_START_ADDR)
+                    MBIC_Address = FLASH_USER_BANK2_START_ADDR + (CurrFrame * 1024);
+                else
+                    MBIC_Address = FLASH_USER_BANK1_START_ADDR + (CurrFrame * 1024);
+                
+                printf("Frame Retry \r\n");
               }
-              MBIC_APIFLASH_Func(&data[MBIC_PAYLOADSTART + 12],1024,BankNum);
-              printf("Bank1data[MBIC_BOOT_MARK] : %d \r\n",Bank2data[MBIC_BOOT_MARK]);
+#if 0 // PYJ.2020.06.29_BEGIN -- 
+              if(BankNum == HFR_BANK1){
+                  printf("Bank1data[MBIC_BOOT_MARK] : %d \r\n",Bank1data[MBIC_BOOT_MARK]);
+              }else{
+
+                  printf("Bank1data[MBIC_BOOT_MARK] : %d \r\n",Bank2data[MBIC_BOOT_MARK]);
+              }
+              
+#endif // PYJ.2020.06.29_END -- 
 //              if(BankNum == HFR_BANK1)
 //                  Crcret = CRC16_Generate(&Bank1data[MBIC_BOOT_MARK], TotalFrame);
 //              else
 //                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], TotalFrame);
-                printf("CurrFrame : %d ,FirmFile_Length : %d \r\n",CurrFrame,TotalFrame);
+                printf("CurrFrame : %d ,FirmFile_Length : %d \r\n",CurrFrame,TotalFrame - 1);
                 printf("FILE CRC RET : %x \r\n",Crcret);              
 
 //            HAL_Delay(100);
@@ -339,14 +355,17 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 
             break;
         case MBIC_Download_Confirm_REQ:
-            EraseInit = true;
+            
+            printf("MBIC_Download_Confirm_REQ \r\n");
             cmd = MBIC_Download_Confirm_RSP;
             /*TOTAL FRAME NUMBER*/
+             
             if(BankNum == HFR_BANK1){
                 FirmFile_Length = (Bank1data[MBIC_BOOT_LENGTH + 0] << 24)
                                 | Bank1data[MBIC_BOOT_LENGTH + 1] << 16
                                 | Bank1data[MBIC_BOOT_LENGTH + 2] << 8
                                 | Bank1data[MBIC_BOOT_LENGTH + 3];
+                FirmFile_Length += 128;
                 Crcret = CRC16_Generate(&Bank1data[MBIC_BOOT_MARK], FirmFile_Length);
                 printf("Bank 1 CRC Calc\r\n");                
             }
@@ -354,13 +373,14 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                  FirmFile_Length = (Bank2data[MBIC_BOOT_LENGTH + 0] << 24)
                                 | Bank2data[MBIC_BOOT_LENGTH + 1] << 16
                                 | Bank2data[MBIC_BOOT_LENGTH + 2] << 8
-                                | Bank2data[MBIC_BOOT_LENGTH + 3];           
-                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], FirmFile_Length - 1);
+                                | Bank2data[MBIC_BOOT_LENGTH + 3];   
+                FirmFile_Length += 128;
+                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], FirmFile_Length);
                 printf("Bank 2 CRC Calc\r\n");
             }
             RecvCrc = data[MBIC_PAYLOADSTART] << 8 | data[MBIC_PAYLOADSTART + 1];
 
-            printf("FirmFile_Length : %x \r\n",FirmFile_Length);
+            printf("FirmFile_Length : %x \r\n",FirmFile_Length + 128);
             printf("FILE CRC RET : %x \r\n",Crcret);
         
             data[MBIC_PAYLOADSTART + index++] = ((Crcret & 0xFF00) >> 8);
@@ -383,18 +403,90 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
+//         if(BankNum == HFR_BANK1){
+//            bluecell_Currdatastatus.CPUVERSION1 = Bank1data[MBIC_BOOT_VERSION];
+//            bluecell_Currdatastatus.CPUVERSION2 = Bank1data[MBIC_BOOT_VERSION + 1];
+//            bluecell_Currdatastatus.CPUVERSION3 = Bank1data[MBIC_BOOT_VERSION + 2];          
+//              printf("Bank1data[MBIC_BOOT_VERSION] : %d \r\n",Bank1data[MBIC_BOOT_VERSION + 2]);
+//          }else{
+//              bluecell_Currdatastatus.CPUVERSION1 = Bank2data[MBIC_BOOT_VERSION];
+//              bluecell_Currdatastatus.CPUVERSION2 = Bank2data[MBIC_BOOT_VERSION + 1];
+//              bluecell_Currdatastatus.CPUVERSION3 = Bank2data[MBIC_BOOT_VERSION + 2]; 
+//              printf("Bank2data[MBIC_BOOT_VERSION] : %d \r\n",Bank2data[MBIC_BOOT_VERSION + 2]);
+//          }   
+          bluecell_Currdatastatus.CPU_Bank1_Image_Version1 = Bank1data[MBIC_BOOT_VERSION];
+          bluecell_Currdatastatus.CPU_Bank1_Image_Version2 = Bank1data[MBIC_BOOT_VERSION + 1];
+          bluecell_Currdatastatus.CPU_Bank1_Image_Version3 = Bank1data[MBIC_BOOT_VERSION + 2];
+
+            bluecell_Currdatastatus.CPU_Bank2_Image_Version1 = Bank2data[MBIC_BOOT_VERSION];
+            bluecell_Currdatastatus.CPU_Bank2_Image_Version2 = Bank2data[MBIC_BOOT_VERSION + 1];
+            bluecell_Currdatastatus.CPU_Bank2_Image_Version3 = Bank2data[MBIC_BOOT_VERSION + 2];
+            
+             bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime1 = Bank1data[MBIC_BOOT_CREATION_TIME];
+            bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime2 = Bank1data[MBIC_BOOT_CREATION_TIME + 1];
+            bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime3 = Bank1data[MBIC_BOOT_CREATION_TIME + 2];         
+            bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime4 = Bank1data[MBIC_BOOT_CREATION_TIME + 3];         
+            bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime5 = Bank1data[MBIC_BOOT_CREATION_TIME + 4];         
+            bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime6 = Bank1data[MBIC_BOOT_CREATION_TIME + 5];   
 
+            
+             bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Bank2data[MBIC_BOOT_CREATION_TIME];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime2 = Bank2data[MBIC_BOOT_CREATION_TIME + 1];
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime3 = Bank2data[MBIC_BOOT_CREATION_TIME + 2];         
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime4 = Bank2data[MBIC_BOOT_CREATION_TIME + 3];         
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime5 = Bank2data[MBIC_BOOT_CREATION_TIME + 4];         
+            bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime6 = Bank2data[MBIC_BOOT_CREATION_TIME + 5];   
+            tmpstr = &bluecell_Currdatastatus.CPU_Bank1_Image_Name;
+            for(int i = 0 ; i< 41; i++){
+                if(i < 32)
+                tmpstr[i] = Bank1data[MBIC_BOOT_FILENAME + i];
+                else
+                 tmpstr[i] = 0x20;
+                printf("%x",tmpstr[i]);
+            }  
+            tmpstr = &bluecell_Currdatastatus.CPU_Bank2_Image_Name;
+            for(int i = 0 ; i< 41; i++){
+                if(i < 32)
+                tmpstr[i] = Bank2data[MBIC_BOOT_FILENAME + i];
+                else
+                 tmpstr[i] = 0x20;
+
+                printf("%x",tmpstr[i]);
+            }               
+            printf("Curr Version : %02x.%02x.%02x \r\n",bluecell_Currdatastatus.CPUVERSION1,bluecell_Currdatastatus.CPUVERSION2,bluecell_Currdatastatus.CPUVERSION3);
+            printf("Bank1data Version : %02x.%02x.%02x \r\n", Bank1data[MBIC_BOOT_VERSION + 0], Bank1data[MBIC_BOOT_VERSION + 1], Bank1data[MBIC_BOOT_VERSION + 2]);
+            printf("Bank2data Version : %02x.%02x.%02x \r\n", Bank2data[MBIC_BOOT_VERSION + 0], Bank2data[MBIC_BOOT_VERSION + 1], Bank2data[MBIC_BOOT_VERSION + 2]);            
+        
         break;
         case MBIC_Complete_Notice_REQ_REQ:
+            printf("MBIC_Complete_Notice_REQ_REQ \r\n");
             cmd = MBIC_Complete_Notice_RSP;
             if(CRCERR == false){
                 data[MBIC_PAYLOADSTART + index++] = 1;  
             }else{
                 data[MBIC_PAYLOADSTART + index++] = 0;  
             }
-                data[MBIC_PAYLOADSTART + index++] = 1;              
+                data[MBIC_PAYLOADSTART + index++] = 1;    
+
+
+//          if(BankNum == HFR_BANK1){
+//            bluecell_Currdatastatus.CPUVERSION1 = Bank1data[MBIC_BOOT_VERSION];
+//            bluecell_Currdatastatus.CPUVERSION2 = Bank1data[MBIC_BOOT_VERSION + 1];
+//            bluecell_Currdatastatus.CPUVERSION3 = Bank1data[MBIC_BOOT_VERSION + 2];          
+//              printf("Bank1data[MBIC_BOOT_VERSION] : %d \r\n",Bank1data[MBIC_BOOT_VERSION]);
+//          }else{
+//              bluecell_Currdatastatus.CPUVERSION1 = Bank2data[MBIC_BOOT_VERSION];
+//              bluecell_Currdatastatus.CPUVERSION2 = Bank2data[MBIC_BOOT_VERSION + 1];
+//              bluecell_Currdatastatus.CPUVERSION3 = Bank2data[MBIC_BOOT_VERSION + 2]; 
+//
+//              printf("Bank1data[MBIC_BOOT_VERSION] : %d \r\n",Bank2data[MBIC_BOOT_VERSION]);
+//          }   
+            printf("Curr Version : %02x.%02x.%02x \r\n",bluecell_Currdatastatus.CPUVERSION1,bluecell_Currdatastatus.CPUVERSION2,bluecell_Currdatastatus.CPUVERSION3);
+            printf("Bank1data Version : %02x.%02x.%02x \r\n", Bank1data[MBIC_BOOT_VERSION + 0], Bank1data[MBIC_BOOT_VERSION + 1], Bank1data[MBIC_BOOT_VERSION + 2]);
+            printf("Bank2data Version : %02x.%02x.%02x \r\n", Bank2data[MBIC_BOOT_VERSION + 0], Bank2data[MBIC_BOOT_VERSION + 1], Bank2data[MBIC_BOOT_VERSION + 2]);
             break;
         case MBIC_Reboot_Notice_REQ:
+            printf("MBIC_Reboot_Notice_REQ\r\n");
             cmd = MBIC_Reboot_Notice_RSP;
             /*TOTAL FRAME NUMBER*/
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];

Bluecell_Src/eeprom.c

@@ -90,10 +90,10 @@ void EEPROM_M24C08_Init(void){
     uint8_t* tmpdata;
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_DET_DL4_TABLE_ADDRESDS,&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
     tmpdata = &Det_UL1.Table_Det_15_dBm_H;
-    for(int i =0; i < sizeof(DET_TABLEUL_st) ; i++){
-        printf("[%d]%f \r\n",i,(tmpdata[i * 2] << 8 | tmpdata[i*2+1])*0.001);
-    }
-    printf("");
+//    for(int i =0; i < sizeof(DET_TABLEUL_st) ; i++){
+//        printf("[%d]%f \r\n",i,(tmpdata[i * 2] << 8 | tmpdata[i*2+1])*0.001);
+//    }
+//    printf("");
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_DET_UL1_TABLE_ADDRESDS,&Det_UL2.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
 //    data = &Det_UL2.Table_Det_15_dBm_H;
 //    for(int i = 0; i < sizeof(DET_TABLEUL_st) ; i ++ ){
@@ -384,7 +384,7 @@ HAL_StatusTypeDef EEPROM_M24C08_write(uint8_t devid,uint16_t Address,uint8_t* da
           HAL_Delay(20);
         }
     }
-    printf("EEPROM WRITE\r\n");
+//    printf("EEPROM WRITE\r\n");
 
 #endif // PYJ.2020.04.25_END -- 
     return ret;

Bluecell_Src/flash.c

@@ -74,14 +74,14 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     bluecell_Currdatastatus.CPUVERSION1 = Currdata[MBIC_BOOT_VERSION + 0];
     bluecell_Currdatastatus.CPUVERSION2 = Currdata[MBIC_BOOT_VERSION + 1];
     bluecell_Currdatastatus.CPUVERSION3 = Currdata[MBIC_BOOT_VERSION + 2];
+    for(int i =0; i < 3; i++)
+        printf("Bank1data[MBIC_BOOT_VERSION] : %d \r\n",Bank1data[MBIC_BOOT_VERSION + i]);
     
-    if(bluecell_Currdatastatus.CPUVERSION1 == Bank1data[MBIC_BOOT_VERSION + 0]
-    &&bluecell_Currdatastatus.CPUVERSION1 == Bank1data[MBIC_BOOT_VERSION + 1]
-    &&bluecell_Currdatastatus.CPUVERSION1 == Bank1data[MBIC_BOOT_VERSION + 2]){
+    if(bluecell_Currdatastatus.CPUVERSION3  == Bank1data[MBIC_BOOT_VERSION + 2]){
         bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK1_SEL;
-    }else if(bluecell_Currdatastatus.CPUVERSION1 == Bank2data[MBIC_BOOT_VERSION + 0]
-    &&bluecell_Currdatastatus.CPUVERSION1 == Bank2data[MBIC_BOOT_VERSION + 1]
-    &&bluecell_Currdatastatus.CPUVERSION1 == Bank2data[MBIC_BOOT_VERSION + 2]){
+    }
+    else 
+    {
         bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK2_SEL;
     }
     printf("Curr Version : %02x.%02x.%02x \r\n",bluecell_Currdatastatus.CPUVERSION1,bluecell_Currdatastatus.CPUVERSION2,bluecell_Currdatastatus.CPUVERSION3);
@@ -91,17 +91,32 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
 
     
     printf("BANK1 IMAGE NAME : ");
-    for(int i = 0 ; i< 32; i++){
-        pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i];
-        printf("%c",pdata[i]);
+    pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Name;
+    for(int i = 0 ; i< 41; i++){
+        if(i < 32){
+            pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i];
+            printf("%c",pdata[i]);
+        }
+        else{
+         pdata[i] = 0x20;
+        }
+
     }
     printf("\r\n");
 
     
     pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Name;
     printf("BANK2 IMAGE NAME : ");
-    for(int i = 0 ; i< 32; i++){
-        pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];  
+    for(int i = 0 ; i< 41; i++){
+        if(i < 32){
+            pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
+            printf("%c",pdata[i]);
+        }
+        else{
+         pdata[i] = 0x20;
+        }
+
+
         printf("%c",pdata[i]);
     }
     printf("\r\n");
@@ -275,7 +290,7 @@ uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙
 }
 #endif // PYJ.2020.06.24_END -- 
 #define DATA_32                 ((uint32_t)0x33333333)
-__IO bool EraseInit = false;
+bool EraseInit = false;
 
 #if 0 // PYJ.2020.06.24_BEGIN -- 
 void MBIC_APIFLASH_test(uint8_t* data,uint32_t size){
@@ -418,6 +433,7 @@ void MBIC_DataErase_Func(uint8_t bank_num){
     static uint32_t PAGEError = 0;
 
     if(EraseInit == false){
+        HAL_FLASH_Unlock();
 #if 0 // PYJ.2020.06.24_BEGIN -- 
         EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
         EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
@@ -474,6 +490,19 @@ void MBIC_DataErase_Func(uint8_t bank_num){
         }
         EraseInit = true;
         printf("Erase End\r\n");
+         HAL_FLASH_Lock();
+    }
+    if(MBIC_Address == 0){
+        if(bluecell_Currdatastatus.CPU_Current_Bank == HFR_BANK1){
+            bank_num = HFR_BANK2;
+            MBIC_Address = FLASH_USER_BANK2_START_ADDR;
+            printf("Curr Bank BANK 1 I will download Bank2 \r\n");
+        }
+        else{
+            bank_num = HFR_BANK1;
+            MBIC_Address = FLASH_USER_BANK1_START_ADDR;
+            printf("Curr Bank BANK 2 I will download Bank1 \r\n");
+        }        
     }
 
 }
@@ -520,40 +549,8 @@ uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size,uint8_t bank_num){
       (area defined by FLASH_USER_START_ADDR and FLASH_USER_END_ADDR) ***********/
     
     /* Fill EraseInit structure*/
-#if 0 // PYJ.2020.06.24_BEGIN -- 
+#if 0 // PYJ.2020.06.29_BEGIN -- 
     if(EraseInit == false){
-        EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-        EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
-        EraseInitStruct.NbPages     = ((FLASH_USER_BANK1_START_ADDR + ((uint32_t)0xFFFF)) - FLASH_USER_BANK1_START_ADDR) / FLASH_PAGE_SIZE;
-        printf("Erase Start\r\n");
-        if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
-        {
-          /*
-            Error occurred while page erase.
-            User can add here some code to deal with this error.
-            PAGEError will contain the faulty page and then to know the code error on this page,
-            user can call function 'HAL_FLASH_GetError()'
-          */
-          /* Infinite loop */
-          while (1)
-          {
-            /* Make LED2 blink (100ms on, 2s off) to indicate error in Erase operation */
-            printf("HAL_FLASHEx_Erase Error\r\n");
-            HAL_Delay(2000);
-          }
-        }
-        EraseInit = true;
-        printf("Erase End\r\n");
-    }
-#else
-    if(EraseInit == false){
-#if 0 // PYJ.2020.06.24_BEGIN -- 
-        EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-        EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
-        printf("PageAddress : %x \r\n",FLASH_USER_BANK1_START_ADDR);
-//        EraseInitStruct.NbPages     = ((FLASH_USER_BANK1_START_ADDR + ((uint32_t)0xFFFF)) - FLASH_USER_BANK1_START_ADDR) / FLASH_PAGE_SIZE;
-        EraseInitStruct.NbPages     = (FLASH_USER_BANK1_START_ADDR - ((uint32_t)0xFFFF)) / FLASH_PAGE_SIZE;
-#else
     ret = bluecell_Currdatastatus.CPU_Current_Bank;
     if(bank_num == HFR_AUTO_SEL){
         if(ret == HFR_BANK2)
@@ -585,7 +582,6 @@ uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size,uint8_t bank_num){
         printf("I will download Bank1 \r\n");        
         printf("Erase BANK 1 \r\n");        
     }
-#endif // PYJ.2020.06.24_END -- 
         printf("NbPages : %x \r\n",EraseInitStruct.NbPages );
         printf("EraseInitStruct.PageAddress : %x \r\n",EraseInitStruct.PageAddress);
 
@@ -609,38 +605,21 @@ uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size,uint8_t bank_num){
         EraseInit = true;
         printf("Erase End\r\n");
     }
+#endif // PYJ.2020.06.29_END -- 
 
-#endif // PYJ.2020.06.24_END -- 
     /* Program the user Flash area word by word
       (area defined by FLASH_USER_START_ADDR and FLASH_USER_END_ADDR) ***********/
     
 //    MBIC_Address = FLASH_USER_BANK1_START_ADDR;
     printf("HAL_FLASH_Program Start\r\n");
     DownloadIndex += size;
-#if 0 // PYJ.2020.06.24_BEGIN -- 
-    while (MBIC_Address <= ((FLASH_USER_BANK1_START_ADDR + DownloadIndex)))
-    {
-      writedata = data[dataindex + 0] ;
-      writedata += data[dataindex + 1] << 8 ;
-      writedata += data[dataindex + 2] << 16;
-      writedata += data[dataindex + 3] << 24;      
-      if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, MBIC_Address,writedata) == HAL_OK)
-      {
-        MBIC_Address +=  4;
-        dataindex  += 4;
-      }
-      else
-      {
-        /* Error occurred while writing data in Flash memory.
-           User can add here some code to deal with this error */
-        while (1)
-        {
-          printf("HAL_FLASH_Program Error\r\n");
-        }
-      }
-    }
-#else   
      printf("MBIC_Address : %x \r\n",MBIC_Address);
+     if(MBIC_Address == 0){
+        if(bank_num == HFR_BANK1)
+            MBIC_Address = FLASH_USER_BANK1_START_ADDR;
+        else
+           MBIC_Address = FLASH_USER_BANK2_START_ADDR;
+     }
      for(int downindex = 0; downindex < size; downindex+=4)
      {
        writedata = data[downindex + 0] ;
@@ -658,8 +637,7 @@ uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size,uint8_t bank_num){
        }
      }
 
-#endif // PYJ.2020.06.24_END -- 
-     printf("HAL_FLASH_Program END\r\n");
+     printf("HAL_FLASH_Program END   %x \r\n",MBIC_Address);
     /* Lock the Flash to disable the flash control register access (recommended
        to protect the FLASH memory against possible unwanted operation) *********/
     HAL_FLASH_Lock();

Bluecell_Src/uart.c

@@ -100,7 +100,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //        printf("data cnt zero !!!  \r\n");
         //RF_Ctrl_Main(&uart_buf[Header]);
 //        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
-#if 1// PYJ.2019.07.15_BEGIN --
+#if 0// PYJ.2019.07.15_BEGIN --
             printf("\r\n[RX]");
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);
@@ -153,9 +153,9 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
   //HAL_UART_Transmit_IT(&hTerminal, &data[0],size);
 //    printf("data[278] : %x \r\n",data[278]);
 ////    HAL_Delay(1);   
-//    printf("\r\n [TX] : {");
-//    for(int i = 0; i< size; i++)
-//        printf(",0x%02x ",data[i]);
+    printf("\r\n [TX] : ");
+    for(int i = 0; i< size; i++)
+        printf("%02x ",data[i]);
 //    printf("};\r\n\tCOUNT : %d \r\n",size);
 //    printf("\r\n");
 //    printf("\r\n [TX] : {");
@@ -164,7 +164,7 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
 //        data[i] = 0;
 //    }
 //    printf("};\r\n\tCOUNT : %d \r\n",size);
-//    printf("\r\n");
+    printf("\r\n");
     
 }
 

STM32F103ZET_JDASMBIC.elf.launch

@@ -57,5 +57,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="uart_buf,0x08005000,0x8005000,Bank2data,data"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="uart_buf,0x08005000,0x8005000,Bank2data,data,Currdata,Currdata[MBIC_BOOT_VERSION + 2],Bank1data"/>
 </launchConfiguration>

Src/main.c

@@ -28,6 +28,7 @@
 #include "uart.h"
 #include "Bluecell_operate.h"
 #include "eeprom.h"
+#include "flash.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -279,20 +280,43 @@ extern const uint16_t crc16_tab[256];
 
 
   setbuf(stdout, NULL);
-//  uint32_t CrcLength = 
-//    ((data2[MBIC_BOOT_LENGTH] << 24 ) 
-//    | data2[MBIC_BOOT_LENGTH + 1]<<16 
-//    | data2[MBIC_BOOT_LENGTH + 2]<<8   
-//    | data2[MBIC_BOOT_LENGTH + 3]);
-//  printf("CRC LENGTH : %d,CRC LENGTH : %X \r\n",CrcLength,CrcLength):
-//  uint16_t crcret = CRC16_Generate2(&data2[MBIC_PAYLOADSTART], CrcLength);
-//    
-//  printf("CRC : %x \r\n",data2[MBIC_BOOT_CRC + 0]);
-//  printf("data2 : %X size %d \r\n",crcret,CrcLength );  
-//      while(1);
-#if 1 // PYJ.2020.06.24_BEGIN -- 
-//  DataWriteTest();
-//    while(1);
+   uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
+        int32_t CrcLength = 0;
+        
+        
+        
+        CurrApiAddress = FLASH_MBICUSER_START_ADDR;
+           Bank1Address = FLASH_USER_BANK1_START_ADDR;
+           Bank2Address = FLASH_USER_BANK2_START_ADDR;
+        
+           uint8_t* Currdata = (uint8_t*)CurrApiAddress;
+           uint8_t* Bank1data = (uint8_t*)Bank1Address;
+           uint8_t* Bank2data = (uint8_t*)Bank2Address;
+        
+        uint16_t crcret = 0;
+        
+        CrcLength=
+        ((Bank1data[MBIC_BOOT_LENGTH] << 24 ) 
+        | Bank1data[MBIC_BOOT_LENGTH + 1]<<16 
+        | Bank1data[MBIC_BOOT_LENGTH + 2]<<8   
+        | Bank1data[MBIC_BOOT_LENGTH + 3]);    
+
+        if(CrcLength > 0)
+            crcret = CRC16_Generate(Bank1data, CrcLength + 128);
+        CrcLength += 128;
+        printf("Bank 1 Crc ret : %x  Length : %x :  %d \r\n",crcret ,CrcLength,CrcLength);
+        
+        CrcLength=
+        ((Bank2data[MBIC_BOOT_LENGTH] << 24 ) 
+        | Bank2data[MBIC_BOOT_LENGTH + 1]<<16 
+        | Bank2data[MBIC_BOOT_LENGTH + 2]<<8   
+        | Bank2data[MBIC_BOOT_LENGTH + 3]);  
+        printf("address : %x \r\n",Bank2data[0]);
+        
+        printf("Bank 2 Crc ret : %x  Length : %x :  %d  \r\n", crcret,CrcLength,CrcLength );
+        CrcLength += 128;
+         crcret = CRC16_Generate(Bank2data, CrcLength );
+        printf("Bank 2 Crc ret : %x  Length : %x :  %d  \r\n", crcret,CrcLength,CrcLength );
 
   PE43711_PinInit();
   EEPROM_M24C08_Init();
@@ -305,7 +329,7 @@ extern const uint16_t crc16_tab[256];
   Booting_LedInit();
   Booting_LED_Check();
   InitUartQueue(&TerminalQueue);
-#endif // PYJ.2020.06.24_END -- 
+
 #if 0 // PYJ.2020.04.22_BEGIN -- 
   EEPROM_M24C08_write(0xA0,0,i2cTestData,1);
   printf("i2c Test Data1 %d\r\n",i2ctest[0]);
@@ -334,6 +358,7 @@ extern const uint16_t crc16_tab[256];
 
 //      while(1);
 #if 1 // PYJ.2020.05.06_BEGIN --
+     
       printf("****************************************\r\n");
       printf("MBIC Project\r\n");
       printf("Build at %s %s\r\n", __DATE__, __TIME__);