MBIC 수정 사항

  -  PCB Version
  -  Serial Number
  -  Manufacture Date
  표시 정상적으로 안되던 문제 수정
 SelTestTimer Off 30분 설정 지속적 체크하도록 수정
 - Alarm 울릴 때 Testmode 동작 하도록 수정
 - EEPROM Init 할 때 PCB Version Serial Number Manufacture 점검하도록 수정
 - Bluecell Falsh Init 에서 Filename에 넣을 때 인덱스 41 -> 32로변경 실제 32가 맞음
 - BootLoader 에서 FileName에 넣을 때 Index 41 ->  32로변경  실제 32가 맞음

Bluecell_Src/Bluecell_operate.c

@@ -998,7 +998,7 @@ void Bluecell_DataCopy(uint8_t* dst,uint8_t* src,uint16_t size){
 //    printf("Setting Start Value\r\n");
        for(int i = 0; i < size; i++){
          dst[i] = src[i];
-         printf("%02x ",src[i]);
+//         printf("%02x ",src[i]);
        }
 //        printf("Setting Start Value END \r\n");
 
@@ -1178,7 +1178,6 @@ void Bluecell_TableLoad(uint8_t* data,uint8_t type){
             Bluecell_DataCopy(&data[BLUECELL_DATA + 1],&Temp_DL1.Table_1_Temp,sizeof(TEMP_TABLE_st));
             data[BLUECELL_LENGTH_L] = (sizeof(TEMP_TABLE_st)) + 7 - 3;
             printf("Table_Length : %d , Table_Ref : %d ",Temp_DL1.Table_Length,Temp_DL1.Table_Ref);            
-
             break;
         case DLI_P2_ATT_Temp_guarantee_Table_Number:
             EEPROM_M24C08_Read(EEPROM_M24C08_ID ,(EEPROM_TEMP_DL1_TABLE_ADDRESDS),&Temp_DL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );   
@@ -2378,6 +2377,19 @@ bool Bluecell_Operate(uint8_t* data){
         Txdata[sizeof(BLUESTATUS_st) - 3] = ((Crcret & 0xFF00) >> 8 );
         Txdata[sizeof(BLUESTATUS_st) - 2] = ((Crcret & 0x00FF));
         
+//        printf("PCB Version : %d.%d \r\n",bluecell_Currdatastatus.PCB_Version[0],bluecell_Currdatastatus.PCB_Version[1]);
+//        printf("Serial Number : ");
+//        for(int a = 0; a < 20; a++){
+//            printf("%c",bluecell_Currdatastatus.Serial_Number[a]);
+//        }
+//        printf("\r\n");
+//        printf("Manufacture_Date : ");
+//        for(int a = 0; a < 3; a++){
+//            printf("%c",bluecell_Currdatastatus.Manufacture_Date[a]);
+//        }
+//        printf("\r\n");
+        
+        
 #endif // PYJ.2020.05.28_END -- 
 #if 0 // PYJ.2020.04.22_BEGIN -- 
         for(int i = 0 ; i < sizeof(BLUESTATUS_st); i++ ){
@@ -3106,7 +3118,9 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 0xFF;
     data[MBIC_PAYLOADSTART + i++] = 0x0F;
     data[MBIC_PAYLOADSTART + i++] = 0xFF;
-     if(bluecell_Currdatastatus.Carrier_ON_OFF == false || bluecell_Currdatastatus.ALARM_TESTMODE == true){/*Carrier OFF -> Alarm OFF*/
+     if(bluecell_Currdatastatus.Carrier_ON_OFF == false 
+     || bluecell_Currdatastatus.ALARM_TESTMODE == true){/*Carrier OFF -> Alarm OFF*/
+
         if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
             data[MBIC_PAYLOADSTART + i++] = 0;
             data[MBIC_PAYLOADSTART + i++] = 0;
@@ -3119,7 +3133,6 @@ uint32_t MBIC_DataSend(uint8_t* data){
             data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy3;
             data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy4;
             data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy5;
-
         }
      }else{
         if(bluecell_Currdatastatus.ALARM_MASK1 == true)
@@ -4415,6 +4428,7 @@ void Carrier_ONOFF(uint8_t val){
     }
 }
 bool MBIC_Operate(uint8_t* data){
+//    Bluecell_StructCpy(&Txdata[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
 	uint8_t datatype = data[MBIC_PAYLOADSTART + 1];
    // uint8_t Length = (data[MBIC_PROT_SUB_DATA_INDEX + 2]);
     uint8_t cmd = data[MBIC_PROT_CMD_INDEX];
@@ -7326,7 +7340,7 @@ void SelfTest_TimerOff(uint8_t num,uint8_t* selftest){
     uint16_t Pin = 0;
     GPIO_TypeDef *_Port = 0;
     uint16_t _Pin = 0;   
-    if(SelfTestLifeCnt[0] < MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC){
+    if((*selftest) == false && SelfTestLifeCnt[num] < MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC){
         return;
     }
     switch(num){

Bluecell_Src/MBIC_Bootloader.c

@@ -447,20 +447,12 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             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)
+            for(int i = 0 ; i< 32; i++){
                 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)
+            for(int i = 0 ; i< 32; i++){
                 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);

Bluecell_Src/eeprom.c

@@ -233,6 +233,20 @@ void EEPROM_M24C08_Init(void){
     bluecell_Currdatastatus.ALARM_TESTMODE = 0;
     bluecell_Currdatastatus.Type = 0;
 
+
+    printf("PCB Version : %d.%d \r\n",bluecell_Currdatastatus.PCB_Version[0],bluecell_Currdatastatus.PCB_Version[1]);
+    printf("Serial Number : ");
+    for(int a = 0; a < 20; a++){
+        printf("%c",bluecell_Currdatastatus.Serial_Number[a]);
+    }
+    printf("\r\n");
+    printf("Manufacture_Date : ");
+    for(int a = 0; a < 3; a++){
+        printf("%c",bluecell_Currdatastatus.Manufacture_Date[a]);
+    }
+    printf("\r\n");
+    
+
 //    bluecell_Currdatastatus.CPUVERSION1 =  0;
 //    bluecell_Currdatastatus.CPUVERSION2 = 0;
 //    bluecell_Currdatastatus.CPUVERSION3 = 8;

Bluecell_Src/flash.c

@@ -63,6 +63,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     uint8_t* Bank1data = (uint8_t*)Bank1Address;
     uint8_t* Bank2data = (uint8_t*)Bank2Address;
 
+
     printf("Flash Init \r\n");
     uint8_t* pdata;
     bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime1 = Bank1data[MBIC_BOOT_CREATION_TIME + 0];
@@ -100,7 +101,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
 //        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;
     }
@@ -116,31 +117,18 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     
     printf("BANK1 IMAGE NAME : ");
     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;
-        }
-
+    for(int i = 0 ; i< 32; i++){
+        pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i];
+        printf("%c",pdata[i]);
     }
     printf("\r\n");
 
-    
+
     pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Name;
     printf("BANK2 IMAGE NAME : ");
-    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;
-        }
-
-
+    for(int i = 0 ; i< 32; i++){
+        pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
+        printf("%c",pdata[i]);
 //        printf("%c",pdata[i]);
     }
     printf("\r\n");
@@ -172,7 +160,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
 
     printf("MBIC BANK %d Booting \r\n",bluecell_Currdatastatus.CPU_Current_Bank);    
 
-    
+
 #if 0 // PYJ.2020.06.25_BEGIN -- 
     for(i = 0; i < 128; i++ ){
         printf("Address : %08x Value :  %02X \r\n",data+i  ,data[i]);
@@ -203,7 +191,6 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
     uint32_t currcrcret = 0,currFileCrc = 0;
     
     int32_t CrcLength = 0;
- 
 
     currFileCrc = 
     ((Currdata[MBIC_BOOT_CRC] << 24 ) 
@@ -265,13 +252,8 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
                 bluecell_Currdatastatus.CPU_Bank1_Image_BuildTime6 = Currdata[MBIC_BOOT_CREATION_TIME + 5];
 
                 pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Name;
-                for(int i = 0 ; i< 41; i++){
-                    if(i < 32){
-                         pdata[i] = Currdata[MBIC_BOOT_FILENAME + i] ;
-                    }
-                    else{
-                     pdata[i] = 0x20;
-                    }
+                for(int i = 0 ; i< 32; i++){
+                     pdata[i] = Currdata[MBIC_BOOT_FILENAME + i] ;
                 }                
         
             }
@@ -297,13 +279,8 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         bluecell_Currdatastatus.CPU_Bank1_Image_Version3 = Bank1data[MBIC_BOOT_VERSION + 2];
 
         pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Name;
-        for(int i = 0 ; i< 41; i++){
-            if(i < 32){
-                pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i] ;
-            }
-            else{
-             pdata[i] = 0x20;
-            }
+        for(int i = 0 ; i< 32; i++){
+            pdata[i] = Bank1data[MBIC_BOOT_FILENAME + i] ;
         }         
 
     }
@@ -324,8 +301,6 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         crcret = crc32(&Bank2data[MBIC_BOOT_DATA], CrcLength);
          printf("File CRC : %x CrcLength : %d \r\n",FileCrc,CrcLength);
     if(crcret != FileCrc){
-   
-   
         if(bluecell_Currdatastatus.CPU_Current_Bank ==HFR_BANK2_SEL){
                 bluecell_Currdatastatus.CPU_Bank2_Image_Version1 = Currdata[MBIC_BOOT_VERSION ] ;
                 bluecell_Currdatastatus.CPU_Bank2_Image_Version2 = Currdata[MBIC_BOOT_VERSION + 1] ;
@@ -338,13 +313,8 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
                 bluecell_Currdatastatus.CPU_Bank2_Image_BuildTime6 = Currdata[MBIC_BOOT_CREATION_TIME + 5];
    
                 pdata = & bluecell_Currdatastatus.CPU_Bank1_Image_Name;
-                for(int i = 0 ; i< 41; i++){
-                    if(i < 32){
-                         pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
-                    }
-                    else{
-                     pdata[i] = 0x20;
-                    }
+                for(int i = 0 ; i< 32; i++){
+                     pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
                 }                
         
         }       
@@ -375,13 +345,8 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
         bluecell_Currdatastatus.CPU_Bank2_Image_Version3 = Bank2data[MBIC_BOOT_VERSION + 2];
    
         pdata = & bluecell_Currdatastatus.CPU_Bank2_Image_Name;
-        for(int i = 0 ; i< 41; i++){
-            if(i < 32){
-                 pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
-            }
-            else{
-             pdata[i] = 0x20;
-            }
+        for(int i = 0 ; i< 32; i++){
+             pdata[i] = Bank2data[MBIC_BOOT_FILENAME + i];
         }  
    
    

Src/main.c

@@ -323,11 +323,6 @@ int main(void)
   PE43711_PinInit();
   EEPROM_M24C08_Init();
   Flash_InitRead();
-
-
-
-
-
   Booting_LedInit();
 //  Booting_LED_Check();
   InitUartQueue(&TerminalQueue);
@@ -376,6 +371,20 @@ int main(void)
 //  printf("Bootloader Test File \r\n");
 //  while(1);
 #endif // PYJ.2020.06.24_END -- 
+  
+  printf("PCB Version : %d.%d \r\n",bluecell_Currdatastatus.PCB_Version[0],bluecell_Currdatastatus.PCB_Version[1]);
+  printf("Serial Number : ");
+  for(int a = 0; a < 20; a++){
+      printf("%c",bluecell_Currdatastatus.Serial_Number[a]);
+  }
+  printf("\r\n");
+  printf("Manufacture_Date : ");
+  for(int a = 0; a < 3; a++){
+      printf("%c",bluecell_Currdatastatus.Manufacture_Date[a]);
+  }
+  printf("\r\n");
+  
+
 
   //NVIC_SystemReset();
 
@@ -391,6 +400,7 @@ int main(void)
     ADC_Check();       /*Det Calc + DL/UL Alarm Check Function*/
     Alarm_Check();     /*Function to check all alarm status variables*/
     FRBT_Operate();
+    SelfTestTimer_Operate();
     
 //    Uart1_Data_Send("A",1);
 //    HAL_Delay(1);
@@ -902,7 +912,7 @@ void DL_Shutdown_Timer(uint8_t Table_num){
   }
 }
 void UL_Shutdown_Timer(uint8_t Table_num){
-    if(bluecell_Currdatastatus.ULO_Shutdown_ON_OFF == true){
+    if(bluecell_Currdatastatus.ULO_Shutdown_ON_OFF == true){/*Shutdown Function On !! */
           if(ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + Table_num] == true){
               DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + Table_num] = 0; // OFF CNT = 0;
               DET_UL_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + Table_num]++;
@@ -916,6 +926,7 @@ void UL_Shutdown_Timer(uint8_t Table_num){
                   DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + Table_num] = MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC;
               }
           }
+          
           if(ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + Table_num] == true){
               DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + Table_num]++;
               if(DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + Table_num] == 0xFFFFFFFF){