MBIC 코드 최적화

 - 불필요한 Printf 문 제거
 - Data Recv  할 때 Crc Check 문 저건에 No Error 조건 추가
 -  MBIC Boot Loader 동작 시 CRC  Printf 문 추가
 -  Flash Init 할 때 현재 Bank 의 Crc 추가
 -  Factory Set 기능 추가
 -  MBIC Type 추가
 - 불필요한 함수 제거

Bluecell_Inc/Bluecell_operate.h

@@ -625,6 +625,9 @@ enum DATATYPE
     Bluecell_TimeSetting,
     Bluecell_Factory_Set,
     Bluecell_CarrierOnOff,
+    Bluecell_PCBVersionSet,
+    Bluecell_SerialNumberSet,
+    Bluecell_ManufactureDateSet,    
 };
 typedef enum{    
 	DLI_P1_Level_Table_Number = 0x00,

Bluecell_Src/MBIC_Bootloader.c

@@ -250,6 +250,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     switch(cmd){
         case MBIC_Notice_REQ:
             EraseInit = false;
+            CRCERR = false;
             Download_Option = 0;
             Curr_Download_DataIndex = 0;
             Prev_Download_DataIndex = 0;
@@ -266,7 +267,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             data[MBIC_PAYLOADSTART + index++] = 1;
             Download_Option = data[MBIC_PAYLOADSTART + 4];
             /*DOWNLOAD DELAY REQUEST*/
-            data[MBIC_PAYLOADSTART + index++] = 10;
+            data[MBIC_PAYLOADSTART + index++] = 3;
             /*DOWNLOAD Reserve*/
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
@@ -374,8 +375,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                                 | 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);
+                Crcret = CRC16_Generate(&Bank1data[MBIC_BOOT_MARK], FirmFile_Length + 128);
                 printf("Bank 1 CRC Calc\r\n");                
             }
             else {
@@ -383,15 +383,16 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                                 | Bank2data[MBIC_BOOT_LENGTH + 1] << 16
                                 | Bank2data[MBIC_BOOT_LENGTH + 2] << 8
                                 | Bank2data[MBIC_BOOT_LENGTH + 3];   
-                FirmFile_Length += 128;
-                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], FirmFile_Length);
+                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], FirmFile_Length + 128);
                 printf("Bank 2 CRC Calc\r\n");
             }
-            RecvCrc = data[MBIC_PAYLOADSTART] << 8 | data[MBIC_PAYLOADSTART + 1];
-
-            printf("FirmFile_Length : %x \r\n",FirmFile_Length + 128);
-            printf("FILE CRC RET : %x \r\n",Crcret);
-        
+            RecvCrc = data[MBIC_PAYLOADSTART + 4] << 8 | data[MBIC_PAYLOADSTART + 5];
+            
+            printf("FirmFile_Length : %d Byte \r\n",((FirmFile_Length  * 1024) + 128));
+            printf("FILE CRC RET : %x  : Recv CRC : %x \r\n",Crcret,RecvCrc);
+            if(RecvCrc != Crcret){
+                CRCERR = true; // CRC ERR Occur 
+            }
             data[MBIC_PAYLOADSTART + index++] = ((Crcret & 0xFF00) >> 8);
             data[MBIC_PAYLOADSTART + index++] = ((Crcret & 0x00FF));
 #if 0 // PYJ.2020.06.29_BEGIN -- 
@@ -423,23 +424,23 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 //              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_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_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_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];         
@@ -451,7 +452,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                 tmpstr[i] = Bank1data[MBIC_BOOT_FILENAME + i];
                 else
                  tmpstr[i] = 0x20;
-                printf("%x",tmpstr[i]);
+//                printf("%x",tmpstr[i]);
             }  
             tmpstr = &bluecell_Currdatastatus.CPU_Bank2_Image_Name;
             for(int i = 0 ; i< 41; i++){
@@ -460,11 +461,11 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                 else
                  tmpstr[i] = 0x20;
 
-                printf("%x",tmpstr[i]);
+//                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]);            
+//            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:
@@ -472,10 +473,12 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             cmd = MBIC_Complete_Notice_RSP;
             if(CRCERR == false){
                 data[MBIC_PAYLOADSTART + index++] = 1;  
+                printf("Crc Success \r\n");
             }else{
                 data[MBIC_PAYLOADSTART + index++] = 0;  
+                printf("Crc Failed \r\n");                
             }
-                data[MBIC_PAYLOADSTART + index++] = 1;    
+            data[MBIC_PAYLOADSTART + index++] = 1;    
             
             bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Bank2data[MBIC_BOOT_CREATION_TIME + 0];
             bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime2 = Bank2data[MBIC_BOOT_CREATION_TIME + 1];

Bluecell_Src/eeprom.c

@@ -122,9 +122,9 @@ void EEPROM_M24C08_Init(void){
 
     
     HAL_Delay(200);
-    printf("MBIC_ULO_ALC_Atten1_H  %x / MBIC_ULO_ALC_Atten1_L: %x \r\n",bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L);        
-    printf("ATT_UL1_H  %x / ATT_UL1_L: %x \r\n",bluecell_Currdatastatus.ATT_UL1_H,bluecell_Currdatastatus.ATT_UL1_L);    
-    printf("bluecell_User_UL1_H  %x / bluecell_User_UL1_L: %x \r\n",bluecell_Currdatastatus.bluecell_User_UL1_H,bluecell_Currdatastatus.bluecell_User_UL1_L);
+//    printf("MBIC_ULO_ALC_Atten1_H  %x / MBIC_ULO_ALC_Atten1_L: %x \r\n",bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L);        
+//    printf("ATT_UL1_H  %x / ATT_UL1_L: %x \r\n",bluecell_Currdatastatus.ATT_UL1_H,bluecell_Currdatastatus.ATT_UL1_L);    
+//    printf("bluecell_User_UL1_H  %x / bluecell_User_UL1_L: %x \r\n",bluecell_Currdatastatus.bluecell_User_UL1_H,bluecell_Currdatastatus.bluecell_User_UL1_L);
 
     printf("===========================================================================\r\n");
     printf("ATT TableDL 1_Init START ORIGIN TABLE LENGTH  %d / Ref : %d \r\n",Att_DL1.Table_Length,Att_DL1.Table_Ref);

Bluecell_Src/flash.c

@@ -95,8 +95,11 @@ 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]);
+//    printf("Curr Version : ");
+//    for(int i =0; i < 3; i++){
+//        printf("%d.",Bank1data[MBIC_BOOT_VERSION + i]);
+//    }
+//    printf("\r\n");
     
     if(bluecell_Currdatastatus.CPUVERSION3  == Bank1data[MBIC_BOOT_VERSION + 2]){
         bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK1_SEL;
@@ -138,11 +141,11 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         }
 
 
-        printf("%c",pdata[i]);
+//        printf("%c",pdata[i]);
     }
     printf("\r\n");
 
-    printf("20%d Y / %d M / %d D / %d H / %d M / %d S  \r\n",
+    printf("Curr Bank  : 20%d Y / %d M / %d D / %d H / %d M / %d S  \r\n",
         Currdata[MBIC_BOOT_CREATION_TIME + 0],
         Currdata[MBIC_BOOT_CREATION_TIME + 1],
         Currdata[MBIC_BOOT_CREATION_TIME + 2],
@@ -150,6 +153,22 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         Currdata[MBIC_BOOT_CREATION_TIME + 4],
         Currdata[MBIC_BOOT_CREATION_TIME + 5]        
     );
+    printf("Bank1  : 20%d Y / %d M / %d D / %d H / %d M / %d S  \r\n",
+        Bank1data[MBIC_BOOT_CREATION_TIME + 0],
+        Bank1data[MBIC_BOOT_CREATION_TIME + 1],
+        Bank1data[MBIC_BOOT_CREATION_TIME + 2],
+        Bank1data[MBIC_BOOT_CREATION_TIME + 3],
+        Bank1data[MBIC_BOOT_CREATION_TIME + 4],
+        Bank1data[MBIC_BOOT_CREATION_TIME + 5]        
+    );
+    printf("Bank2  : 20%d Y / %d M / %d D / %d H / %d M / %d S  \r\n",
+        Bank2data[MBIC_BOOT_CREATION_TIME + 0],
+        Bank2data[MBIC_BOOT_CREATION_TIME + 1],
+        Bank2data[MBIC_BOOT_CREATION_TIME + 2],
+        Bank2data[MBIC_BOOT_CREATION_TIME + 3],
+        Bank2data[MBIC_BOOT_CREATION_TIME + 4],
+        Bank2data[MBIC_BOOT_CREATION_TIME + 5]        
+    );    
 
     printf("MBIC BANK %d Booting \r\n",bluecell_Currdatastatus.CPU_Current_Bank);    
 
@@ -181,9 +200,31 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     }
 #endif // PYJ.2019.03.27_END -- 
     uint32_t crcret = 0,FileCrc = 0;
+    uint32_t currcrcret = 0,currFileCrc = 0;
+    
     int32_t CrcLength = 0;
  
 
+    currFileCrc = 
+    ((Currdata[MBIC_BOOT_CRC] << 24 ) 
+    | Currdata[MBIC_BOOT_CRC + 1]<<16 
+    | Currdata[MBIC_BOOT_CRC + 2]<<8   
+    | Currdata[MBIC_BOOT_CRC + 3]);
+    CrcLength=
+    ((Currdata[MBIC_BOOT_LENGTH] << 24 ) 
+    | Currdata[MBIC_BOOT_LENGTH + 1]<<16 
+    | Currdata[MBIC_BOOT_LENGTH + 2]<<8   
+    | Currdata[MBIC_BOOT_LENGTH + 3]);       
+     if(CrcLength > 0 && CrcLength <= 0x1FFFF )
+        currcrcret = crc32(&Currdata[MBIC_BOOT_DATA], CrcLength);
+    printf("File CRC : %x CrcLength : %d \r\n",currFileCrc,CrcLength);
+    if(currcrcret != currFileCrc){
+        printf("CRC ERROR : %x , File CRC : %x \r\n",currcrcret,currFileCrc);
+    }
+    else{
+        printf("CRC SUCCESS  : %x , File CRC : %x \r\n",currcrcret,currFileCrc);  
+    }
+    
 
 
     
@@ -199,6 +240,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     | Bank1data[MBIC_BOOT_LENGTH + 3]);
     if(CrcLength > 0 && CrcLength <= 0x1FFFF )
         crcret = crc32(&Bank1data[MBIC_BOOT_DATA], CrcLength);
+        printf("File CRC : %x CrcLength : %d \r\n",FileCrc,CrcLength);
     if(crcret != FileCrc){
         bluecell_Currdatastatus.CPU_Bank1_Image_Version1 = 0xFF;
         bluecell_Currdatastatus.CPU_Bank1_Image_Version2 = 0xFF;
@@ -238,6 +280,10 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         printf("CRC ERROR : %x , File CRC : %x \r\n",crcret,FileCrc);
     }
     else{
+        if(currcrcret == crcret){
+            if(bluecell_Currdatastatus.CPU_Bank_Select == 5)
+                bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK1_SEL;
+        }
         printf("CRC SUCCESS  : %x , File CRC : %x \r\n",crcret,FileCrc);  
         bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime1 = Bank1data[MBIC_BOOT_CREATION_TIME + 0];
         bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime2 = Bank1data[MBIC_BOOT_CREATION_TIME + 1];
@@ -276,6 +322,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     | Bank2data[MBIC_BOOT_LENGTH + 3]);       
      if(CrcLength > 0 && CrcLength <= 0x1FFFF )
         crcret = crc32(&Bank2data[MBIC_BOOT_DATA], CrcLength);
+         printf("File CRC : %x CrcLength : %d \r\n",FileCrc,CrcLength);
     if(crcret != FileCrc){
    
    
@@ -309,6 +356,13 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         printf("CRC ERROR : %x , File CRC : %x \r\n",crcret,FileCrc);
     }
     else{
+        if(currcrcret == crcret){
+            if(bluecell_Currdatastatus.CPU_Bank_Select == 6)
+                bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK2_SEL;
+
+        }
+
+        
         printf("CRC SUCCESS  : %x , File CRC : %x \r\n",crcret,FileCrc);  
         bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime1 = Bank2data[MBIC_BOOT_CREATION_TIME + 0];
         bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime2 = Bank2data[MBIC_BOOT_CREATION_TIME + 1];
@@ -323,7 +377,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Name;
         for(int i = 0 ; i< 41; i++){
             if(i < 32){
-                 pdata[i] = Currdata[MBIC_BOOT_FILENAME + i];
+                 pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
             }
             else{
              pdata[i] = 0x20;
@@ -332,10 +386,14 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
    
    
     }
+
+printf("Bank Sel : %d  CurrBank : %d \r\n",bluecell_Currdatastatus.CPU_Bank_Select,bluecell_Currdatastatus.CPU_Current_Bank);
+
+        
     
-           pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Version1;
-            for(int i = 0; i < 41; i++)
-                printf("pdata : %x ",pdata[i]);
+//           pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Version1;
+//            for(int i = 0; i < 41; i++)
+//                printf("pdata : %x ",pdata[i]);
 
 }
 

Bluecell_Src/uart.c

@@ -110,8 +110,8 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
             if(uart_buf[0] == 0xbe){
                 Length = uart_buf[BLUECELL_LENGTH_H] << 8  |  uart_buf[BLUECELL_LENGTH_L] ;
                 CrcChk = uart_buf[Length + 1] << 8 | uart_buf[Length  + 2] ;
-         //       if(CRC16_Check(&uart_buf[BLUECELL_TYPE], Length,CrcChk))
-            	Bluecell_Operate(uart_buf);
+                if(CRC16_Check(&uart_buf[BLUECELL_TYPE], Length,CrcChk) == NO_ERROR)
+                  	Bluecell_Operate(uart_buf);
             }else if(uart_buf[0] == MBIC_PREAMBLE0
                    &&uart_buf[1] == MBIC_PREAMBLE1
                    &&uart_buf[2] == MBIC_PREAMBLE2
@@ -121,7 +121,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
                {
                     Length = ((uart_buf[MBIC_LENGTH_0] << 8) | uart_buf[MBIC_LENGTH_1]);
                     CrcChk = ((uart_buf[MBIC_PAYLOADSTART + Length ] << 8) | (uart_buf[MBIC_PAYLOADSTART + Length + 1]));
-                    if(CRC16_Check(&uart_buf[MBIC_PAYLOADSTART], Length,CrcChk))
+                    if(CRC16_Check(&uart_buf[MBIC_PAYLOADSTART], Length,CrcChk) == NO_ERROR)
                         MBIC_Operate(uart_buf);
                     else
                       printf("CRC ERROR \r\n");

Src/main.c

@@ -281,6 +281,7 @@ int main(void)
         int32_t CrcLength = 0;
         
         
+#if 0 // PYJ.2020.07.13_BEGIN -- 
         
         CurrApiAddress = FLASH_MBICUSER_START_ADDR;
            Bank1Address = FLASH_USER_BANK1_START_ADDR;
@@ -317,6 +318,7 @@ int main(void)
         if(CrcLength > 0 && CrcLength <= 0x1FFFF )
          crcret = CRC16_Generate(Bank2data, CrcLength );
         printf("Bank 2 Crc ret : %x  Length : %x :  %d  \r\n", crcret,CrcLength,CrcLength );
+#endif // PYJ.2020.07.13_END -- 
 
   PE43711_PinInit();
   EEPROM_M24C08_Init();