FRBT Factory Set Default 값 오류 수정

User Atten (Gain Offset Value) Factory Set  목록에서 제외
Alarm Report에서 소수점 표시로 인한 오류 수정

Bluecell_Src/Bluecell_operate.c

@@ -4218,6 +4218,7 @@ void Factory_Set(){
  
    
     /*DL GAIN OFFSET*/
+#if 0 // PYJ.2020.09.11_BEGIN -- 
     tempdata  = ATTEN_OFFSET_DEFAULT;
     bluecell_Currdatastatus.bluecell_User_DL1_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.bluecell_User_DL1_L = ((tempdata & 0x00FF));        
@@ -4227,6 +4228,7 @@ void Factory_Set(){
     bluecell_Currdatastatus.bluecell_User_DL3_L = ((tempdata & 0x00FF));        
     bluecell_Currdatastatus.bluecell_User_DL4_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.bluecell_User_DL4_L = ((tempdata & 0x00FF));      
+#endif // PYJ.2020.09.11_END -- 
 
     tempdata  = DLI_ATTEN_HIGHTHREADHOLD_DEFAULT;
     bluecell_Currdatastatus.DLI_Level_High_Threshold_H = ((tempdata & 0xFF00) >> 8);
@@ -4240,13 +4242,13 @@ void Factory_Set(){
     bluecell_Currdatastatus.DLI_FRBT_D_Day = DLI_FRBT_DAY_DEFAULT;
     
     bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
-    bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
-    bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
-    bluecell_Currdatastatus.DLI_FRBT_Atten1_H = DLI_FRBT_ATTEN_DEFALUT;
-    bluecell_Currdatastatus.DLI_FRBT_Atten1_L= 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_Atten1_L= 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_AGC_ON_OFF = DLI_AGC_ONOFF_DEFAULT;   
 
@@ -4309,6 +4311,7 @@ void Factory_Set(){
     bluecell_Currdatastatus.ATT_UL4_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.ATT_UL4_L = ((tempdata & 0x00FF));    
 
+#if 0 // PYJ.2020.09.11_BEGIN -- 
     tempdata  = ATTEN_OFFSET_DEFAULT;
     bluecell_Currdatastatus.bluecell_User_UL1_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.bluecell_User_UL1_L = ((tempdata & 0x00FF));        
@@ -4318,6 +4321,7 @@ void Factory_Set(){
     bluecell_Currdatastatus.bluecell_User_UL3_L = ((tempdata & 0x00FF));        
     bluecell_Currdatastatus.bluecell_User_UL4_H = ((tempdata & 0xFF00) >> 8);    
     bluecell_Currdatastatus.bluecell_User_UL4_L = ((tempdata & 0x00FF));    
+#endif // PYJ.2020.09.11_END -- 
 
     tempdata  = ULO_LEVEL_HIGH_THREADHOLD_DEFAULT;
     bluecell_Currdatastatus.ULO_Level_High_Threshold_H = ((tempdata & 0xFF00) >> 8);
@@ -4958,6 +4962,15 @@ uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
     Res_UL_dBm[DET_Alarm_UL4_Index] 
         = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L;//(int8_t)Bluecell_TestPro(AutoControl_ADC_Compare(ret,&Det_UL4.Table_Det_15_dBm_H,Det_UL4.Table_Length * 2));
 
+    Res_DL_dBm[DET_Alarm_DL1_Index] *= 0.1;
+    Res_DL_dBm[DET_Alarm_DL2_Index] *= 0.1;
+    Res_DL_dBm[DET_Alarm_DL4_Index] *= 0.1;
+    Res_DL_dBm[DET_Alarm_DL3_Index] *= 0.1;
+    
+    Res_UL_dBm[DET_Alarm_UL1_Index] *= 0.1;
+    Res_UL_dBm[DET_Alarm_UL2_Index] *= 0.1;
+    Res_UL_dBm[DET_Alarm_UL4_Index] *= 0.1;
+    Res_UL_dBm[DET_Alarm_UL3_Index] *= 0.1;
 
  
     switch(Alarm_type){
@@ -6020,6 +6033,10 @@ void DET_LevelAlarmCheck(){
     Res_DL_dBm[DET_Alarm_DL4_Index] 
         = bluecell_Currdatastatus.DLI_Level4_H << 8 | bluecell_Currdatastatus.DLI_Level4_L;//(int8_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&Det_DL4.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st)));
 
+    Res_DL_dBm[DET_Alarm_DL1_Index] *= 0.1;
+    Res_DL_dBm[DET_Alarm_DL2_Index] *= 0.1;
+    Res_DL_dBm[DET_Alarm_DL4_Index] *= 0.1;
+    Res_DL_dBm[DET_Alarm_DL3_Index] *= 0.1;
 
 
     ret  = bluecell_Currdatastatus.ULO_P1_Level1_H << 8;
@@ -6052,6 +6069,11 @@ void DET_LevelAlarmCheck(){
     Res_UL_dBm[DET_Alarm_UL4_Index] 
         = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L;//(int8_t)Bluecell_TestPro(AutoControl_ADC_Compare(ret,&Det_UL4.Table_Det_15_dBm_H,Det_UL4.Table_Length * 2));
 
+    Res_UL_dBm[DET_Alarm_UL1_Index] *= 0.1;
+    Res_UL_dBm[DET_Alarm_UL2_Index] *= 0.1;
+    Res_UL_dBm[DET_Alarm_UL3_Index] *= 0.1;
+    Res_UL_dBm[DET_Alarm_UL4_Index] *= 0.1;
+
 
     /*
         DL Level Alarm Check Part