Shutdown On 타이밍 변경 신호 5초에서 -> 15초로 변경

SelfTest 일 때 LED 동작 안하도록 수정
MBIC (DL UL) Det Level 보낼 때 *10 을 함수에서 직접 * 10 하도록 수정
DetLevel 측정 함수 에서 반올림 해주는 함수 제거
Det 측정 시 Level 소수점 1자리까지 출력하도록 수정

Bluecell_Src/Bluecell_operate.c

@@ -318,11 +318,16 @@ void Booting_LedInit(void){
 
 
 void Boot_LED_Toggle(void){
+
   if(bluecell_Currdatastatus.LED_TEST == false){
       if(LedTimerCnt > 500){
         HAL_GPIO_TogglePin(BOOT_LED_GPIO_Port,BOOT_LED_Pin);
         HAL_GPIO_TogglePin(LED_ACT_GPIO_Port,LED_ACT_Pin);
     //    if(AlarmTimerOnCnt > 3000){
+        if(bluecell_Currdatastatus.SelfTest == true){
+            Alarm_LED_OnSet = false;
+        }
+
         if(Alarm_LED_OnSet == true){
             HAL_GPIO_WritePin(LED_FAIL_GPIO_Port,LED_FAIL_Pin,GPIO_PIN_SET);
         }else{
@@ -346,6 +351,7 @@ void Boot_LED_Toggle(void){
             }
             LED_TestCnt++;
             LedTimerCnt = 0;
+            
           /*Set LED TEST variable False after 12 flashes*/
           if(LED_TestCnt >= Led_ToggleCntSet){
             bluecell_Currdatastatus.LED_TEST = false;
@@ -3126,7 +3132,14 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 0xFF;
     data[MBIC_PAYLOADSTART + i++] = 0x0F;
     data[MBIC_PAYLOADSTART + i++] = 0xFF;
-     if(bluecell_Currdatastatus.Carrier_ON_OFF == false 
+    if(bluecell_Currdatastatus.SelfTest == true){
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+        data[MBIC_PAYLOADSTART + i++] = 0;
+    }
+    else if(bluecell_Currdatastatus.Carrier_ON_OFF == false 
      || bluecell_Currdatastatus.ALARM_TESTMODE == true){/*Carrier OFF -> Alarm OFF*/
 
         if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
@@ -3821,22 +3834,22 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 8; // LENGTH
     Length += 8     ;HeaderLength++;
     tmpdata = bluecell_Currdatastatus.DLI_Level1_H << 8 | bluecell_Currdatastatus.DLI_Level1_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
     tmpdata = bluecell_Currdatastatus.DLI_Level2_H << 8 | bluecell_Currdatastatus.DLI_Level2_L;
-    tmpdata *= 10;    
+//    tmpdata *= 10;    
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
     tmpdata = bluecell_Currdatastatus.DLI_Level3_H << 8 | bluecell_Currdatastatus.DLI_Level3_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
     tmpdata = bluecell_Currdatastatus.DLI_Level4_H << 8 | bluecell_Currdatastatus.DLI_Level4_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
@@ -4046,21 +4059,21 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 8; // LENGTH
     Length += 8           ;HeaderLength++;
     tmpdata = bluecell_Currdatastatus.ULO_Level1_H << 8 | bluecell_Currdatastatus.ULO_Level1_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
     tmpdata = bluecell_Currdatastatus.ULO_Level2_H << 8 | bluecell_Currdatastatus.ULO_Level2_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
     tmpdata = bluecell_Currdatastatus.ULO_Level3_H << 8 | bluecell_Currdatastatus.ULO_Level3_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
     tmpdata = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L;
-    tmpdata *= 10;
+//    tmpdata *= 10;
     data[MBIC_PAYLOADSTART + i++] = ((tmpdata & 0xFF00) >> 8);
     data[MBIC_PAYLOADSTART + i++] = (tmpdata & 0x00FF); 
 
@@ -7481,6 +7494,7 @@ double Bluecell_TestPro(double value )
 double Bluecell_TestPro(double value ){
     bool minusset = false;
     uint8_t temp = 0;
+//    printf("DL1 : %f \r\n", value);
     if(value < 0){
         value *= -1;
         minusset = true;
@@ -8072,16 +8086,30 @@ int16_t ResultData = 0;
     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]);
     //ret 현재 Voltage 값 출력
     //ret 에 따른 현재 DBM 구현
-    ResdBm = HFR_CntUpCalc(ResdBm);
+//    ResdBm = HFR_CntUpCalc(ResdBm);
     ResdBm += Temperature_Offset_Get(&Temp_UL1.Table_1_Temp,bluecell_Currdatastatus.DET_TEMP);
     ResultData = ResdBm;
+    
+#if 0 // PYJ.2020.09.10_BEGIN -- 
     if(ResultData < -60)
         ResultData = -60;
     else if(ResultData > -15)
-        ResultData = -15;    
-//    printf("HFR CALC RET : %d \r\n",ResultData);
+        ResultData = -15;  
     ULO_Level[ULO_ALC_H] = (ResultData & 0xFF00) >> 8;
-    ULO_Level[ULO_ALC_L] = (ResultData & 0x00FF);  
+    ULO_Level[ULO_ALC_L] = (ResultData & 0x00FF);      
+#else
+    if(ResdBm < -60)
+        ResdBm = -60;
+    else if(ResdBm > -15)
+        ResdBm = -15; 
+    ResultData = ResdBm * 10;
+    ULO_Level[ULO_ALC_H] = (ResultData & 0xFF00) >> 8;
+    ULO_Level[ULO_ALC_L] = (ResultData & 0x00FF);      
+
+#endif // PYJ.2020.09.10_END -- 
+    
+//    printf("HFR CALC RET : %d \r\n",ResultData);
+
 
 
 //    
@@ -8369,9 +8397,10 @@ void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,DET_TABLEDL_st* DL
     int16_t Levelret = 0;    
     AGC_Table = &DL_DET_Table_ref[Table_Num][TABLE_MAX_VALUE];
     ret = (((CurrADC_Level[DL_Level_H] << 8) | CurrADC_Level[DL_Level_L]) * 0.001);
-//    printf("DL_Table->Table_Length : %d \r\n",DL_Table->Table_Length);                
+//    printf("DL_Table->Table_Length : %d \r\n",DL_Table->Table_Length);  
+    
+#if 0 // PYJ.2020.09.10_BEGIN -- 
     Levelret = (int16_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table));
-
     Levelret += Temperature_Offset_Get(&Temp_DL1.Table_1_Temp,bluecell_Currdatastatus.DET_TEMP);
     if(Levelret < -25)
         Levelret = -25;
@@ -8381,6 +8410,24 @@ void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,DET_TABLEDL_st* DL
 
     Level[DL_Level_H] = (Levelret & 0xFF00) >> 8;
     Level[DL_Level_L] = (Levelret & 0x00FF);
+#else
+    ret = AGC_AutoControl_ADC_Compare(ret,&DL_Table->Table_Det5_dBm_H,DL_Table->Table_Length,AGC_Table);
+
+    ret += Temperature_Offset_Get(&Temp_DL1.Table_1_Temp,bluecell_Currdatastatus.DET_TEMP);
+    if(ret < -25)
+        ret = -25;
+    else if(ret > 7)
+        ret = 7;
+//    printf("Levelret %d : %d \r\n",Table_Num + 1,Levelret);
+//    printf("ret : %f \r\n",ret);
+    ret *= 10;
+    Levelret = ret;
+//    printf("Levelret : %d \r\n",Levelret);
+    Level[DL_Level_H] = (Levelret & 0xFF00) >> 8;
+    Level[DL_Level_L] = (Levelret & 0x00FF);
+
+#endif // PYJ.2020.09.10_END -- 
+
     
 }
 void AGC_Function(){//DL

Inc/main.h

@@ -183,7 +183,7 @@ extern I2C_HandleTypeDef hi2c2;
 #define ATT_EN_DL1_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 #define MBIC_ON_MAINTAIN_SEC 3000
-#define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000//5
+#define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 15000//5
 #define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 30000//30
 #define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000 * 5 //5min
 #define MBIC_RECOVERY_SELFTEST_TIMER_SEC (60000 * 30) //30min