SelfTest On/Off 시 Curr Path On 하도록 수정

SelfTest On 할 때 모든 Alarm Off 하도록 변경

Bluecell_Src/Bluecell_operate.c

@@ -1869,8 +1869,138 @@ void Table_LengSet(){
 }
 
 
+typedef enum{
+    ATT_DL_PATH1,
+    ATT_DL_PATH2,
+    ATT_DL_PATH3,
+    ATT_DL_PATH4,
+    ATT_UL_PATH1,
+    ATT_UL_PATH2,
+    ATT_UL_PATH3,
+    ATT_UL_PATH4,    
+};
+
+typedef enum{
+    ATT_DL_ShutdownCnt1,
+    ATT_DL_ShutdownCnt2,
+    ATT_DL_ShutdownCnt3,
+    ATT_DL_ShutdownCnt4,
+    ATT_UL_ShutdownCnt1,
+    ATT_UL_ShutdownCnt2,
+    ATT_UL_ShutdownCnt3,
+    ATT_UL_ShutdownCnt4,    
+};
+
+void Path_Ctrl(uint8_t onoff,uint8_t* Status){
+        if(onoff == true){
+            DL_Path_OnOff(Path1_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_DL1_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL1_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count1);
+            DL_Path_OnOff(Path2_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_DL2_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL2_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count2);
+            DL_Path_OnOff(Path3_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_DL3_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL3_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count3);
+            DL_Path_OnOff(Path4_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_DL4_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL4_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count4);       
+            UL_Path_OnOff(Path1_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_UL1_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL1_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count1);  
+            UL_Path_OnOff(Path2_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_UL2_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL2_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count2);  
+            UL_Path_OnOff(Path3_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_UL3_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL3_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count3);  
+            UL_Path_OnOff(Path4_OnOff,
+                 onoff,
+                 &bluecell_Currdatastatus.ATT_UL4_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL4_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count4);  
+        }else{
+            DL_Path_OnOff(Path1_OnOff,
+                 Status[ATT_DL_PATH1],
+                 &bluecell_Currdatastatus.ATT_DL1_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL1_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count1);
+            DL_Path_OnOff(Path2_OnOff,
+                 Status[ATT_DL_PATH2],
+                 &bluecell_Currdatastatus.ATT_DL2_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL2_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count2);
+            DL_Path_OnOff(Path3_OnOff,
+                 Status[ATT_DL_PATH3],
+                 &bluecell_Currdatastatus.ATT_DL3_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL3_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count3);
+            DL_Path_OnOff(Path4_OnOff,
+                 Status[ATT_DL_PATH4],
+                 &bluecell_Currdatastatus.ATT_DL4_PATH,
+                 &bluecell_Prevdatastatus.ATT_DL4_H,
+                 &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,
+                 &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count4);       
+            UL_Path_OnOff(Path1_OnOff,
+                 Status[ATT_UL_PATH1],
+                 &bluecell_Currdatastatus.ATT_UL1_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL1_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count1);  
+            UL_Path_OnOff(Path2_OnOff,
+                 Status[ATT_UL_PATH2],
+                 &bluecell_Currdatastatus.ATT_UL2_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL2_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count2);  
+            UL_Path_OnOff(Path3_OnOff,
+                 Status[ATT_UL_PATH3],
+                 &bluecell_Currdatastatus.ATT_UL3_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL3_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count3);  
+            UL_Path_OnOff(Path4_OnOff,
+                 Status[ATT_UL_PATH4],
+                 &bluecell_Currdatastatus.ATT_UL4_PATH,
+                 &bluecell_Prevdatastatus.ATT_UL4_H,
+                 &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4,
+                 &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count4);  
+
+        }
+
+}
+uint8_t Prev_PathStatus[8];
+uint8_t Prev_ShutdownCnt[8];
+
 void SelfTest_Operate(uint8_t onoff){
-//        printf("SelfTest %d \r\n ",data[BLUECELL_DATA]);
+    
+    
+//    Carrier_ONOFF(bluecell_Currdatastatus.Carrier_ON_OFF);    
     SelfTest_Ctrl(SelfTest1,
         onoff,
         &bluecell_Currdatastatus.SelfTest,
@@ -1915,14 +2045,41 @@ void SelfTest_Operate(uint8_t onoff){
         bluecell_Currdatastatus.ULO_ALC_ON_OFF = false;
         bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = false;
         bluecell_Currdatastatus.ULO_Shutdown_ON_OFF = false;
-        
+        Prev_PathStatus[ATT_DL_PATH1] = bluecell_Currdatastatus.ATT_DL1_PATH;
+        Prev_PathStatus[ATT_DL_PATH2] = bluecell_Currdatastatus.ATT_DL2_PATH;
+        Prev_PathStatus[ATT_DL_PATH3] = bluecell_Currdatastatus.ATT_DL3_PATH;
+        Prev_PathStatus[ATT_DL_PATH4] = bluecell_Currdatastatus.ATT_DL4_PATH;
+
+        Prev_PathStatus[ATT_UL_PATH1] = bluecell_Currdatastatus.ATT_UL1_PATH;
+        Prev_PathStatus[ATT_UL_PATH2] = bluecell_Currdatastatus.ATT_UL2_PATH;
+        Prev_PathStatus[ATT_UL_PATH3] = bluecell_Currdatastatus.ATT_UL3_PATH;
+        Prev_PathStatus[ATT_UL_PATH4] = bluecell_Currdatastatus.ATT_UL4_PATH;        
+        bluecell_Currdatastatus.Carrier_ON_OFF = onoff; 
 //        printf("ALC AGC OFF\r\n");
     }else{
         bluecell_Currdatastatus.ULO_ALC_ON_OFF = Prev_ALC_OnOff;
         bluecell_Currdatastatus.DLI_AGC_ON_OFF = Prev_AGC_OnOff;
         bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = Prev_DL_Shutdown_OnOff;
         bluecell_Currdatastatus.ULO_Shutdown_ON_OFF = Prev_UL_Shutdown_OnOff;
-    }
+
+          bluecell_Currdatastatus.ATT_DL1_PATH = Prev_PathStatus[ATT_DL_PATH1];
+          bluecell_Currdatastatus.ATT_DL2_PATH = Prev_PathStatus[ATT_DL_PATH2];
+          bluecell_Currdatastatus.ATT_DL3_PATH = Prev_PathStatus[ATT_DL_PATH3];
+          bluecell_Currdatastatus.ATT_DL4_PATH = Prev_PathStatus[ATT_DL_PATH4];
+          bluecell_Currdatastatus.ATT_UL1_PATH = Prev_PathStatus[ATT_UL_PATH1];
+          bluecell_Currdatastatus.ATT_UL2_PATH = Prev_PathStatus[ATT_UL_PATH2];
+          bluecell_Currdatastatus.ATT_UL3_PATH = Prev_PathStatus[ATT_UL_PATH3];
+          bluecell_Currdatastatus.ATT_UL4_PATH = Prev_PathStatus[ATT_UL_PATH4];        
+          bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1  = Prev_ShutdownCnt[ATT_DL_ShutdownCnt1];
+          bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2  = Prev_ShutdownCnt[ATT_DL_ShutdownCnt2];
+          bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3  = Prev_ShutdownCnt[ATT_DL_ShutdownCnt3];
+          bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4  = Prev_ShutdownCnt[ATT_DL_ShutdownCnt4];
+          bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1 = Prev_ShutdownCnt[ATT_UL_ShutdownCnt1];
+          bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2 = Prev_ShutdownCnt[ATT_UL_ShutdownCnt2];
+          bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3 = Prev_ShutdownCnt[ATT_UL_ShutdownCnt3];
+          bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4 = Prev_ShutdownCnt[ATT_UL_ShutdownCnt4];        
+    }
+    Path_Ctrl(onoff,&Prev_PathStatus);
 }
 
 bool Bluecell_Operate(uint8_t* data){
@@ -2097,23 +2254,6 @@ bool Bluecell_Operate(uint8_t* data){
 //		printf("ret : %f ,tmp %f \r\n",ret,tmp );
 		break;
 	case ATT_DL1_PATH 		 :
-#if 0 // PYJ.2020.07.03_BEGIN -- 
-
-        bluecell_Currdatastatus.ATT_DL1_PATH = data[BLUECELL_DATA]; 
-        bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1 = 0;
-        bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count1 = 0xFF;
-        if(data[BLUECELL_DATA]==0){
-            HAL_GPIO_WritePin(PATH_EN_DL1_GPIO_Port,PATH_EN_DL1_Pin,GPIO_PIN_RESET);//CLOCK        
-            DL_PathUserHandl[0] = true;
-        }
-        else{
-            bluecell_Prevdatastatus.ATT_DL1_H = 0xFF;
-            bluecell_Prevdatastatus.ATT_DL1_L =0xFF;
-            DL_PathUserHandl[0] = false;                    
-            HAL_GPIO_WritePin(PATH_EN_DL1_GPIO_Port,PATH_EN_DL1_Pin,GPIO_PIN_SET);//CLOCK
-        }                
-        CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
-#else
 //       printf("DL PATH 1 : %d \r\n",data[BLUECELL_DATA]);
        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
               return true;
@@ -2121,7 +2261,6 @@ bool Bluecell_Operate(uint8_t* data){
            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x80;
        else
           bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x80;
-       printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
 
        DL_Path_OnOff(Path1_OnOff,
@@ -2131,24 +2270,8 @@ bool Bluecell_Operate(uint8_t* data){
             &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1,
             &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count1)  ;  
 
-#endif // PYJ.2020.07.03_END -- 
-	
-
 		break;
 	case ATT_UL1_PATH        :
-#if 0 // PYJ.2020.07.03_BEGIN -- 
-        if(data[BLUECELL_DATA]==0){
-            HAL_GPIO_WritePin(PATH_EN_UL1_GPIO_Port,PATH_EN_UL1_Pin,GPIO_PIN_RESET);//CLOCK
-            bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1 = 0;
-        }
-        else{
-            HAL_GPIO_WritePin(PATH_EN_UL1_GPIO_Port,PATH_EN_UL1_Pin,GPIO_PIN_SET);//CLOCK
-            bluecell_Prevdatastatus.ATT_UL1_H = 0xFF;
-            bluecell_Prevdatastatus.ATT_UL1_L = 0xFF;
-            CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
-
-        }
-#else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                return true;
         if(data[BLUECELL_DATA] != 0)
@@ -2156,7 +2279,6 @@ bool Bluecell_Operate(uint8_t* data){
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x08;
 //        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
-
         UL_Path_OnOff(Path1_OnOff,
              data[BLUECELL_DATA],
              &bluecell_Currdatastatus.ATT_UL1_PATH,
@@ -2164,7 +2286,6 @@ bool Bluecell_Operate(uint8_t* data){
              &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1,
              &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count1)  ;  
 
-#endif // PYJ.2020.07.03_END -- 
         bluecell_Currdatastatus.ATT_UL1_PATH = data[BLUECELL_DATA];
 //        printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
@@ -9319,29 +9440,6 @@ void FRBT_Operate(){
 }
 void LED_Alarm_Check(){
     if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
-#if 0 // PYJ.2020.08.18_BEGIN -- 
-      if(  (bluecell_Currdatastatus.ALARM_TEMP_HIGH      > 0 && bluecell_Currdatastatus.ALARM_MASK1 != false) 
-        || (bluecell_Currdatastatus.ALARM_DLI_Level      > 0 && bluecell_Currdatastatus.ALARM_MASK2 != false)
-        || (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN  > 0 && bluecell_Currdatastatus.ALARM_MASK3 != false)
-        || (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm  > 0 && bluecell_Currdatastatus.ALARM_MASK3 != false)
-        || (bluecell_Currdatastatus.ALARM_ULO_Level      > 0 && bluecell_Currdatastatus.ALARM_MASK4 != false)
-        || (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm  > 0 && bluecell_Currdatastatus.ALARM_MASK5 != false)
-        || (bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN  > 0 && bluecell_Currdatastatus.ALARM_MASK5 != false))
-        {
-    //        AlarmTimerOnSet = true;
-    //        AlarmTimerOffSet = false;
-    //        if(AlarmTimerOnCnt > 3000){
-                Alarm_LED_OnSet  = true;
-    //        }
-        }else{
-    //        AlarmTimerOffSet = true;// False 
-    //        if(AlarmTimerOffCnt > 10000){
-    //            AlarmTimerOnSet = false;
-                Alarm_LED_OnSet = false;
-    //            printf("=================AlarmTimerOffCnt=================\r\n");
-    //        }
-        }
-#else
           if(bluecell_Currdatastatus.SelfTest == true){
               Alarm_LED_OnSet = false;
           }
@@ -9357,8 +9455,6 @@ void LED_Alarm_Check(){
             }else{
                     Alarm_LED_OnSet = false;
             }
-
-#endif // PYJ.2020.08.18_END -- 
     }
     else{
         if(bluecell_Currdatastatus.ALARM_Test_Dummy1         > 0 
@@ -9373,7 +9469,49 @@ void LED_Alarm_Check(){
             Alarm_LED_OnSet = false;
         }
 
+    }
+
 }
+void AlarmCheck_Exception(){
+    if(bluecell_Currdatastatus.SelfTest == true){
+        bluecell_Currdatastatus.ALARM_TEMP_HIGH      = 0; 
+        bluecell_Currdatastatus.ALARM_DLI_Level      = 0;
+        bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN  = 0;
+        bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm  = 0;
+        bluecell_Currdatastatus.ALARM_ULO_Level      = 0;
+        bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm  = 0;
+        bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN  = 0;
+        bluecell_Currdatastatus.Temp_High_Alarm = false;
+        bluecell_Currdatastatus.DLI_AGC_Alarm1 = false;
+        bluecell_Currdatastatus.DLI_AGC_Alarm2 = false;
+        bluecell_Currdatastatus.DLI_AGC_Alarm3 = false;
+        bluecell_Currdatastatus.DLI_AGC_Alarm4 = false;
+        bluecell_Currdatastatus.ULO_ALC_Alarm1 = false;
+        bluecell_Currdatastatus.ULO_ALC_Alarm2 = false;
+        bluecell_Currdatastatus.ULO_ALC_Alarm3 = false;
+        bluecell_Currdatastatus.ULO_ALC_Alarm4 = false;
+        bluecell_Currdatastatus.ULO_Shutdown_Alarm1 = false;            
+        bluecell_Currdatastatus.ULO_Shutdown_Alarm2 = false;            
+        bluecell_Currdatastatus.ULO_Shutdown_Alarm3 = false;            
+        bluecell_Currdatastatus.ULO_Shutdown_Alarm4 = false;
+        bluecell_Currdatastatus.DLI_Shutdown_Alarm1 = false;            
+        bluecell_Currdatastatus.DLI_Shutdown_Alarm2 = false;            
+        bluecell_Currdatastatus.DLI_Shutdown_Alarm3 = false;            
+        bluecell_Currdatastatus.DLI_Shutdown_Alarm4 = false;
+        
+        bluecell_Currdatastatus.DLI_Level_Low_Alarm1 = false;
+        bluecell_Currdatastatus.DLI_Level_Low_Alarm2 = false;
+        bluecell_Currdatastatus.DLI_Level_Low_Alarm3 = false;
+        bluecell_Currdatastatus.DLI_Level_Low_Alarm4 = false;   
+        bluecell_Currdatastatus.DLI_Level_High_Alarm1 = false;            
+        bluecell_Currdatastatus.DLI_Level_High_Alarm2 = false;            
+        bluecell_Currdatastatus.DLI_Level_High_Alarm3 = false;            
+        bluecell_Currdatastatus.DLI_Level_High_Alarm4 = false;  
+        bluecell_Currdatastatus.ULO_Level_High_Alarm1 = false;        
+        bluecell_Currdatastatus.ULO_Level_High_Alarm2 = false;        
+        bluecell_Currdatastatus.ULO_Level_High_Alarm3 = false;        
+        bluecell_Currdatastatus.ULO_Level_High_Alarm4 = false;                
+    }
 
 }
 void Alarm_Check(){
@@ -9391,6 +9529,7 @@ void Alarm_Check(){
     DLI_ShutdownAlarmCheck();   
     DLI_LevelAlarmCheck();
     ULO_LevelAlarmCheck();
+    AlarmCheck_Exception();
 }
 
 typedef struct{