불필요 코드 제거/ DL UL AMP ON OFF 시 Alarm 제거 하도록 수정 /DL Shutdown Alarm 조건 추가

Bluecell_Src/Bluecell_operate.c

@@ -3255,28 +3255,6 @@ uint32_t MBIC_DataSend(uint8_t* data){
         else
             data[MBIC_PAYLOADSTART + i++] = 0;
         
-#if 0 // PYJ.2020.08.18_BEGIN -- 
-        if(bluecell_Currdatastatus.ALARM_MASK2 != false)
-            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_Level;
-        else
-            data[MBIC_PAYLOADSTART + i++] = 0;
-
-        if(bluecell_Currdatastatus.ALARM_MASK3 != false)
-            data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & 0xF0 )
-                                          | (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & 0x0F);
-        else
-            data[MBIC_PAYLOADSTART + i++] = 0;    
-        if(bluecell_Currdatastatus.ALARM_MASK4 != false)                                      
-            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_Level;
-        else
-        data[MBIC_PAYLOADSTART + i++] = 0;
-
-        if(bluecell_Currdatastatus.ALARM_MASK5 != false)
-            data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & 0xF0)
-                                           |(bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & 0x0F);
-        else
-            data[MBIC_PAYLOADSTART + i++] = 0;     
-#else
 //        printf("bluecell_Currdatastatus.ALARM_DLI_Level : %x \r\n",bluecell_Currdatastatus.ALARM_DLI_Level);
 //        printf("bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm : %x \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm);
 //        printf("bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN : %x \r\n",bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN);
@@ -3486,7 +3464,6 @@ uint32_t MBIC_DataSend(uint8_t* data){
         }
         
 
-#endif // PYJ.2020.08.18_END -- 
     }
     /*ALARM BIT MASK*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
@@ -4572,6 +4549,9 @@ void Factory_Set(){
 
 }
 
+
+/*When using the shutdown function, you should never use this function to turn onoff
+Because this function initializes Shutdown related Count and alarm.*/
 void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt){
     GPIO_TypeDef *Port = 0;
     uint16_t Pin = 0;    
@@ -4580,21 +4560,27 @@ void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
         Port = PATH_EN_DL1_GPIO_Port;
         Pin = PATH_EN_DL1_Pin;
         bluecell_Currdatastatus.DLI_Shutdown_Alarm1 = false;
+        bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN &= ~ALARM_DLI_SHUTDOWN_P1;
         break;
         case Path2_OnOff:
         Port = PATH_EN_DL2_GPIO_Port;
         Pin = PATH_EN_DL2_Pin;
 		bluecell_Currdatastatus.DLI_Shutdown_Alarm2 = false;
+        bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN &= ~ALARM_DLI_SHUTDOWN_P2;
         break;
         case Path3_OnOff:
         Port = PATH_EN_DL3_GPIO_Port;
         Pin = PATH_EN_DL3_Pin;
 		bluecell_Currdatastatus.DLI_Shutdown_Alarm3 = false;
+        bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN &= ~ALARM_DLI_SHUTDOWN_P3;
+        
         break;
         case Path4_OnOff:
         Port = PATH_EN_DL4_GPIO_Port;
         Pin = PATH_EN_DL4_Pin;
 		bluecell_Currdatastatus.DLI_Shutdown_Alarm4 = false;
+        bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN &= ~ALARM_DLI_SHUTDOWN_P4;
+        
         break;
     }
     *path = value; 
@@ -4613,6 +4599,9 @@ void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
     CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
 }
+/*When using the shutdown function, you should never use this function to turn onoff
+Because this function initializes Shutdown related Count and alarm.*/
+
 void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt){
     GPIO_TypeDef *Port = 0;
     uint16_t Pin = 0;    
@@ -4622,21 +4611,25 @@ void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
         Port = PATH_EN_UL1_GPIO_Port;
         Pin = PATH_EN_UL1_Pin;
 		bluecell_Currdatastatus.ULO_Shutdown_Alarm1 = false;
+        bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~ALARM_ULO_SHUTDOWN_P1;
         break;
         case Path2_OnOff:
         Port = PATH_EN_UL2_GPIO_Port;
         Pin = PATH_EN_UL2_Pin;
 		bluecell_Currdatastatus.ULO_Shutdown_Alarm2 = false;
+        bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~ALARM_ULO_SHUTDOWN_P2;        
         break;
         case Path3_OnOff:
         Port = PATH_EN_UL3_GPIO_Port;
         Pin = PATH_EN_UL3_Pin;
 		bluecell_Currdatastatus.ULO_Shutdown_Alarm3 = false;
+        bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~ALARM_ULO_SHUTDOWN_P3;        
         break;
         case Path4_OnOff:
         Port = PATH_EN_UL4_GPIO_Port;
         Pin = PATH_EN_UL4_Pin;
 		bluecell_Currdatastatus.ULO_Shutdown_Alarm4 = false;
+        bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~ALARM_ULO_SHUTDOWN_P4;        
         break;
     }
     *path = value; 
@@ -6316,6 +6309,11 @@ void DET_LevelAlarmCheck(){
         }
         Res_DL_dBm[DET_Alarm_DL1_Index + i] *= 0.1;
 #else
+//        if(i == 2){
+//            printf("======================================================\r\n");            
+//            printf("Res_Down_DL_dBm[DET_Alarm_DL1_Index + i] : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Index + i]);
+//        }
+
         Res_Up_DL_dBm[DET_Alarm_DL1_Index + i] = Res_Down_DL_dBm[DET_Alarm_DL1_Index + i];
         if(Res_Up_DL_dBm[DET_Alarm_DL1_Index + i] < 0) 
             Res_Up_DL_dBm[DET_Alarm_DL1_Index + i] -= 9;
@@ -6324,6 +6322,7 @@ void DET_LevelAlarmCheck(){
     
         Res_Down_DL_dBm[DET_Alarm_DL1_Index + i] *= 0.1; // down 
         Res_Up_DL_dBm[DET_Alarm_DL1_Index + i] *= 0.1; // Round
+        
             
 
         
@@ -6525,13 +6524,18 @@ void DET_LevelAlarmCheck(){
 //                    printf("1Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);     
 //                  }
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
-//                printf("Shutdown On 1\r\n");
+//                    if(i == 2){    
+////                        printf("Shutdown On 1\r\n");
+//                    }
             }
             else{
                 if(LimitData_DL_Shutdown - 2 < Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]
                     && MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0 )
                 {
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
+//                    if(i == 2){    
+////                        printf("Shutdown On 1_2\r\n");
+//                    }                    
 //                  if(i == 0){
 //                    printf("2Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);     
 //                  }                    
@@ -6549,6 +6553,9 @@ void DET_LevelAlarmCheck(){
             if(LimitData_DL_Shutdown < Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
                 //            if(DL_Atten[DET_Alarm_DL1_Index + i] * 0.1 <= -15)
                 ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
+//                if(i == 2){    
+////                    printf("Shutdown On 2_1\r\n");
+//                }                
 //                printf("3Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);     
                 //                    printf("Shutdown On 2\r\n");                      
             }
@@ -6557,21 +6564,33 @@ void DET_LevelAlarmCheck(){
                 && MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0 ){
 //                    printf("4Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index ]);                         
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
-                    //                        printf("Shutdown On 2_1\r\n");
+//                    printf("Shutdown On 2_2\r\n");
                 }
+                else if(MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0
+                    && LimitData_DL_Shutdown - 2  < Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
+                    ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
+//                    if(i == 2){
+////                        printf("Shutdown On 2_3\r\n");                                          
+//                    }
+                }                
                 else if(MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] > 0){
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = false;
-                    //                    printf("Shutdown Off 2\r\n");                                          
+//                    if(i == 2){
+////                        printf("Shutdown Off 2\r\n");                                          
+//                    }
                 }
                 else if(MBIC_DL_ShutdownCount[DET_Alarm_DL1_Shutdown_Index + i] == 0
                     && LimitData_DL_Shutdown > Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
                     ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = false;
+//                    if(i == 2){
+////                        printf("Shutdown Off 3\r\n");                                          
+//                    }                    
                 }
             }
 
         }
 #if 0 // PYJ.2020.10.23_BEGIN -- 
-       if(i == 3){
+       if(i == 2){
             printf("======================================================\r\n");
             printf("Res_Down_DL_dBm : %d \r\n",Res_Down_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i ]);
             printf("Res_Up_DL_dBm : %d \r\n",Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]);       
@@ -9502,7 +9521,8 @@ void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t*
         if(DET_DL_Shutdown_Off_AlarmTimerCnt[index] >= MBIC_OFF_MAINTAIN_SEC
             && (*retrycnt) != RETRYCNT_MAX){
             bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN &= ~AlarmFlag;
-            *ShutdownAlarm       = false;            
+            *ShutdownAlarm       = false;         
+            
         }
     } 
     if((*retrycnt) >= 1){
@@ -9618,7 +9638,7 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
         if(DET_UL_Shutdown_Off_AlarmTimerCnt[Index] >= MBIC_OFF_MAINTAIN_SEC
             && (*RetryCnt) != RETRYCNT_MAX){ 
             bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~AlarmFlag;
-            *ShutdownAlarm       = false;            
+            *ShutdownAlarm       = false;      
         }
     } 
     if((*RetryCnt) >= 1){