ALC 알람 설정 함수 추가 / MBIC Data Send 할 때 Alarm 표시 변수 수정 /ALC CALC 에서 Alarm 셋팅 해주는 변수 제거 / ALC 동작 안정화 작업중 ... /

Bluecell_Src/Bluecell_operate.c

@@ -96,6 +96,7 @@ double PE43711_Double(uint8_t high_bit,uint8_t low_bit);
 void Booting_LED_Check(void);
 double Bluecell_TestPro(double value );
 double AGC_AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t size,int8_t* RefTable_Data);
+void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t CurrAtten);
 
 
 
@@ -2671,7 +2672,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_Level;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN;
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_Level;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN;
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm;
     
     /*ALARM BIT MASK*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
@@ -4955,7 +4956,9 @@ int16_t ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
         
 //        printf("2. %f : %f - %d\r\n",ret,CurrDet,threshold);
         ret = Bluecell_TestPro(ret +( CurrAtten * -1));
-        ret *= -1;        
+        ret *= -1;  
+//        if(CurrAtten <= -20)
+//            ALC_AlarmSet[num] = true;
     }
     else if(threshold -2 > CurrDet){
         if(CurrAtten < 0){
@@ -4968,6 +4971,8 @@ int16_t ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
 //             ret *= -1;     
              
 //            printf("4.ret : %f\r\n",ret);
+//            ALC_AlarmSet[num] = false; 
+
         }
          
     }
@@ -4977,18 +4982,38 @@ int16_t ALC_Calc(uint8_t num,double CurrAtten ,int8_t threshold,double CurrDet){
     if(ret < -20){
 //        printf("5. ret1 : %f \r\n",ret);
         ret = -20;
-        ALC_AlarmSet[num] = true;
+        
     }else{
         if(ret > 0){
 //            printf("6. ret1 : %f \r\n",ret);
             ret = 0;
         }
-        ALC_AlarmSet[num] = false; 
+       
     }
 //    printf("ret7 : %f \r\n",ret);
     return ret * 10;
 }
 #define UL_DL_DATASEND_MULTIPLE 10
+void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t Atten){
+    int16_t ret =0;
+    int16_t CurrAtten = 0;
+    CurrAtten = Atten * 0.1;
+        if(threshold < CurrDet){
+            ret = CurrDet - threshold ;
+            ret = Bluecell_TestPro(ret +( CurrAtten / 10 * -1));
+            ret *= -1;  
+            if(CurrAtten <= -20)
+                ALC_AlarmSet[num] = true;
+        }
+        else if(threshold -2 > CurrDet){
+            if(CurrAtten < 0){
+                ret =  (threshold - 2) - CurrDet ;// -27 ///// - 29
+                ret = Bluecell_TestPro(ret);
+                ret += CurrAtten;
+                ALC_AlarmSet[num] = false; 
+            }
+        }
+}
 void ALC_Function(){ //DL 
     //double Volt_Calc_val = 3.3 / 4095;
     //double tempret = 0;
@@ -5081,12 +5106,15 @@ void ALC_Function(){ //DL
     //            Limitdata /= 10;
 
 //                printf("CurrentATTENVALUE : %f\r\n",CurrentATTENVALUE);  
+//                CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L);
 
+////                CurrentATTENVALUE = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H;
                 bluecell_Currdatastatus.ULO_Level1_H = ((int16_t)ResultData & 0xFF00) >> 8;
                 bluecell_Currdatastatus.ULO_Level1_L = ((int16_t)ResultData & 0x00FF);       
                 printf("ORIGIN ResdBm : %f  %d\r\n",ResdBm,Main_Atten[ALC_Alarm_UL1_Index]);
                 printf("After ResdBm : %f \r\n",ResdBm);
                 Limitdata += (Main_Atten[ALC_Alarm_UL1_Index] / 10);
+                ALC_Alarm_TimerSet(ALC_Alarm_UL1_Index,Limitdata,ResdBm,UL_Atten[ALC_Alarm_UL1_Index]);
                 IwillGiveAtten = ALC_Calc(ALC_Alarm_UL1_Index,CurrentATTENVALUE,Limitdata,ResdBm);
                 //IwillGiveAtten = ALC_Calc(ALC_Alarm_UL1_Index,CurrentATTENVALUE,Limitdata,ResdBm);                
                 
@@ -5097,13 +5125,13 @@ void ALC_Function(){ //DL
                         IwillGiveAtten += 10;
                     }
                 }
-
-                if(UL_Atten[ALC_Alarm_UL1_Index] + IwillGiveAtten <= -200){
-
-                    tmpcalc = (-200 + (Main_Atten[ALC_Alarm_UL1_Index] * -1));
-                    IwillGiveAtten =tmpcalc;
-                }
-                    
+//
+//                if(UL_Atten[ALC_Alarm_UL1_Index] + IwillGiveAtten <= -200){
+//
+//                    tmpcalc = (-200 + (Main_Atten[ALC_Alarm_UL1_Index] * -1));
+//                    IwillGiveAtten =tmpcalc;
+//                }
+//                    
                 printf(" UL_Atten[ALC_Alarm_UL1_Index] : %d I WILL GIVE ATTEN  : %d \r\n", UL_Atten[ALC_Alarm_UL1_Index],IwillGiveAtten);  
                 printf("ADC : %f CURR ATT : %f  Threas : %d : I WILL GIVE ATTEN  : %d \r\n",ret,ResdBm , Limitdata,IwillGiveAtten);  
                 printf("==================END================\r\n");                
@@ -5119,19 +5147,11 @@ void ALC_Function(){ //DL
 //                printf("CurrentATTENVALUE %f \r\n",CurrentATTENVALUE);
 /*                if(ALC_Level_Save[ALC_Alarm_UL1_Index] != ResultData
                     || Limitdata != PrevLimitdata[ALC_Alarm_UL1_Index])*/
-                    if(Limitdata != PrevLimitdata[ALC_Alarm_UL1_Index]
-                       ||ResultData!= PrevResultData[ALC_Alarm_UL1_Index]
-                       ||UL_ALC_GainAttenSet[ALC_Alarm_UL1_Index] == true){
                         if( (IwillGiveAtten > 0) || (CurrentATTENVALUE >= (IwillGiveAtten))){
-                            tempcurratten = CurrentATTENVALUE * 10;
-                            bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H = (((uint16_t)((tempcurratten + IwillGiveAtten)) & 0xFF00) >> 8);
-                            bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L = ((uint16_t)(tempcurratten + IwillGiveAtten)) & 0x00FF;
+                            bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H = (((uint16_t)((IwillGiveAtten)) & 0xFF00) >> 8);
+                            bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L = ((uint16_t)(IwillGiveAtten)) & 0x00FF;
                             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
                         }
-                        PrevLimitdata[ALC_Alarm_UL1_Index] = Limitdata; 
-                        PrevResultData[ALC_Alarm_UL1_Index] = ResultData;
-                        UL_ALC_GainAttenSet[ALC_Alarm_UL1_Index] = false;
-                }
 //                CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L);             
 
 //                 printf("CurrentATTENVALUE : %f\r\n",CurrentATTENVALUE );  
@@ -5163,7 +5183,8 @@ void ALC_Function(){ //DL
              ResultData = ResdBm;
             CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L);
             bluecell_Currdatastatus.ULO_Level2_H = ((int16_t)ResultData & 0xFF00) >> 8;
-            bluecell_Currdatastatus.ULO_Level2_L = ((int16_t)ResultData & 0x00FF);       
+            bluecell_Currdatastatus.ULO_Level2_L = ((int16_t)ResultData & 0x00FF); 
+//            CurrentATTENVALUE = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H;
             IwillGiveAtten = ALC_Calc(ALC_Alarm_UL2_Index,CurrentATTENVALUE,Limitdata,ResdBm);
 //            printf("CurrentATTENVALUE : %f I WILL GIVE ATTEN  : %d \r\n",CurrentATTENVALUE,IwillGiveAtten);  
 //            printf("ADC : %f Current : %f  Threas : %d : I WILL GIVE ATTEN  : %d \r\n",ret,ResdBm , Limitdata,IwillGiveAtten);  
@@ -5218,7 +5239,7 @@ void ALC_Function(){ //DL
             CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L);
             bluecell_Currdatastatus.ULO_Level3_H = ((int16_t)ResultData & 0xFF00) >> 8;
             bluecell_Currdatastatus.ULO_Level3_L = ((int16_t)ResultData & 0x00FF);     
-            
+//            CurrentATTENVALUE = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H;
             IwillGiveAtten = ALC_Calc(ALC_Alarm_UL3_Index,CurrentATTENVALUE,Limitdata,ResdBm);
 //                printf("ADC : %f Current : %f  Threas : %d : I WILL GIVE ATTEN  : %d \r\n",ret,ResdBm , Limitdata,IwillGiveAtten);              
             if( (IwillGiveAtten > 0) || (CurrentATTENVALUE >= (IwillGiveAtten * -1))){
@@ -5261,7 +5282,7 @@ void ALC_Function(){ //DL
             CurrentATTENVALUE = PE43711_Double(bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L);
              bluecell_Currdatastatus.ULO_Level4_H = ((int16_t)ResultData & 0xFF00) >> 8;
             bluecell_Currdatastatus.ULO_Level4_L = ((int16_t)ResultData & 0x00FF);           
-            
+////            CurrentATTENVALUE = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H;
             IwillGiveAtten = ALC_Calc(ALC_Alarm_UL4_Index,CurrentATTENVALUE,Limitdata,ResdBm);
             if( (IwillGiveAtten > 0) || (CurrentATTENVALUE >= (IwillGiveAtten * -1))){
                 tempcurratten = CurrentATTENVALUE * 10;