Ver código fonte

HFR 검수

FRBT Data 저장 / EEPROM INIT 시 FRBT  으로 초기화
LED CNT 3번으로 변경
PYJ 5 anos atrás
pai
commit
535bfa3dcf
3 arquivos alterados com 23 adições e 9 exclusões
  1. 13 7
      Bluecell_Src/Bluecell_operate.c
  2. 9 1
      Bluecell_Src/eeprom.c
  3. 1 1
      Src/main.c

+ 13 - 7
Bluecell_Src/Bluecell_operate.c

@@ -253,7 +253,7 @@ void Boot_LED_Toggle(void){
253
             LedTimerCnt = 0;
253
             LedTimerCnt = 0;
254
 
254
 
255
           /*Set LED TEST variable False after 12 flashes*/
255
           /*Set LED TEST variable False after 12 flashes*/
256
-          if(LED_TestCnt >= 10){
256
+          if(LED_TestCnt >= 6){
257
             bluecell_Currdatastatus.LED_TEST = false;
257
             bluecell_Currdatastatus.LED_TEST = false;
258
             LED_TestCnt = 0;
258
             LED_TestCnt = 0;
259
 
259
 
@@ -6663,7 +6663,7 @@ typedef enum{
6663
 };
6663
 };
6664
 
6664
 
6665
 #if 1 // PYJ.2020.06.27_BEGIN -- 
6665
 #if 1 // PYJ.2020.06.27_BEGIN -- 
6666
-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){
6666
+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){
6667
         double ret = 0;
6667
         double ret = 0;
6668
         int8_t ResdBm = 0;
6668
         int8_t ResdBm = 0;
6669
         int16_t CurrAtten = 0;
6669
         int16_t CurrAtten = 0;
@@ -6708,7 +6708,9 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
6708
 //            printf("WILLATTEN RET : %d \r\n",IwillgiveAtten);
6708
 //            printf("WILLATTEN RET : %d \r\n",IwillgiveAtten);
6709
             AGC_Alarm_Check(AGC_Alarm_DL1_Index + Tableindex,ret,&DL_Table->Table_Det5_dBm_H,IwillgiveAtten);
6709
             AGC_Alarm_Check(AGC_Alarm_DL1_Index + Tableindex,ret,&DL_Table->Table_Det5_dBm_H,IwillgiveAtten);
6710
             DL_MainAtten[DLI_AGC_H] = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
6710
             DL_MainAtten[DLI_AGC_H] = (((IwillgiveAtten * 10) & 0xFF00) >> 8) ;
6711
-            DL_MainAtten[DLI_AGC_L] = (((IwillgiveAtten * 10) & 0x00FF));     
6711
+            DL_MainAtten[DLI_AGC_L] = (((IwillgiveAtten * 10) & 0x00FF));   
6712
+            FRBT[DLI_AGC_H] = DL_MainAtten[DLI_AGC_H];
6713
+            FRBT[DLI_AGC_L] = DL_MainAtten[DLI_AGC_L];            
6712
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
6714
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
6713
         }
6715
         }
6714
 
6716
 
@@ -6858,25 +6860,29 @@ void AGC_Function(){//DL
6858
                         AGC_Alarm_DL1_Index,
6860
                         AGC_Alarm_DL1_Index,
6859
                         &bluecell_Currdatastatus.DLI_P1_Level1_H,
6861
                         &bluecell_Currdatastatus.DLI_P1_Level1_H,
6860
                         &bluecell_Currdatastatus.DLI_Level1_H,
6862
                         &bluecell_Currdatastatus.DLI_Level1_H,
6861
-                        &Det_DL1.Table_Det5_dBm_H                        );
6863
+                        &Det_DL1.Table_Det5_dBm_H                        ,
6864
+                        &bluecell_Currdatastatus.DLI_FRBT_Atten1_H);
6862
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6865
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6863
                         &bluecell_Currdatastatus.ATT_DL2_H,
6866
                         &bluecell_Currdatastatus.ATT_DL2_H,
6864
                         AGC_Alarm_DL2_Index,
6867
                         AGC_Alarm_DL2_Index,
6865
                         &bluecell_Currdatastatus.DLI_P2_Level2_H,
6868
                         &bluecell_Currdatastatus.DLI_P2_Level2_H,
6866
                         &bluecell_Currdatastatus.DLI_Level2_H,
6869
                         &bluecell_Currdatastatus.DLI_Level2_H,
6867
-                        &Det_DL2.Table_Det5_dBm_H                        );
6870
+                        &Det_DL2.Table_Det5_dBm_H                        ,
6871
+                        &bluecell_Currdatastatus.DLI_FRBT_Atten2_H);
6868
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6872
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6869
                     &bluecell_Currdatastatus.ATT_DL3_H,
6873
                     &bluecell_Currdatastatus.ATT_DL3_H,
6870
                     AGC_Alarm_DL3_Index,
6874
                     AGC_Alarm_DL3_Index,
6871
                     &bluecell_Currdatastatus.DLI_P3_Level3_H,
6875
                     &bluecell_Currdatastatus.DLI_P3_Level3_H,
6872
                     &bluecell_Currdatastatus.DLI_Level3_H,
6876
                     &bluecell_Currdatastatus.DLI_Level3_H,
6873
-                    &Det_DL3.Table_Det5_dBm_H                        );
6877
+                    &Det_DL3.Table_Det5_dBm_H                        ,
6878
+                    &bluecell_Currdatastatus.DLI_FRBT_Atten3_H);
6874
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6879
     AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
6875
                     &bluecell_Currdatastatus.ATT_DL4_H,
6880
                     &bluecell_Currdatastatus.ATT_DL4_H,
6876
                     AGC_Alarm_DL4_Index,
6881
                     AGC_Alarm_DL4_Index,
6877
                     &bluecell_Currdatastatus.DLI_P4_Level4_H,
6882
                     &bluecell_Currdatastatus.DLI_P4_Level4_H,
6878
                     &bluecell_Currdatastatus.DLI_Level4_H,
6883
                     &bluecell_Currdatastatus.DLI_Level4_H,
6879
-                    &Det_DL4.Table_Det5_dBm_H                        );    
6884
+                    &Det_DL4.Table_Det5_dBm_H                        ,
6885
+                    &bluecell_Currdatastatus.DLI_FRBT_Atten4_H);    
6880
 
6886
 
6881
 
6887
 
6882
 #endif // PYJ.2020.06.27_END -- 
6888
 #endif // PYJ.2020.06.27_END -- 

+ 9 - 1
Bluecell_Src/eeprom.c

@@ -206,7 +206,15 @@ void EEPROM_M24C08_Init(void){
206
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1 = 0;        
206
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1 = 0;        
207
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2 = 0;        
207
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2 = 0;        
208
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3 = 0;            
208
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3 = 0;            
209
-    bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4 = 0;        
209
+    bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4 = 0;     
210
+    bluecell_Currdatastatus.DLI_FRBT_Atten1_H = 0;
211
+    bluecell_Currdatastatus.DLI_FRBT_Atten2_H = 0;
212
+    bluecell_Currdatastatus.DLI_FRBT_Atten3_H = 0;
213
+    bluecell_Currdatastatus.DLI_FRBT_Atten4_H = 0;
214
+    bluecell_Currdatastatus.DLI_FRBT_Atten1_L = 0;    
215
+    bluecell_Currdatastatus.DLI_FRBT_Atten2_L = 0;    
216
+    bluecell_Currdatastatus.DLI_FRBT_Atten3_L = 0;    
217
+    bluecell_Currdatastatus.DLI_FRBT_Atten4_L = 0;        
210
 //    bluecell_Currdatastatus.CPUVERSION1 =  0;
218
 //    bluecell_Currdatastatus.CPUVERSION1 =  0;
211
 //    bluecell_Currdatastatus.CPUVERSION2 = 0;
219
 //    bluecell_Currdatastatus.CPUVERSION2 = 0;
212
 //    bluecell_Currdatastatus.CPUVERSION3 = 8;
220
 //    bluecell_Currdatastatus.CPUVERSION3 = 8;

+ 1 - 1
Src/main.c

@@ -329,7 +329,7 @@ int main(void)  {
329
 
329
 
330
 
330
 
331
   Booting_LedInit();
331
   Booting_LedInit();
332
-  Booting_LED_Check();
332
+//  Booting_LED_Check();
333
   InitUartQueue(&TerminalQueue);
333
   InitUartQueue(&TerminalQueue);
334
 
334
 
335
 #if 0 // PYJ.2020.04.22_BEGIN -- 
335
 #if 0 // PYJ.2020.04.22_BEGIN --