warning / AGC 양수 처리 /

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="775637718743193950" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-1353771282093943304" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="775637718743193950" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-1353771282093943304" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Bluecell_Src/Bluecell_operate.c

@@ -123,6 +123,8 @@ void Temp_Shutdown_ONOFF(uint8_t val);
 
 void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt);
 int16_t Temperature_Offset_Get(int8_t* Temp_Table,int8_t CurrTemp);
+int Bluecell_RoundCalc(double data);
+
 
 /***************************************************************************************/
 /*                                  Valuable                                           */
@@ -3109,19 +3111,19 @@ void HFR_TypeInit(){
 //    printf("3: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin));   
 //    printf("ret : %x \r\n",type);
     switch(type){
-        case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
-        case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02;break; //printf("Type BLUECELL_3_8G  Ready....\r\n");break;
-        case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;break;//printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
-        case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03;break;// printf("Type BLUECELL_4_0G  Ready....\r\n");break;
-        case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02;break;//printf("Type BLUECELL_4_1G  Ready....\r\n");break;
-        case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01;break;// printf("Type BLUECELL_4_6G  Ready....\r\n");break;
-        case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_7G  Ready....\r\n");break;
-        case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_8G  Ready....\r\n");break;
-        case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_9G  Ready....\r\n");break;
-        case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_5_0G  Ready....\r\n");break;
-        case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_DCM  Ready....\r\n"); break;
-        case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03;break; //printf("Type BLUECELL_SBM  Ready....\r\n");break;
-        case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;break;//printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
+        case BLUECELL_3_7G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
+        case BLUECELL_3_8G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02;break; //printf("Type BLUECELL_3_8G  Ready....\r\n");break;
+        case BLUECELL_3_9G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;break;//printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
+        case BLUECELL_4_0G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03;break;// printf("Type BLUECELL_4_0G  Ready....\r\n");break;
+        case BLUECELL_4_1G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02;break;//printf("Type BLUECELL_4_1G  Ready....\r\n");break;
+        case BLUECELL_4_6G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01;break;// printf("Type BLUECELL_4_6G  Ready....\r\n");break;
+        case BLUECELL_4_7G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_7G  Ready....\r\n");break;
+        case BLUECELL_4_8G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_8G  Ready....\r\n");break;
+        case BLUECELL_4_9G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_4_9G  Ready....\r\n");break;
+        case BLUECELL_5_0G: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00;break;// printf("Type BLUECELL_5_0G  Ready....\r\n");break;
+        case BLUECELL_DCM : bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;break;//printf("Type BLUECELL_DCM  Ready....\r\n"); break;
+        case BLUECELL_KDDI: bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x02;break; //printf("Type BLUECELL_KDDI  Ready....\r\n");break;
+        case BLUECELL_SBM:  bluecell_Currdatastatus.Freq_ID = bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x03;break;//printf("Type BLUECELL_SBM  Ready....\r\n"); break;
 //        default : printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);break;
     }
 //    printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);
@@ -3236,6 +3238,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
      uint32_t HeaderLength = 0;//80;
 	
 
+
     
     /*ALARM BIT LIST*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
@@ -3736,6 +3739,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Freq_ID;
 
 
+
      /*Carrier_ID*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
     data[MBIC_PAYLOADSTART + i++] = Carrier_ID;
@@ -4986,7 +4990,7 @@ void Temp_Shutdown_ONOFF(uint8_t val){
 #define ALARM_REPORT_LENGTH 42
 //uint8_t AlarmReport_History[Alarm_type_IndexMax] = {0,};
 volatile uint8_t Alarm_ReportData[40 + 2 + 22 + 3] = {0,}; // 40 Alarm Data + 2 UNIT ID, 21 Header , 3 Tail
-uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
+void Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
 //    if(AlarmReport_History[Alarm_type] != true){
 //        return;
 //    }
@@ -5276,7 +5280,9 @@ bool MBIC_Operate(uint8_t* data){
             Initialize = true;
 
         }
-        HFR_TypeInit();        
+        HFR_TypeInit();      
+
+        
         data[MBIC_CMD_0] = 0x80;//MBIC_ERRRESPONSE;
         Length = MBIC_DataSend(data);
     }
@@ -6094,6 +6100,7 @@ void DET_LevelAlarmCheck(){
     double ret = 0;
     int16_t Res_Up_DL_dBm[DET_Alarm_DL_Index_MAX] = {0,};
     int16_t Res_Down_DL_dBm[DET_Alarm_DL_Index_MAX] = {0,};
+    float temp_val = 0;
     int16_t Res_Up_UL_dBm[DET_Alarm_UL_Index_MAX] = {0,};    
     int16_t Res_Down_UL_dBm[DET_Alarm_UL_Index_MAX] = {0,};    
     
@@ -6302,7 +6309,7 @@ void DET_LevelAlarmCheck(){
 
 
     for(int i = 0 ; i < DET_Alarm_DL_Shutdown_Index_MAX; i++){
-//        if(i == 0) continue;
+//        if(i != 0) continue;
         if( Res_Down_DL_dBm[DET_Alarm_DL1_Index + i] > 0 ){
             if(DL_PathStatus[DET_Alarm_DL1_Shutdown_Index + i] == true
                 && (LimitData_DL_Shutdown - 2 >= Res_Up_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i])
@@ -8802,71 +8809,8 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
             FRBT_UserCtrl_Set(true);
         }
 
-#endif // PYJ.2020.10.23_END -- 
-#if 0 // PYJ.2020.10.29_BEGIN -- 
-        if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
-            ResdBm = Round_ResdBm_Ret = Bluecell_RoundCalc(Temp_ResdBm);
-            IwillgiveAtten = New_AGC_Calc(Limitdata,ResdBm);
-//            if(IwillgiveAtten )
-
-#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-            printf("222 WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
-
-            printf("Round_ResdBm_Ret : %d \r\n",Round_ResdBm_Ret);
-            printf("RefValue : %d \r\n",RefValue[Tableindex]);            
 #endif // PYJ.2020.10.23_END -- 
 
-            if(Round_ResdBm_Ret < RefValue[Tableindex] + 0.5 && RefValue[Tableindex] != 0){
-                
-                
-            }else{
-#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-                printf("1Curr ATTEN %d \r\n",CurrAtten );
-                printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
-                printf("Temp_ResdBm : DL%d : %f \r\n",Tableindex+1,Temp_ResdBm);
-                printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
-                printf("AGC  : %d\r\n",Limitdata);
-#endif // PYJ.2020.10.23_END -- 
-                RefValue[Tableindex] = Round_ResdBm_Ret;
-                return;
-            }
-            if(Round_ResdBm_Ret > RefValue[Tableindex] - 1.5  && RefValue[Tableindex] != 0){
-                if(CurrAtten < (IwillgiveAtten * -1)){
-                    if(((Limitdata + (CurrAtten * -1)) - 1.5) <= Temp_ResdBm){
-//                        IwillgiveAtten = HFR_AGC_Calc(Limitdata,Temp_ResdBm);
-#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-                        printf("4Curr ATTEN %d \r\n",CurrAtten );
-                        printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
-                        printf("Temp_ResdBm : DL%d : %f \r\n",Tableindex+1,Temp_ResdBm);
-                        printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten* -1);
-                        printf("AGC  : %d\r\n",Limitdata);
-#endif // PYJ.2020.10.23_END --                           
-                        return;
-                    }
-                }                
-            }
-            else
-            {
-#if AGC_PRINT // PYJ.2020.10.23_BEGIN -- 
-                printf("2Curr ATTEN %d \r\n",CurrAtten );
-                printf("Current DL% ADC VALUE : %f \r\n",Tableindex+1,ret);
-                printf("Temp_ResdBm : DL%d : %f \r\n",Tableindex+1,Temp_ResdBm);
-                printf("I WILL GIVE YOU ATTEN  : %d\r\n",IwillgiveAtten);
-                printf("AGC  : %d\r\n",Limitdata);
-#endif // PYJ.2020.10.23_END --                 
-                RefValue[Tableindex] = Round_ResdBm_Ret;
-                return;
-            }
-
-            if(Limitdata == ResdBm){
-                IwillgiveAtten = CurrAtten;
-            }
-            if(IwillgiveAtten == CurrAtten)
-                    IwillgiveAtten = 0;            
-//            RefValue = Round_ResdBm_Ret;
-        }
-#else
-
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL){
             int16_t Ref_A = Limitdata - CurrAtten;
             float Ref_Ret = 0;
@@ -8893,9 +8837,11 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 #endif
                 }
             }
+            if(IwillgiveAtten > 0){
+                IwillgiveAtten = 0;
+            }
         }
 
-#endif // PYJ.2020.10.29_END -- 
        
        
           
@@ -8918,38 +8864,10 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
 
             
         if(bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_IDEL && bluecell_Currdatastatus.DLI_FRBT_D_Day == 0){
-#if 0 // PYJ.2020.10.30_BEGIN -- 
-             if(Limitdata != ResdBm){
-//                if(CurrAtten + ResdBm <= Limitdata - 1)
-//                    IwillgiveAtten = ((CurrAtten) + 1);
-                if(CurrAtten == 0)
-                    if(IwillgiveAtten > 0)
-                        IwillgiveAtten = 0;
-//                IwillgiveAtten = ((CurrAtten) + 1);
-//                printf("DLI_FRBT_Status == FRBT_IDEL\r\n");
-                DL_PrevIwillgiveAtten[Tableindex] = IwillgiveAtten;
-                DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
-                DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));  
-                printf("Apply 2 Curr ATTEN %d \r\n", (int16_t)(DL_MainAtten[DLI_AGC_H] << 8 |  DL_MainAtten[DLI_AGC_L]));
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);            
-            }
-
-            else{
-                if(Limitdata == ResdBm){
-                    IwillgiveAtten = 0;
-                    DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
-                    DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));      
-                    CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);                       
-                }            
-                
-
-            }
-#else 
             DL_MainAtten[DLI_AGC_H] = ((((IwillgiveAtten)  * 10) & 0xFF00) >> 8) ;
             DL_MainAtten[DLI_AGC_L] = ((((IwillgiveAtten) * 10) & 0x00FF));      
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);  
 
-#endif // PYJ.2020.10.30_END -- 
         }
         else if(bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_IDEL && (ResdBm + CurrAtten) > Limitdata &&  DL_PrevIwillgiveAtten[Tableindex] > IwillgiveAtten){
 //            printf("IwillgiveAtten : %d \r\n",IwillgiveAtten);
@@ -8977,8 +8895,6 @@ void AGC_Package_Operate(uint8_t* Threshold,uint8_t* DL_MainAtten,uint8_t Tablei
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);            
             }
         }
-        
-
 }
 #endif // PYJ.2020.06.27_END -- 
 
@@ -9121,7 +9037,7 @@ void AGC_Function(){//DL
                             &bluecell_Currdatastatus.DLI_Level1_H,
                             &Det_DL1.Table_Det5_dBm_H                        ,
                             &bluecell_Currdatastatus.DLI_FRBT_Atten1_H);
-#if 1// PYJ.2020.09.15_BEGIN -- 
+#if (AGC_PRINT == 0)// PYJ.2020.09.15_BEGIN -- 
         AGC_Package_Operate(&bluecell_Currdatastatus.DLI_AGC_Threshold_H,
                             &bluecell_Currdatastatus.ATT_DL2_H,
                             AGC_Alarm_DL2_Index,
@@ -9364,6 +9280,7 @@ void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t*
         *path = true;            
         MainAtten[DL_Shutdown_H] = 0xFF;
         MainAtten[DL_Shutdown_L] = 0xFF;
+        PrevMBIC_DL_ShutdownCount[index] = MBIC_DL_ShutdownCount[index];        
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
     }                  
     if(DET_DL_Shutdown_On_AlarmTimerCnt[index] >= MBIC_ON_SHUTDOWN_MAINTAIN_SEC)

Inc/main.h

@@ -185,7 +185,7 @@ extern I2C_HandleTypeDef hi2c2;
 #define MBIC_ON_MAINTAIN_SEC 3000
 #define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000//5
 #define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 20000//30
-#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 52000 * 5 //5min
+#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC  52000 * 5 //5min
 #define MBIC_RECOVERY_SELFTEST_TIMER_SEC 1800000 //30min
 
 

Src/main.c

@@ -171,6 +171,13 @@ static void MX_NVIC_Init(void);
 extern void Booting_LedInit(void);
 extern void Bluecell_AttenInitialize();
 extern void DET_LevelAlarmCheck();
+extern void Alarm_Check();
+extern void SelfTestTimer_Operate();
+extern void FRBT_Operate();
+extern void AlarmLog_Report();
+extern void Flash_InitRead();
+extern void HFR_TypeInit();
+
 
 /* USER CODE END PFP */