FRBT Default Day 7일로 변경

전원 On OFF 시 FRBT 7일로 셋팅되도록 변경
이전 ALC AGC 값을 저장 하기위한 변수 추가
(HFR 김종완차장 요청 사항 )
 -FRBT User 가 Day를 0으로 셋팅 했을 때 FRBT Off로 사용 하도록 변경
 -와 시간이 흘러 0으로 셋팅 됬을 때 FRBT ON으로 사용 하도록 변경
(HFR 최성철부장 요청 사항 )
 - SelfTest OnOFF 할 떄 시스템 Delay 0.5초씩

Bluecell_Inc/Bluecell_operate.h

@@ -59,6 +59,10 @@ ETX
 
 #define MBIC_BANK1_NUM 1
 #define MBIC_BANK2_NUM 2
+typedef enum{
+    DL_Level_H,
+    DL_Level_L,        
+};
 
 typedef enum{
 	AllDataReq = 0,      // -> Response 80
@@ -543,6 +547,77 @@ ULO_ALC_Atten,
 
 #define MBIC_CPUVERSION 0x000000
 
+
+
+
+#define ALAMASK_DEFAULT 1
+#define Temp_THREADHOLD_DEFAULT 80
+#define CARRIER_DEFAULT 1
+#define DLI_PATH_DEFAULT
+#define DLI_GAIN_ATT_DEFAULT 0
+#define ULO_GAIN_ATT_DEFAULT -200
+
+#define TEMP_OFFSET_DEFAULT 0
+#define CARRIER_ONOF_DEFAULT 1
+#define PATH_DEFAULT true
+#define DLI_ATTEN_DEFAULT 0
+#define ULO_ATTEN_DEFAULT 0
+
+#define ATTEN_OFFSET_DEFAULT -30
+#define DLI_ATTEN_HIGHTHREADHOLD_DEFAULT 60
+#define DLI_ATTEN_LOWTHREADHOLD_DEFAULT -250
+#define DLI_FRBT_DAY_DEFAULT 7
+#define DLI_FRBT_ATTEN_DEFALUT 0 ;
+#define DLI_AGC_ONOFF_DEFAULT true
+#define DLI_AGC_THREADHOLD_DEFAULT -100
+#define DLI_SHUTDOWN_ONOFF_DEFAULT true
+#define DLI_SHUTDOWN_THREADHOLD_DEFAULT 70
+#define ULO_LEVEL_HIGH_THREADHOLD_DEFAULT -190
+#define SELFTEST_DEFALULT_DEFAULT false
+#define ULO_ALC_ONOFF_DEFAULT true
+#define ULO_ALC_THREADHOLD_DEFAULT -200
+#define ULO_SHUTDOWN_ONOFF_DEFAULT true
+#define ULO_SHUTDOWN_THREADHOLD_DEFAULT -180
+
+#define TableDataSetting_ATT_DL_LEVEL_STEP -1 
+#define TableDataSetting_ATT_UL_LEVEL_STEP -1 
+#define MBIC_AID  0xE0
+
+#define Temp_High 				0xE014
+#define DLI_P4_Level_Low		0xE043
+#define DLI_P3_Level_Low 		0xE042
+#define DLI_P2_Level_Low		0xE041
+#define DLI_P1_Level_Low		0xE040
+#define DLI_P4_Level_High		0xE047
+#define DLI_P3_Level_High		0xE046
+#define DLI_P2_Level_High		0xE045
+#define DLI_P1_Level_High		0xE044
+#define DLI_P4_AGC_Alarm		0xE05A
+#define DLI_P3_AGC_Alarm		0xE059
+#define DLI_P2_AGC_Alarm		0xE058
+#define DLI_P1_AGC_Alarm		0xE057
+#define DLI_P4_Shutdown_Alarm	0xE05E
+#define DLI_P3_Shutdown_Alarm	0xE05D
+#define DLI_P2_Shutdown_Alarm	0xE05C
+#define DLI_P1_Shutdown_Alarm	0xE05B
+#define ULO_P4_Level_High		0xE073
+#define ULO_P3_Level_High		0xE072
+#define ULO_P2_Level_High		0xE071
+#define ULO_P1_Level_High		0xE070
+#define ULO_P4_ALC_Alarm		0xE08A
+#define ULO_P3_ALC_Alarm		0xE089
+#define ULO_P2_ALC_Alarm		0xE088
+#define ULO_P1_ALC_Alarm		0xE087
+#define ULO_P4_Shutdown			0xE08E
+#define ULO_P3_Shutdown		    0xE08D
+#define ULO_P2_Shutdown		    0xE08C
+#define ULO_P1_Shutdown		    0xE08B
+typedef enum{
+    FRBT_IDEL = 0,
+    FRBT_TRACKING,
+    FRBT_RUNNING,
+}FRBT_Status_I;
+
 typedef enum{
     MBIC_Shutdown_DL1 = 0,
     MBIC_Shutdown_DL2,
@@ -640,6 +715,7 @@ enum DATATYPE
     Bluecell_Path2_GainValue,
     Bluecell_Path3_GainValue,
     Bluecell_Path4_GainValue,
+    Bluecell_FRBT_DaySetting,
 };
 typedef enum{    
 	DLI_P1_Level_Table_Number = 0x00,
@@ -1032,7 +1108,17 @@ typedef struct{
     uint8_t SelfTest_ATT_UL3_L;
     uint8_t SelfTest_ATT_UL4_H;
     uint8_t SelfTest_ATT_UL4_L;
-    uint8_t Reserve[24];
+
+    uint8_t Prev_ATT_ALC1_H;
+    uint8_t Prev_ATT_ALC1_L;
+    uint8_t Prev_ATT_ALC2_H;
+    uint8_t Prev_ATT_ALC2_L;
+    uint8_t Prev_ATT_ALC3_H;
+    uint8_t Prev_ATT_ALC3_L;
+    uint8_t Prev_ATT_ALC4_H;
+    uint8_t Prev_ATT_ALC4_L;
+    
+    uint8_t Reserve[16];
     /**/
     uint8_t bluecell_crc_H;
     uint8_t bluecell_crc_L;

Bluecell_Src/Bluecell_operate.c

@@ -93,6 +93,8 @@ extern uint8_t Led_ToggleCntSet;
 
 
 extern volatile uint32_t SelfTestLifeCnt;
+volatile uint8_t Prev_ALC_OnOff = 0;
+volatile uint8_t Prev_AGC_OnOff = 0;
 
 /***************************************************************************************/
 /*                                  Function                                           */
@@ -110,7 +112,7 @@ void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t Cu
 void Carrier_ONOFF(uint8_t val);
 void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt);
 void Factory_Set();
-void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,uint8_t* UL_Atten,uint8_t* Prev_DL_Atten,uint8_t* Prev_UL_Atten);
+void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,uint8_t* UL_Atten,uint8_t* Prev_DL_Atten,uint8_t* Prev_UL_Atten,uint8_t* ALC_Atten,uint8_t* Prev_ALC_Atten);
 void TimeSetting(uint8_t* data);
 void Temp_Shutdown_ONOFF(uint8_t val);
 
@@ -121,68 +123,6 @@ int16_t Temperature_Offset_Get(int8_t* Temp_Table,int8_t CurrTemp);
 /*                                  Valuable                                           */
 /***************************************************************************************/
 
-#define ALAMASK_DEFAULT 1
-#define Temp_THREADHOLD_DEFAULT 80
-#define CARRIER_DEFAULT 1
-#define DLI_PATH_DEFAULT
-#define DLI_GAIN_ATT_DEFAULT 0
-#define ULO_GAIN_ATT_DEFAULT -200
-
-#define TEMP_OFFSET_DEFAULT 0
-#define CARRIER_ONOF_DEFAULT 1
-#define PATH_DEFAULT true
-#define DLI_ATTEN_DEFAULT 0
-#define ULO_ATTEN_DEFAULT 0
-
-#define ATTEN_OFFSET_DEFAULT -30
-#define DLI_ATTEN_HIGHTHREADHOLD_DEFAULT 60
-#define DLI_ATTEN_LOWTHREADHOLD_DEFAULT -250
-#define DLI_FRBT_DAY_DEFAULT 7
-#define DLI_FRBT_ATTEN_DEFALUT 0 ;
-#define DLI_AGC_ONOFF_DEFAULT true
-#define DLI_AGC_THREADHOLD_DEFAULT -100
-#define DLI_SHUTDOWN_ONOFF_DEFAULT true
-#define DLI_SHUTDOWN_THREADHOLD_DEFAULT 70
-#define ULO_LEVEL_HIGH_THREADHOLD_DEFAULT -190
-#define SELFTEST_DEFALULT_DEFAULT false
-#define ULO_ALC_ONOFF_DEFAULT true
-#define ULO_ALC_THREADHOLD_DEFAULT -200
-#define ULO_SHUTDOWN_ONOFF_DEFAULT true
-#define ULO_SHUTDOWN_THREADHOLD_DEFAULT -180
-
-#define TableDataSetting_ATT_DL_LEVEL_STEP -1 
-#define TableDataSetting_ATT_UL_LEVEL_STEP -1 
-#define MBIC_AID  0xE0
-
-#define Temp_High 				0xE014
-#define DLI_P4_Level_Low		0xE043
-#define DLI_P3_Level_Low 		0xE042
-#define DLI_P2_Level_Low		0xE041
-#define DLI_P1_Level_Low		0xE040
-#define DLI_P4_Level_High		0xE047
-#define DLI_P3_Level_High		0xE046
-#define DLI_P2_Level_High		0xE045
-#define DLI_P1_Level_High		0xE044
-#define DLI_P4_AGC_Alarm		0xE05A
-#define DLI_P3_AGC_Alarm		0xE059
-#define DLI_P2_AGC_Alarm		0xE058
-#define DLI_P1_AGC_Alarm		0xE057
-#define DLI_P4_Shutdown_Alarm	0xE05E
-#define DLI_P3_Shutdown_Alarm	0xE05D
-#define DLI_P2_Shutdown_Alarm	0xE05C
-#define DLI_P1_Shutdown_Alarm	0xE05B
-#define ULO_P4_Level_High		0xE073
-#define ULO_P3_Level_High		0xE072
-#define ULO_P2_Level_High		0xE071
-#define ULO_P1_Level_High		0xE070
-#define ULO_P4_ALC_Alarm		0xE08A
-#define ULO_P3_ALC_Alarm		0xE089
-#define ULO_P2_ALC_Alarm		0xE088
-#define ULO_P1_ALC_Alarm		0xE087
-#define ULO_P4_Shutdown			0xE08E
-#define ULO_P3_Shutdown		    0xE08D
-#define ULO_P2_Shutdown		    0xE08C
-#define ULO_P1_Shutdown		    0xE08B
 
 
 int8_t DL_DET_Table_ref[AGC_Table_DL_Ref_Index_MAX][TABLE_LENGTH_MAX];
@@ -196,7 +136,7 @@ bool UL_ALC_GainAttenSet[ALC_Alarm_UL_Index_MAX];
 int16_t ALC_Level_Save[ALC_Alarm_UL_Index_MAX];
 bool Initialize;
 bool AGC_AlarmSet[AGC_Alarm_DL_Index_MAX];
-uint8_t FRBT_Day_Inc;
+uint8_t FRBT_UserCtrl = 0;
 uint16_t ADC3Ret[5];
 volatile uint8_t LED_TestCnt = 0;
 uint8_t TxData[2048];
@@ -250,11 +190,7 @@ volatile uint8_t StartTimeFRBT_Day[6] = {0,}; /*Start day Register*/
 uint8_t FRBT_Day[6] = {0,}; /*Curr day Register*/
 uint8_t PrevFRBT_Day[6] = {0,}; /*Prev day Register*/
 
-typedef enum{
-    FRBT_IDEL = 0,
-    FRBT_TRACKING,
-    FRBT_RUNNING,
-}FRBT_Status_I;
+
 typedef enum{
     Path1_OnOff = 0,
     Path2_OnOff,
@@ -361,6 +297,12 @@ void Boot_LED_Toggle(void){
   
 }
 
+void FRBT_UserCtrl_Set(uint8_t set){
+    FRBT_UserCtrl = set;
+}
+uint8_t FRBT_UserCtrl_Get(){
+    return FRBT_UserCtrl;
+}
 
 
 
@@ -2167,10 +2109,20 @@ bool Bluecell_Operate(uint8_t* data){
 		break;
 	case ATT_SelfTest		 :
 //        printf("SelfTest %d \r\n ",data[BLUECELL_DATA]);
-        SelfTest_Ctrl(SelfTest1,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_UL1_H,&bluecell_Currdatastatus.SelfTest_ATT_DL1_H,&bluecell_Currdatastatus.SelfTest_ATT_UL1_H);
-        SelfTest_Ctrl(SelfTest2,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H,&bluecell_Currdatastatus.SelfTest_ATT_DL2_H,&bluecell_Currdatastatus.SelfTest_ATT_UL2_H);        
-        SelfTest_Ctrl(SelfTest3,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H,&bluecell_Currdatastatus.SelfTest_ATT_DL3_H,&bluecell_Currdatastatus.SelfTest_ATT_UL3_H);        
-        SelfTest_Ctrl(SelfTest4,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H,&bluecell_Currdatastatus.SelfTest_ATT_DL4_H,&bluecell_Currdatastatus.SelfTest_ATT_UL4_H);                
+        SelfTest_Ctrl(SelfTest1,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_UL1_H,&bluecell_Currdatastatus.SelfTest_ATT_DL1_H,&bluecell_Currdatastatus.SelfTest_ATT_UL1_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,&bluecell_Currdatastatus.Prev_ATT_ALC1_H);
+        SelfTest_Ctrl(SelfTest2,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H,&bluecell_Currdatastatus.SelfTest_ATT_DL2_H,&bluecell_Currdatastatus.SelfTest_ATT_UL2_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,&bluecell_Currdatastatus.Prev_ATT_ALC2_H);
+        SelfTest_Ctrl(SelfTest3,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H,&bluecell_Currdatastatus.SelfTest_ATT_DL3_H,&bluecell_Currdatastatus.SelfTest_ATT_UL3_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,&bluecell_Currdatastatus.Prev_ATT_ALC3_H);
+        SelfTest_Ctrl(SelfTest4,data[BLUECELL_DATA],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H,&bluecell_Currdatastatus.SelfTest_ATT_DL4_H,&bluecell_Currdatastatus.SelfTest_ATT_UL4_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,&bluecell_Currdatastatus.Prev_ATT_ALC4_H);
+        HAL_Delay(500);
+        if(bluecell_Currdatastatus.SelfTest == true){
+            Prev_ALC_OnOff = bluecell_Currdatastatus.ULO_ALC_ON_OFF;
+            Prev_AGC_OnOff = bluecell_Currdatastatus.DLI_AGC_ON_OFF;
+            bluecell_Currdatastatus.DLI_AGC_ON_OFF = false;
+            bluecell_Currdatastatus.ULO_ALC_ON_OFF = false;
+        }else{
+            bluecell_Currdatastatus.ULO_ALC_ON_OFF = Prev_ALC_OnOff;
+            bluecell_Currdatastatus.DLI_AGC_ON_OFF = Prev_AGC_OnOff;
+        }
 #if 0 // PYJ.2020.09.03_BEGIN -- 
         if(bluecell_Currdatastatus.SelfTest == false && bluecell_Currdatastatus.SelfTest != data[BLUECELL_DATA]){
             bluecell_Currdatastatus.SelfTest_ATT_DL1_H = bluecell_Currdatastatus.ATT_DL1_H;
@@ -2853,13 +2805,13 @@ bool Bluecell_Operate(uint8_t* data){
 //                  FRBT_Day[DLI_FRBT_Time_Day] ,
 //                  PrevFRBT_Day[DLI_FRBT_Time_Day]);
 #if 1 // PYJ.2020.07.02_BEGIN -- 
-                FRBT_Day_Inc++;
+                FRBT_UserCtrl++;
                 bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING;
 #else
             bluecell_Currdatastatus.DLI_FRBT_D_Day = 7;
             bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING;
 #endif // PYJ.2020.07.02_END -- 
-                printf("D day Plus : %d \r\n",FRBT_Day_Inc);
+                printf("D day Plus : %d \r\n",FRBT_UserCtrl);
             }
             
             for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
@@ -2912,6 +2864,17 @@ bool Bluecell_Operate(uint8_t* data){
             bluecell_Currdatastatus.Manufacture_Date[i] = data[BLUECELL_DATA + i]; 
         }
         break;
+    case Bluecell_FRBT_DaySetting:
+        bluecell_Currdatastatus.DLI_FRBT_D_Day = data[BLUECELL_DATA + 1]; 
+        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;
+        }        
+        break;
 #if 0 // PYJ.2020.09.03_BEGIN -- 
     case Bluecell_DL_Det_ALL_Offset:   
         bluecell_Currdatastatus.DL_Det_ALL_Offset = data[BLUECELL_DATA]; 
@@ -4240,7 +4203,8 @@ void Factory_Set(){
 
 
     bluecell_Currdatastatus.DLI_FRBT_D_Day = DLI_FRBT_DAY_DEFAULT;
-    
+    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
+    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;
@@ -4478,9 +4442,9 @@ 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);    
-//    printf("Curr Day %d \r\n ",FRBT_Day_Inc);
+//    printf("Curr Day %d \r\n ",FRBT_UserCtrl);
     if(bluecell_Currdatastatus.DLI_AGC_ON_OFF == true 
-    && FRBT_Day_Inc < bluecell_Currdatastatus.DLI_FRBT_D_Day
+  //  && FRBT_UserCtrl < 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 */
@@ -4497,9 +4461,14 @@ void TimeSetting(uint8_t* data){
 //                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]);
-            FRBT_Day_Inc++;
+//            FRBT_UserCtrl++;
+            bluecell_Currdatastatus.DLI_FRBT_D_Day--;
+        
+            if(bluecell_Currdatastatus.DLI_FRBT_D_Day > 7)
+                bluecell_Currdatastatus.DLI_FRBT_D_Day = 7;
+            
             bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING;
-//            printf("D day Plus : %d \r\n",FRBT_Day_Inc);
+//            printf("D day Plus : %d \r\n",FRBT_UserCtrl);
         }
         
         for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
@@ -5381,11 +5350,12 @@ bool MBIC_Operate(uint8_t* data){
             case DLI_FRBT_D_Day: 
                 bluecell_Currdatastatus.DLI_FRBT_D_Day = data[MBIC_PAYLOADSTART + 3];
                 if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
-                    FRBT_Day_Inc = 0;
+                    FRBT_UserCtrl = true;
                     bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL; 
                     
                 }else{
                     bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
+                    FRBT_UserCtrl = false;
                 }
                 break;
 
@@ -5401,14 +5371,14 @@ bool MBIC_Operate(uint8_t* data){
                        PrevFRBT_Day[DLI_FRBT_Time_Year + i] = FRBT_Day[DLI_FRBT_Time_Year + i] = 0;
                     }
 
-                    FRBT_Day_Inc = 0;
+//                    FRBT_UserCtrl = 0;
                     bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;                    
                     bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm = 0;
                 }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 */
                     }
-                    FRBT_Day_Inc = 1;
+//                    FRBT_UserCtrl = 1;
 //                    printf("FRBT Tracking START \r\n");
 //                    printf("FRBT Start Time Save : %d Y %d M %d D %d H %d M %d S\r\n",
 //                    StartTimeFRBT_Day[DLI_FRBT_Time_Year],
@@ -5663,10 +5633,21 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.Path4_GainValue = data[MBIC_PAYLOADSTART + 3];
                 break;
             case ULO_SelfTest_ONOFF:
-                SelfTest_Ctrl(SelfTest1,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_UL1_H,&bluecell_Currdatastatus.SelfTest_ATT_DL1_H,&bluecell_Currdatastatus.SelfTest_ATT_UL1_H);
-                SelfTest_Ctrl(SelfTest2,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H,&bluecell_Currdatastatus.SelfTest_ATT_DL2_H,&bluecell_Currdatastatus.SelfTest_ATT_UL2_H);
-                SelfTest_Ctrl(SelfTest3,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H,&bluecell_Currdatastatus.SelfTest_ATT_DL3_H,&bluecell_Currdatastatus.SelfTest_ATT_UL3_H);
-                SelfTest_Ctrl(SelfTest4,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H,&bluecell_Currdatastatus.SelfTest_ATT_DL4_H,&bluecell_Currdatastatus.SelfTest_ATT_UL4_H);
+                SelfTest_Ctrl(SelfTest1,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_UL1_H,&bluecell_Currdatastatus.SelfTest_ATT_DL1_H,&bluecell_Currdatastatus.SelfTest_ATT_UL1_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,&bluecell_Currdatastatus.Prev_ATT_ALC1_H);
+                SelfTest_Ctrl(SelfTest2,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H,&bluecell_Currdatastatus.SelfTest_ATT_DL2_H,&bluecell_Currdatastatus.SelfTest_ATT_UL2_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,&bluecell_Currdatastatus.Prev_ATT_ALC2_H);
+                SelfTest_Ctrl(SelfTest3,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H,&bluecell_Currdatastatus.SelfTest_ATT_DL3_H,&bluecell_Currdatastatus.SelfTest_ATT_UL3_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,&bluecell_Currdatastatus.Prev_ATT_ALC3_H);
+                SelfTest_Ctrl(SelfTest4,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.SelfTest,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H,&bluecell_Currdatastatus.SelfTest_ATT_DL4_H,&bluecell_Currdatastatus.SelfTest_ATT_UL4_H,&bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,&bluecell_Currdatastatus.Prev_ATT_ALC4_H);
+                HAL_Delay(500);
+                if(bluecell_Currdatastatus.SelfTest == true){
+                    Prev_ALC_OnOff = bluecell_Currdatastatus.ULO_ALC_ON_OFF;
+                    Prev_AGC_OnOff = bluecell_Currdatastatus.DLI_AGC_ON_OFF;
+                    bluecell_Currdatastatus.DLI_AGC_ON_OFF = false;
+                    bluecell_Currdatastatus.ULO_ALC_ON_OFF = false;
+                }else{
+                    bluecell_Currdatastatus.ULO_ALC_ON_OFF = Prev_ALC_OnOff;
+                    bluecell_Currdatastatus.DLI_AGC_ON_OFF = Prev_AGC_OnOff;
+                }
+
 #if 0 // PYJ.2020.09.03_BEGIN -- 
                 if(bluecell_Currdatastatus.SelfTest == false){
                     printf("SelfTest ON\r\n");
@@ -8044,6 +8025,9 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
     ret  =  ((ULO_ADC_Level[ULO_ALC_H] << 8 | ULO_ADC_Level[ULO_ALC_L]) * 0.001);
     /*Curr UL Value*/
     ResdBm = AutoControl_ADC_Compare(ret,&UL_Table->Table_Det_15_dBm_H,UL_Table->Table_Length * 2,&UL_DET_Table_ref[TableIndex][TABLE_MAX_VALUE]);
+    
+//    ResdBm = (int16_t)(ULO_Level[ULO_ALC_H] << 8 |  ULO_Level[ULO_ALC_L]);
+//    ResdBm = (int16_t)Bluecell_TestPro( ResdBm / 10);
     //ret 현재 Voltage 값 출력
     //ret 에 따른 현재 DBM 구현
 
@@ -8309,7 +8293,7 @@ void AGC_Alarm_Check(uint8_t Path_Index,double AGC_Det,uint8_t* AGC_Table,uint16
 #if 1 // PYJ.2020.06.27_BEGIN -- 
 void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tableindex,uint8_t* DLI_ADC_Level,uint8_t* DLI_Level,DET_TABLEDL_st* DL_Table,uint8_t* FRBT){
         double ret = 0;
-        int8_t ResdBm = 0;
+        int16_t ResdBm = 0;
         int16_t CurrAtten = 0;
         int16_t Levelret = 0;
         int i = 0;
@@ -8335,21 +8319,24 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 
         CurrAtten = (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]);
         CurrAtten *= 0.1;
-        ResdBm = (int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
-        DLI_Level[DLI_AGC_H] = ((int16_t)ResdBm & 0xFF00) >> 8;
-        DLI_Level[DLI_AGC_L] = ((int16_t)ResdBm & 0x00FF);
+        ResdBm = (int16_t)(DLI_Level[DLI_AGC_H] << 8 |  DLI_Level[DLI_AGC_L]);//(int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
+        ResdBm = (int16_t)Bluecell_TestPro( ResdBm / 10);
+//        DLI_Level[DLI_AGC_H] = ((int16_t)ResdBm & 0xFF00) >> 8;
+//        DLI_Level[DLI_AGC_L] = ((int16_t)ResdBm & 0x00FF);
         for(i = 0; i < sizeof(AGC_dBm_t); i++){
             if(AGC_Table[i] == ResdBm)
                 break;
         }
         IwillgiveAtten = AGC_Calc(Limitdata,ResdBm);
         IwillgiveAtten *= -1;
-//        printf("==================================\r\n");
-//        printf("Curr ATTEN %d \r\n",CurrAtten );
-//        printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
-//        printf("ResdBm : DL%d : %d \r\n",Tableindex+1,ResdBm);
-//        printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
-//        printf("AGC  : %d\r\n",Limitdata);
+#if 0 // PYJ.2020.09.14_BEGIN -- 
+        printf("==================================\r\n");
+        printf("Curr ATTEN %d \r\n",CurrAtten );
+        printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
+        printf("ResdBm : DL%d : %d \r\n",Tableindex+1,ResdBm);
+        printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
+        printf("AGC  : %d\r\n",Limitdata);
+#endif // PYJ.2020.09.14_END -- 
         if((CurrAtten) < IwillgiveAtten)
             IwillgiveAtten = (CurrAtten );
 
@@ -8407,10 +8394,7 @@ int16_t Temperature_Offset_Get(int8_t* Temp_Table,int8_t CurrTemp){
 //    printf("Temp Table : %x \r\n",Temp_Table[0] << 8 | Temp_Table[1]);
 
 }
-typedef enum{
-    DL_Level_H,
-    DL_Level_L,        
-};
+
 void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,DET_TABLEDL_st* DL_Table,uint8_t* Level){
     double ret = 0;//  
     uint8_t* AGC_Table;
@@ -9180,12 +9164,11 @@ void SelfTest_TimerOff(uint8_t num,uint8_t* selftest){
     HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
 }
 
-void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,uint8_t* UL_Atten,uint8_t* Prev_DL_Atten,uint8_t* Prev_UL_Atten){
+void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,uint8_t* UL_Atten,uint8_t* Prev_DL_Atten,uint8_t* Prev_UL_Atten,uint8_t* ALC_Atten,uint8_t* Prev_ALC_Atten){
     GPIO_TypeDef *Port = 0;
     uint16_t Pin = 0;
     GPIO_TypeDef *_Port = 0;
     uint16_t _Pin = 0;   
-    
     switch(num){
         case SelfTest1:
         _Port = _PATH_SW1_GPIO_Port;
@@ -9228,13 +9211,17 @@ void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,u
         Prev_DL_Atten[Atten_L] = DL_Atten[Atten_L];
         Prev_UL_Atten[Atten_H] = UL_Atten[Atten_H];
         Prev_UL_Atten[Atten_L] = UL_Atten[Atten_L];
+        Prev_ALC_Atten[Atten_H] = ALC_Atten[Atten_H];
+        Prev_ALC_Atten[Atten_L] = ALC_Atten[Atten_L];        
 
 //        for(int i =0; i< 8; i++)
 //            printf("Selftest_UL_PrevAttenSave[%d] : %x \r\n",i,Selftest_UL_PrevAttenSave[i]);        
         DL_Atten[Atten_H] = 0;
         DL_Atten[Atten_L] = 0;
         UL_Atten[Atten_H] = 0;
-        UL_Atten[Atten_L] = 0;          
+        UL_Atten[Atten_L] = 0;    
+        ALC_Atten[Atten_H] = 0;    
+        ALC_Atten[Atten_L] = 0;    
         HAL_GPIO_WritePin(_Port,_Pin,GPIO_PIN_SET);//CLOCK
         HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_RESET);//CLOCK
     }else{
@@ -9248,6 +9235,8 @@ void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,u
     DL_Atten[Atten_L] = Prev_DL_Atten[Atten_L];
     UL_Atten[Atten_H] = Prev_UL_Atten[Atten_H];
     UL_Atten[Atten_L] = Prev_UL_Atten[Atten_L];
+    ALC_Atten[Atten_H] = Prev_ALC_Atten[Atten_H];
+    ALC_Atten[Atten_L] = Prev_ALC_Atten[Atten_L];    
 
 #endif // PYJ.2020.09.03_END -- 
 //        for(int i =0; i< 8; i++)
@@ -9273,15 +9262,19 @@ void SelfTestTimer_Operate()
     SelfTest_TimerOff(SelfTest4,&bluecell_Currdatastatus.SelfTest);
 }
 void FRBT_Operate(){
-
     if(bluecell_Currdatastatus.DLI_FRBT_D_Day == 0  || bluecell_Currdatastatus.DLI_AGC_ON_OFF == false){    /*AGC ON ONLY*/
-        bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;
+        if(FRBT_UserCtrl_Get() == true){
+            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_IDEL;
+        }else{
+            bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_RUNNING;
+        }
 //        printf("AGC OFF \r\n");
         return;
     }
     
+#if 0 // PYJ.2020.09.14_BEGIN -- 
     /*Time Calc*/
-    if(FRBT_Day_Inc == bluecell_Currdatastatus.DLI_FRBT_D_Day
+    if(FRBT_UserCtrl == bluecell_Currdatastatus.DLI_FRBT_D_Day
     && StartTimeFRBT_Day[DLI_FRBT_Time_Hour]  <= FRBT_Day[DLI_FRBT_Time_Hour]    
     && StartTimeFRBT_Day[DLI_FRBT_Time_Minute]  <= FRBT_Day[DLI_FRBT_Time_Minute]    
     && StartTimeFRBT_Day[DLI_FRBT_Time_Second]  <= FRBT_Day[DLI_FRBT_Time_Second]
@@ -9290,6 +9283,15 @@ void FRBT_Operate(){
         bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_RUNNING;
 //        printf("FRBT Running Start \r\n");
     }
+#else
+    /*Time Calc*/
+    if(bluecell_Currdatastatus.DLI_FRBT_D_Day > 0)
+    {
+        bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING;
+//        printf("FRBT Running Start \r\n");
+    }
+
+#endif // PYJ.2020.09.14_END -- 
     
     if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_TRACKING){
         FRBT_Tracking_Package(DET_Alarm_DL1_Index,&bluecell_Currdatastatus.DLI_FRBT_Atten1_H,&bluecell_Currdatastatus.ATT_DL1_H,bluecell_Currdatastatus.ATT_DL1_PATH);

Bluecell_Src/eeprom.c

@@ -18,6 +18,10 @@ extern void Table_Init();
 
 extern BLUESTATUS_st bluecell_Currdatastatus;
 
+extern uint8_t FRBT_UserCtrl;
+extern uint8_t FRBT_UserCtrl_Get();
+extern uint8_t FRBT_UserCtrl_Set();
+
 
 
 
@@ -240,7 +244,11 @@ 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_D_Day = DLI_FRBT_DAY_DEFAULT;
+    bluecell_Currdatastatus.DLI_FRBT_Status = FRBT_TRACKING; 
+//    FRBT_UserCtrl = false;
+    FRBT_UserCtrl_Set(false);
+
     if(bluecell_Currdatastatus.SelfTest == true){
         bluecell_Currdatastatus.ATT_DL1_H = bluecell_Currdatastatus.SelfTest_ATT_DL1_H ;
         bluecell_Currdatastatus.ATT_DL2_H = bluecell_Currdatastatus.SelfTest_ATT_DL2_H ;