FRBT ON OFF Index 변경 / Carrier ON OFF 부팅시 Path Onoff 정확도 증가/ AGC FRBT 조건문변경

Bluecell_Inc/Bluecell_operate.h

@@ -1034,7 +1034,6 @@ typedef struct{
     uint8_t DLI_FRBT_Atten4_L;    
     uint8_t DLI_FRBT_D_Day;
     uint8_t DLI_FRBT_Status;
-    uint8_t DLI_FRBT_ON_OFF;
     uint8_t DLI_AGC_Threshold_H;
     uint8_t DLI_AGC_Threshold_L;
     uint8_t DLI_AGC_Threshold_default;
@@ -1119,7 +1118,7 @@ typedef struct{
     uint8_t Prev_ATT_ALC3_L;
     uint8_t Prev_ATT_ALC4_H;
     uint8_t Prev_ATT_ALC4_L;
-    
+    uint8_t DLI_FRBT_ON_OFF;    
     uint8_t Reserve[15];
     /**/
     uint8_t bluecell_crc_H;

Bluecell_Src/Bluecell_operate.c

@@ -8978,7 +8978,7 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             IwillgiveAtten = -15;
 
             
-        if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL && bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
+        if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL && bluecell_Currdatastatus.DLI_FRBT_ON_OFF == false){
             DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
             DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));      
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);  

Bluecell_Src/eeprom.c

@@ -277,47 +277,59 @@ printf("bluecell_Currdatastatus.DLI_Level_High_Threshold_L : %x \r\n",bluecell_C
     bluecell_Currdatastatus.ALARM_TESTMODE = 0;
     bluecell_Currdatastatus.Type = 0;
 
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x80)
-        bluecell_Currdatastatus.ATT_DL1_PATH = true;
-    else
+    if(bluecell_Currdatastatus.Carrier_ON_OFF == true){
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x80)
+            bluecell_Currdatastatus.ATT_DL1_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_DL1_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x40)
+            bluecell_Currdatastatus.ATT_DL2_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_DL2_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x20)
+            bluecell_Currdatastatus.ATT_DL3_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_DL3_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x10)
+            bluecell_Currdatastatus.ATT_DL4_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_DL4_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x08)
+            bluecell_Currdatastatus.ATT_UL1_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_UL1_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x04)
+            bluecell_Currdatastatus.ATT_UL2_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_UL2_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x02)
+            bluecell_Currdatastatus.ATT_UL3_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_UL3_PATH = false;
+
+        if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x01)
+            bluecell_Currdatastatus.ATT_UL4_PATH = true;
+        else
+            bluecell_Currdatastatus.ATT_UL4_PATH = false;
+    }
+    else{
         bluecell_Currdatastatus.ATT_DL1_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x40)
-        bluecell_Currdatastatus.ATT_DL2_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_DL2_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x20)
-        bluecell_Currdatastatus.ATT_DL3_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_DL3_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x10)
-        bluecell_Currdatastatus.ATT_DL4_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_DL4_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x08)
-        bluecell_Currdatastatus.ATT_UL1_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_UL1_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x04)
-        bluecell_Currdatastatus.ATT_UL2_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_UL2_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x02)
-        bluecell_Currdatastatus.ATT_UL3_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_UL3_PATH = false;
-
-    if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x01)
-        bluecell_Currdatastatus.ATT_UL4_PATH = true;
-    else
         bluecell_Currdatastatus.ATT_UL4_PATH = false;
-
+        bluecell_Currdatastatus.Path_TempSave_Bit = 0;
+        
+    }
 //    printf("PCB Version : %d.%d \r\n",bluecell_Currdatastatus.PCB_Version[0],bluecell_Currdatastatus.PCB_Version[1]);
 //    printf("Serial Number : ");
 //    for(int a = 0; a < 20; a++){
@@ -331,69 +343,6 @@ printf("bluecell_Currdatastatus.DLI_Level_High_Threshold_L : %x \r\n",bluecell_C
 //    printf("\r\n");
     
 
-//    bluecell_Currdatastatus.CPUVERSION1 =  0;
-//    bluecell_Currdatastatus.CPUVERSION2 = 0;
-//    bluecell_Currdatastatus.CPUVERSION3 = 8;
-#if 0 // PYJ.2020.06.28_BEGIN -- 
-
- 
-    Att_DL1.Table_Ref = ATTENTABLEDL_REF;
-     Att_DL2.Table_Ref = ATTENTABLEDL_REF;
-     Att_DL3.Table_Ref = ATTENTABLEDL_REF;
-     Att_DL4.Table_Ref = ATTENTABLEDL_REF;
-     Att_UL1.Table_Ref = ATTENTABLEUL_REF;
-     Att_UL2.Table_Ref = ATTENTABLEUL_REF;
-     Att_UL3.Table_Ref = ATTENTABLEUL_REF;
-     Att_UL4.Table_Ref = ATTENTABLEUL_REF;
-     Det_DL1.Table_Ref = ATTENTABLEDET_DL_REF;
-     Det_DL2.Table_Ref = ATTENTABLEDET_DL_REF;
-     Det_DL3.Table_Ref = ATTENTABLEDET_DL_REF;
-     Det_DL4.Table_Ref = ATTENTABLEDET_DL_REF;
-     Det_UL1.Table_Ref = ATTENTABLEDET_UL_REF;
-     Det_UL2.Table_Ref = ATTENTABLEDET_UL_REF;
-     Det_UL3.Table_Ref = ATTENTABLEDET_UL_REF;
-     Det_UL4.Table_Ref = ATTENTABLEDET_UL_REF;
-     Temp_DL1.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_DL2.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_DL3.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_DL4.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_UL1.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_UL2.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_UL3.Table_Ref= ATTENTABLE_TEMP_REF;
-     Temp_UL4.Table_Ref= ATTENTABLE_TEMP_REF;        
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_BASE              ,&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL1_TABLE_ADDRESDS,&Att_DL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL2_TABLE_ADDRESDS,&Att_DL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL3_TABLE_ADDRESDS,&Att_DL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-    
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL4_TABLE_ADDRESDS,&Att_UL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL1_TABLE_ADDRESDS,&Att_UL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL2_TABLE_ADDRESDS,&Att_UL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL3_TABLE_ADDRESDS,&Att_UL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-    
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL4_TABLE_ADDRESDS,&Det_DL1.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL1_TABLE_ADDRESDS,&Det_DL2.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL2_TABLE_ADDRESDS,&Det_DL3.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL3_TABLE_ADDRESDS,&Det_DL4.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-    
-    
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL4_TABLE_ADDRESDS,&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL1_TABLE_ADDRESDS,&Det_UL2.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL2_TABLE_ADDRESDS,&Det_UL3.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL3_TABLE_ADDRESDS,&Det_UL4.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-    
-    
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL4_TABLE_ADDRESDS,&Temp_DL1.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL1_TABLE_ADDRESDS,&Temp_DL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL2_TABLE_ADDRESDS,&Temp_DL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL3_TABLE_ADDRESDS,&Temp_DL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-    
-    
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL4_TABLE_ADDRESDS,&Temp_UL1.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_UL1_TABLE_ADDRESDS,&Temp_UL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_UL2_TABLE_ADDRESDS,&Temp_UL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_UL3_TABLE_ADDRESDS,&Temp_UL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-#endif // PYJ.2020.06.28_END -- 
 
     bluecell_Currdatastatus.ALARM_TEMP_HIGH          = 0;
     bluecell_Currdatastatus.ALARM_DLI_Level          = 0;
@@ -403,10 +352,7 @@ printf("bluecell_Currdatastatus.DLI_Level_High_Threshold_L : %x \r\n",bluecell_C
     bluecell_Currdatastatus.ALARM_ULO_Level          = 0;
     bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN  = 0;
 
-//    printf("bluecell_Currdatastatus.ATT_DL1_H : %x\r\n",bluecell_Currdatastatus.ATT_DL1_H);
-//    printf("bluecell_Currdatastatus.ATT_DL1_L : %x\r\n",bluecell_Currdatastatus.ATT_DL1_L);        
-//    
-//    printf("EEPROM INIT COMPLETE\r\n");
+
 
 }