주석 제거 / FRBT ON OFF 시 Running 가는 문제 수정

Bluecell_Src/Bluecell_operate.c

@@ -318,13 +318,6 @@ uint8_t FRBT_UserCtrl_Get(){
     return FRBT_UserCtrl;
 }
 
-void DLI_FRBT_ON_OFF_Set(uint8_t val){
-    bluecell_Currdatastatus.DLI_FRBT_ON_OFF = val;
-}
-
-uint8_t DLI_FRBT_ON_OFF_Get(){
-    return bluecell_Currdatastatus.DLI_FRBT_ON_OFF;
-}
 
 
 
@@ -2966,19 +2959,10 @@ bool Bluecell_Operate(uint8_t* data){
         break;
     case Bluecell_FRBT_DaySetting:
         bluecell_Currdatastatus.DLI_FRBT_D_Day = data[BLUECELL_DATA + 1]; 
-#if 0 // PYJ.2020.11.23_BEGIN -- 
-        if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
-            FRBT_UserCtrl = true;
-            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL; 
-            
-        }else{
-            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
-            FRBT_UserCtrl = false;
-        }        
-#endif // PYJ.2020.11.23_END -- 
         
         break;
     case DLI_FRBT_ON_OFF:
+#if 0 // PYJ.2020.12.16_BEGIN -- 
         if(data[BLUECELL_DATA + i] == false){
             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] = 0;
@@ -3003,7 +2987,11 @@ bool Bluecell_Operate(uint8_t* data){
         
         DLI_FRBT_ON_OFF_Set(data[BLUECELL_DATA + i]);
 //        printf("BLUECELL FRBT : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_Status);
-        break;        
+        break;   
+#else
+        DLI_FRBT_ONOFF_Set(data[BLUECELL_DATA + i]);
+
+#endif // PYJ.2020.12.16_END -- 
 #if 0 // PYJ.2020.09.03_BEGIN -- 
     case Bluecell_DL_Det_ALL_Offset:   
         bluecell_Currdatastatus.DL_Det_ALL_Offset = data[BLUECELL_DATA]; 
@@ -4721,7 +4709,6 @@ void TimeSetting(uint8_t* data){
             Prev_Last_Day = Last_Day = TimeCalc();
             return;
         }else{
-
              Last_Day = TimeCalc();
         }
 //        printf("Last Day : %d Prev Day : %d \r\n",Last_Day,Prev_Last_Day);
@@ -5336,14 +5323,11 @@ void DLI_FRBT_ONOFF_Set(bool val){
         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] = 0;
         }
-        Last_Day = 0;
-        Prev_Last_Day = 0;
-        FRBT_UserCtrl = 0;                    
     }
     else{
         bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
     }
-    DLI_FRBT_ON_OFF_Set(val);
+    bluecell_Currdatastatus.DLI_FRBT_ON_OFF  = val;
     bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
     bluecell_Currdatastatus.DLI_FRBT_Atten2_H = DLI_FRBT_ATTEN_DEFALUT;
     bluecell_Currdatastatus.DLI_FRBT_Atten3_H = DLI_FRBT_ATTEN_DEFALUT;
@@ -5353,8 +5337,12 @@ void DLI_FRBT_ONOFF_Set(bool val){
     bluecell_Currdatastatus.DLI_FRBT_Atten3_L= DLI_FRBT_ATTEN_DEFALUT;    
     bluecell_Currdatastatus.DLI_FRBT_Atten4_L= DLI_FRBT_ATTEN_DEFALUT;    
     bluecell_Currdatastatus.DLI_FRBT_D_Day  = DLI_FRBT_DAY_DEFAULT;
-    Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
-    EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_WINDOW_STATUS_ADDRESDS),&DataWrite[0],sizeof(BLUESTATUS_st));
+    Last_Day = 0;
+    Prev_Last_Day = 0;
+    FRBT_UserCtrl = 0;    
+    timeset_init = false;
+//    Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
+//    EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_WINDOW_STATUS_ADDRESDS),&DataWrite[0],sizeof(BLUESTATUS_st));
 }
 bool MBIC_Operate(uint8_t* data){
 //    Bluecell_StructCpy(&Txdata[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
@@ -5364,30 +5352,9 @@ bool MBIC_Operate(uint8_t* data){
     int16_t Tmpdata = 0;
     int16_t Tmpdata2 = 0;    
 	int16_t tempdata = 0;
-    //uint16_t Temp_ADC = 0;
-    //uint16_t i = 0;
-    //double temp = 0;
-    //int16_t Level = 0;
-    //int16_t tmpdata = 0;
     /*Day Save*/
-#if 0 // PYJ.2020.07.03_BEGIN -- 
-    if(bluecell_Currdatastatus.DLI_AGC_ON_OFF == true && bluecell_Currdatastatus.DLI_FRBT_D_Day < 7
-        && 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[MBIC_TIME_0 + i]; /* Curr day */
-        }
-
-        if(FRBT_Day[DLI_FRBT_Time_Day] != PrevFRBT_Day[DLI_FRBT_D_Day])
-            bluecell_Currdatastatus.DLI_FRBT_D_Day++;
-        
-        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 */
-        }        
-    }
-#else
     TimeSetting(&data[MBIC_TIME_0]);
-
-#endif // PYJ.2020.07.03_END -- 
+    
     for(int k = 0; k < 2048; k++)
         TxData[k] = data[k];
     
@@ -5432,9 +5399,6 @@ bool MBIC_Operate(uint8_t* data){
         if(Initialize == false){
             Bluecell_DataInit();
             Bluecell_AttenInitialize();
-//            for(int i = MBIC_TIME_0; i <= MBIC_TIME_5; i++){
-//                FRBT_Day[DLI_FRBT_Time_Year + (i - MBIC_TIME_0)] = data[i]; /* Curr day */
-//            }        
             Initialize = true;
 
         }
@@ -5718,48 +5682,10 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.DLI_FRBT_D_Day = data[MBIC_PAYLOADSTART + 3];
                 if(bluecell_Currdatastatus.DLI_FRBT_D_Day > 7)
                     bluecell_Currdatastatus.DLI_FRBT_D_Day = 7;
-#if 0 // PYJ.2020.11.23_BEGIN -- 
-                if(bluecell_Currdatastatus.DLI_FRBT_D_Day == false){
-                    FRBT_UserCtrl = true;
-                    /*DL Gain Atten Init*/
-                    /*FRBT Atten init*/
-                    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] = 0;
-                    }
-                    Last_Day = 0;
-                    Prev_Last_Day = 0;
-                    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;       
-                }
-                else{
-
-                    for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
-                        StartTimeFRBT_Day[DLI_FRBT_Time_Year + i] = data[MBIC_TIME_0 + i]; /* Curr day */
-                    }
-
-
-                    
-                    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
-                    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 */
-                    }                       
-                    Prev_Last_Day = Last_Day = 0;                    
-                    FRBT_UserCtrl = false;
-                }
-
-                bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
-                bluecell_Currdatastatus.DLI_FRBT_Atten2_H = DLI_FRBT_ATTEN_DEFALUT;
-                bluecell_Currdatastatus.DLI_FRBT_Atten3_H = DLI_FRBT_ATTEN_DEFALUT;
-                bluecell_Currdatastatus.DLI_FRBT_Atten4_H = DLI_FRBT_ATTEN_DEFALUT;
-                bluecell_Currdatastatus.DLI_FRBT_Atten1_L= DLI_FRBT_ATTEN_DEFALUT;    
-                bluecell_Currdatastatus.DLI_FRBT_Atten2_L= DLI_FRBT_ATTEN_DEFALUT;    
-                bluecell_Currdatastatus.DLI_FRBT_Atten3_L= DLI_FRBT_ATTEN_DEFALUT;    
-                bluecell_Currdatastatus.DLI_FRBT_Atten4_L= DLI_FRBT_ATTEN_DEFALUT;                   
-                bluecell_Currdatastatus.DLI_FRBT_D_Day  = DLI_FRBT_DAY_DEFAULT;
-                
-#endif // PYJ.2020.11.23_END -- 
                 break;
             case DLI_FRBT_ON_OFF:
-                if(data[MBIC_PAYLOADSTART + 3] == 0){                
+#if 0 // PYJ.2020.12.16_BEGIN -- 
+                if(data[MBIC_PAYLOADSTART + 3] == 0){       // FRBT OFF          
                     bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL; 
                     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] = 0;
@@ -5781,6 +5707,11 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.DLI_FRBT_Atten3_L= DLI_FRBT_ATTEN_DEFALUT;    
                 bluecell_Currdatastatus.DLI_FRBT_Atten4_L= DLI_FRBT_ATTEN_DEFALUT;    
                 bluecell_Currdatastatus.DLI_FRBT_D_Day  = DLI_FRBT_DAY_DEFAULT;
+#else
+                DLI_FRBT_ONOFF_Set(data[MBIC_PAYLOADSTART + 3]);
+
+#endif // PYJ.2020.12.16_END -- 
+                
 //                printf("data[MBIC_PAYLOADSTART + 3] : %d \r\n",data[MBIC_PAYLOADSTART + 3]);
                 break;
             case  DLI_AGC_ON_OFF                   :
@@ -8088,22 +8019,6 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
             IwillgiveAtten *= -1;
         }
-#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-        printf("==================================\r\n");
-        if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL){
-#if 0
-         bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;
-         bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
-            FRBT_UserCtrl_Set(true);
-#else
-            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_RUNNING;
-            bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
-               FRBT_UserCtrl_Set(false);
-
-#endif
-        }
-
-#endif // PYJ.2020.10.23_END -- 
 
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
             int16_t Ref_A = Limitdata - CurrAtten;
@@ -9144,17 +9059,7 @@ void FRBT_Operate(){
     if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0 ){
         bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_RUNNING;
     }
-#if 0 // PYJ.2020.11.23_BEGIN -- 
-    if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0 || bluecell_Currdatastatus.DLI_AGC_ON_OFF == false){    /*AGC ON ONLY*/
-        if(FRBT_UserCtrl_Get() == true || bluecell_Currdatastatus.DLI_AGC_ON_OFF == false){
-            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;
-        }else{
-            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_RUNNING;
-        }
-//        printf("AGC OFF \r\n");
-        return;
-    }
-#endif // PYJ.2020.11.23_END -- 
+
     
     /*Time Calc*/
     if(bluecell_Currdatastatus.DLI_FRBT_D_Day > 0)