HFR 검수 전날 Factory Setting 후 AGC 안먹는 문제 수정

Bluecell_Src/Bluecell_operate.c

@@ -2790,6 +2790,7 @@ bool Bluecell_Operate(uint8_t* data){
         tempdata /= 10;    
         printf("ATT_DL4 : %d \r\n",tempdata);
 
+#if 0 // PYJ.2020.07.03_BEGIN -- 
         tempdata = (( bluecell_Currdatastatus.DLI_FRBT_Atten1_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.DLI_FRBT_Atten1_L ;
          tempdata /= 10;    
@@ -2804,6 +2805,7 @@ bool Bluecell_Operate(uint8_t* data){
         tempdata +=  bluecell_Currdatastatus.DLI_FRBT_Atten3_L ;
          tempdata /= 10;    
         printf("FRBT 3 : %d \r\n",tempdata);
+#endif // PYJ.2020.07.03_END -- 
 
         tempdata = (( bluecell_Currdatastatus.DLI_FRBT_Atten4_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.DLI_FRBT_Atten4_L ;
@@ -2830,27 +2832,27 @@ bool Bluecell_Operate(uint8_t* data){
         tempdata = (( bluecell_Currdatastatus.ULO_Shutdown_Threshold_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.ULO_Shutdown_Threshold_L ;
         tempdata /= 10;
-        printf("UL Shutdown Threas : %d \r\n",tempdata);        
+        printf("UL ULO_Shutdown_Threshold : %d \r\n",tempdata);        
 
         tempdata = (( bluecell_Currdatastatus.ATT_UL1_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.ATT_UL1_L;
         tempdata /= 10;
-        printf("UL1 Shutdown Threas : %d \r\n",tempdata);
+        printf("UL1 ATT_UL1 : %d \r\n",tempdata);
 
         tempdata = (( bluecell_Currdatastatus.ATT_UL2_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.ATT_UL2_L ;
         tempdata /= 10;
-        printf("UL2 Shutdown Threas : %d \r\n",tempdata);
+        printf("UL2 ATT_UL2 : %d \r\n",tempdata);
 
         tempdata = (( bluecell_Currdatastatus.ATT_UL3_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.ATT_UL3_L ;
         tempdata /= 10;
-        printf("UL3 Shutdown Threas : %d \r\n",tempdata);
+        printf("UL3 ATT_UL3 : %d \r\n",tempdata);
 
         tempdata = (( bluecell_Currdatastatus.ATT_UL4_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.ATT_UL4_L ;
         tempdata /= 10;
-        printf("UL4 Shutdown Threas : %d \r\n",tempdata);   
+        printf("UL4 ATT_U4 : %d \r\n",tempdata);   
 #endif // PYJ.2020.07.01_END -- 
 
 
@@ -2869,37 +2871,37 @@ bool Bluecell_Operate(uint8_t* data){
             printf("ALC%d ATTEN : %d \r\n",2,ALC_TEMP[1]);
             printf("ALC%d ATTEN : %d \r\n",3,ALC_TEMP[2]);
             printf("ALC%d ATTEN : %d \r\n",4,ALC_TEMP[3]);
-            printf("AGC  Alarm 1: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P1);
-            printf("AGC  Alarm 2: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P2);
-            printf("AGC  Alarm 3: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P3);
-            printf("AGC  Alarm 4: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P4);            
+//            printf("AGC  Alarm 1: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P1);
+//            printf("AGC  Alarm 2: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P2);
+//            printf("AGC  Alarm 3: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P3);
+//            printf("AGC  Alarm 4: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P4);            
 
-        printf("Shutdown DL Alarm 1: %d \r\n2:  %d \r\n3: %d \r\n4: %d\r\n",
+        printf("Shutdown DL Alarm 1: %d \r\nShutdown DL Alarm 2:  %d \r\nShutdown DL Alarm 3: %d \r\nShutdown DL Alarm 4: %d\r\n",
             bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P1,
             bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P2,
             bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P3,
             bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P4
             );
-        printf("Shutdown UL Alarm 1: %d \r\n2:  %d \r\n3: %d \r\n4: %d\r\n",
+        printf("Shutdown UL Alarm 1: %d \r\nShutdown UL Alarm 2:  %d \r\nShutdown UL Alarm 3: %d \r\nShutdown UL Alarm 4: %d\r\n",
             bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P1,
             bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P2,
             bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P3,
             bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P4
         );
-        printf("DLI HIGH Threas High Hold 1: %d \r\n2:  %d \r\n3: %d \r\n4: %d\r\n",
+        printf("DLI HIGH Threas High Hold 1: %d \r\nDLI HIGH Threas High Hold2:  %d \r\nDLI HIGH Threas High Hold3: %d \r\nDLI HIGH Threas High Hold4: %d\r\n",
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_HIGH,
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_HIGH,
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_HIGH,
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_HIGH
         );        
 
-        printf("DLI LOW Threas High Hold 1: %d \r\n2:  %d \r\n3: %d \r\n4: %d\r\n",
+        printf("DLI LOW Threas High Hold 1: %d \r\nDLI LOW Threas High Hold 2:  %d \r\nDLI LOW Threas High Hold 3: %d \r\nDLI LOW Threas High Hold 4: %d\r\n",
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_LOW,
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_LOW,
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_LOW,
             bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_LOW
         );              
-        printf("ULO HIGH Threas High Hold 1: %d \r\n2:  %d \r\n3: %d \r\n4: %d\r\n",
+        printf("ULO HIGH Threas High Hold 1: %d \r\nULO HIGH Threas High Hold 2:  %d \r\nULO HIGH Threas High Hold 3: %d \r\nULO HIGH Threas High Hold 4: %d\r\n",
             bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P1_LEVEL_HIGH,
             bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P2_LEVEL_HIGH,
             bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P3_LEVEL_HIGH,
@@ -3246,9 +3248,8 @@ bool Bluecell_Operate(uint8_t* data){
         printf("bluecell_Currdatastatus.CPU_Bank_Select : %d \r\n",bluecell_Currdatastatus.CPU_Bank_Select);
         break;
     case Bluecell_TimeSetting:
-        if(bluecell_Currdatastatus.DLI_AGC_ON_OFF == true 
-        && FRBT_Day_Inc < bluecell_Currdatastatus.DLI_FRBT_D_Day
-        && bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_RUNNING){
+        TimeSetting(&data[BLUECELL_CRCINDEX]);
+#if 0 // PYJ.2020.07.03_BEGIN -- 
             for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
                 FRBT_Day[DLI_FRBT_Time_Year + i] = data[BLUECELL_CRCINDEX + i]; /* Curr day */
 //                printf("data[BLUECELL_CRCINDEX + i] : %d \r\n",data[BLUECELL_CRCINDEX + i]);
@@ -3290,6 +3291,7 @@ bool Bluecell_Operate(uint8_t* data){
 //            PrevFRBT_Day[DLsI_FRBT_Time_Day]);
         }
         printf("Time Set Complete\r\n");
+#endif // PYJ.2020.07.03_END -- 
         break;
      case Bluecell_Factory_Set:
          bluecell_Currdatastatus.Factory_Set_Initialization = data[BLUECELL_DATA + i++];
@@ -4322,14 +4324,7 @@ void Factory_Set(){
     bluecell_Currdatastatus.ATT_DL3_L = DLI_ATTEN_DEFAULT;    
     bluecell_Currdatastatus.ATT_DL4_L = DLI_ATTEN_DEFAULT;    
     
-    bluecell_Prevdatastatus.ATT_DL1_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL2_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL3_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL4_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL1_L = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL2_L = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL3_L = 0xFF;    
-    bluecell_Prevdatastatus.ATT_DL4_L = 0xFF;    
+ 
    
     /*DL GAIN OFFSET*/
     tempdata  = ATTEN_OFFSET_DEFAULT;
@@ -4423,15 +4418,6 @@ void Factory_Set(){
     bluecell_Currdatastatus.ATT_UL4_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.ATT_UL4_L = ((tempdata & 0x00FF));    
 
-    bluecell_Prevdatastatus.ATT_UL1_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL2_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL3_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL4_H = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL1_L = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL2_L = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL3_L = 0xFF;    
-    bluecell_Prevdatastatus.ATT_UL4_L = 0xFF;    
-
     tempdata  = ATTEN_OFFSET_DEFAULT;
     bluecell_Currdatastatus.bluecell_User_UL1_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.bluecell_User_UL1_L = ((tempdata & 0x00FF));        
@@ -4489,8 +4475,29 @@ void Factory_Set(){
           &bluecell_Prevdatastatus.ATT_UL4_H,
           &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4,
           &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count4)  ;   
-         
 
+    DL_PrevIwillgiveAtten[0] = 99; 
+    DL_PrevIwillgiveAtten[1] = 99;         
+    DL_PrevIwillgiveAtten[2] = 99;         
+    DL_PrevIwillgiveAtten[3] = 99;             
+    bluecell_Prevdatastatus.ATT_DL1_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL2_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL3_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL4_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL1_L = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL2_L = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL3_L = 0xFF;    
+    bluecell_Prevdatastatus.ATT_DL4_L = 0xFF;   
+
+
+    bluecell_Prevdatastatus.ATT_UL1_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL2_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL3_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL4_H = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL1_L = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL2_L = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL3_L = 0xFF;    
+    bluecell_Prevdatastatus.ATT_UL4_L = 0xFF;    
 
 
 
@@ -4572,19 +4579,22 @@ void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
 
 }
 void TimeSetting(uint8_t* data){
+    printf("DLI_FRBT_Status : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_Status);
+    printf("DLI_AGC_ON_OFF : %d \r\n",bluecell_Currdatastatus.DLI_AGC_ON_OFF);    
+    printf("DLI_FRBT_D_Day : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_D_Day);    
     if(bluecell_Currdatastatus.DLI_AGC_ON_OFF == true 
     && FRBT_Day_Inc < bluecell_Currdatastatus.DLI_FRBT_D_Day
     && bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_RUNNING){
         for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
             FRBT_Day[DLI_FRBT_Time_Year + i] = data[i]; /* Curr day */
         }
-//        FRBT_Day[DLI_FRBT_Time_Year],
-//        FRBT_Day[DLI_FRBT_Time_Month],
-//        FRBT_Day[DLI_FRBT_Time_Day],
-//        FRBT_Day[DLI_FRBT_Time_Hour],
-//        FRBT_Day[DLI_FRBT_Time_Minute],
-//        FRBT_Day[DLI_FRBT_Time_Second]);
-        
+printf("BLUECELL TIME APPLY : %d - %d - %d - %d - %d - %d \r\n",        
+        FRBT_Day[DLI_FRBT_Time_Year],
+        FRBT_Day[DLI_FRBT_Time_Month],
+        FRBT_Day[DLI_FRBT_Time_Day],
+        FRBT_Day[DLI_FRBT_Time_Hour],
+        FRBT_Day[DLI_FRBT_Time_Minute],
+        FRBT_Day[DLI_FRBT_Time_Second]);
         if(FRBT_Day[DLI_FRBT_Time_Day] != PrevFRBT_Day[DLI_FRBT_Time_Day]){
 //                printf("FRBT_Day[DLI_FRBT_Time_Day] : %d  PrevFRBT_Day[DLI_FRBT_D_Day] : %d \r\n",
 //              FRBT_Day[DLI_FRBT_Time_Day] ,
@@ -4597,20 +4607,18 @@ void TimeSetting(uint8_t* data){
         for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
             PrevFRBT_Day[DLI_FRBT_Time_Year + i] = FRBT_Day[DLI_FRBT_Time_Year + i]; /* Curr day */
         }   
-//            printf("BLUECELL TIME APPLY : %d - %d - %d - %d - %d - %d \r\n",
-//        PrevFRBT_Day[DLI_FRBT_Time_Year],
-//        PrevFRBT_Day[DLI_FRBT_Time_Month],
-//        PrevFRBT_Day[DLI_FRBT_Time_Day],
-//        PrevFRBT_Day[DLI_FRBT_Time_Hour],
-//        PrevFRBT_Day[DLI_FRBT_Time_Minute],
-//        PrevFRBT_Day[DLI_FRBT_Time_Second]);            
-//            printf("FRBT_Day[DLI_FRBT_Time_Day] : %d  PrevFRBT_Day[DLI_FRBT_D_Day] : %d \r\n",
-//        FRBT_Day[DLI_FRBT_Time_Day] ,
-//        PrevFRBT_Day[DLI_FRBT_Time_Day]);
+            printf("BLUECELL TIME APPLY : %d - %d - %d - %d - %d - %d \r\n",
+        PrevFRBT_Day[DLI_FRBT_Time_Year],
+        PrevFRBT_Day[DLI_FRBT_Time_Month],
+        PrevFRBT_Day[DLI_FRBT_Time_Day],
+        PrevFRBT_Day[DLI_FRBT_Time_Hour],
+        PrevFRBT_Day[DLI_FRBT_Time_Minute],
+        PrevFRBT_Day[DLI_FRBT_Time_Second]);            
+            printf("FRBT_Day[DLI_FRBT_Time_Day] : %d  PrevFRBT_Day[DLI_FRBT_D_Day] : %d \r\n",
+        FRBT_Day[DLI_FRBT_Time_Day] ,
+        PrevFRBT_Day[DLI_FRBT_Time_Day]);
     }
     printf("Time Set Complete\r\n");
-
-
 }
 void Carrier_ONOFF(uint8_t val){
     if(val == 1){

Bluecell_Src/eeprom.c

@@ -215,8 +215,8 @@ void EEPROM_M24C08_Init(void){
     bluecell_Currdatastatus.DLI_FRBT_Atten2_L = 0;    
     bluecell_Currdatastatus.DLI_FRBT_Atten3_L = 0;    
     bluecell_Currdatastatus.DLI_FRBT_Atten4_L = 0;
-//    bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
-//    bluecell_Currdatastatus.DLI_FRBT_Status = 0;
+    bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
+//    bluecell_Currdatastatus.DLI_FRBT_Status = 7;
     bluecell_Currdatastatus.ALARM_TESTMODE = 0;
 //    bluecell_Currdatastatus.CPUVERSION1 =  0;
 //    bluecell_Currdatastatus.CPUVERSION2 = 0;

Inc/main.h

@@ -185,7 +185,7 @@ extern I2C_HandleTypeDef hi2c2;
 #define MBIC_ON_MAINTAIN_SEC 3000
 #define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000//5
 #define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 30000//30
-#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000 * 5 //5min
+#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000//60000 * 5 //5min
 
 
 #define MBIC_OFF_MAINTAIN_SEC 10000