필요 없는 구조체 제거 / Det 값 MBIC 프로토콜 대로 변경

Bluecell_Inc/Bluecell_operate.h

@@ -656,28 +656,28 @@ typedef struct{
     uint8_t DET_TEMP;
     uint8_t DLI_AGC_ON_OFF;
     uint8_t ULO_ALC_ON_OFF;
-    uint8_t ATT_AGC2_ONOFF;
-    uint8_t ATT_ALC2_ONOFF;
-    uint8_t ATT_AGC3_ONOFF;
-    uint8_t ATT_ALC3_ONOFF;
-    uint8_t ATT_AGC4_ONOFF;
-    uint8_t ATT_ALC4_ONOFF;
-    uint8_t ATT_ALC1_MAX_H;
-    uint8_t ATT_ALC1_MAX_L;
-    uint8_t ATT_ALC2_MAX_H;
-    uint8_t ATT_ALC2_MAX_L;
-    uint8_t ATT_ALC3_MAX_H;
-    uint8_t ATT_ALC3_MAX_L;
-    uint8_t ATT_ALC4_MAX_H;
-    uint8_t ATT_ALC4_MAX_L;
+    uint8_t BLUECELL_RESERVE2;
+    uint8_t BLUECELL_RESERVE3;
+    uint8_t BLUECELL_RESERVE4;
+    uint8_t BLUECELL_RESERVE5;
+    uint8_t BLUECELL_RESERVE6;
+    uint8_t BLUECELL_RESERVE7;
+    uint8_t BLUECELL_RESERVE8;
+    uint8_t BLUECELL_RESERVE9;
+    uint8_t BLUECELL_RESERVE10;
+    uint8_t BLUECELL_RESERVE11;
+    uint8_t BLUECELL_RESERVE12;
+    uint8_t BLUECELL_RESERVE13;
+    uint8_t BLUECELL_RESERVE14;
+    uint8_t BLUECELL_RESERVE15;
     uint8_t ATT_ALC_Threshold_H;
     uint8_t ATT_ALC_Threshold_L;
-    uint8_t ATT_ALC2_MIN_H;
-    uint8_t ATT_ALC2_MIN_L;
-    uint8_t ATT_ALC3_MIN_H;
-    uint8_t ATT_ALC3_MIN_L;
-    uint8_t ATT_ALC4_MIN_H;
-    uint8_t ATT_ALC4_MIN_L;
+    uint8_t BLUECELL_RESERVE16;
+    uint8_t BLUECELL_RESERVE17;
+    uint8_t BLUECELL_RESERVE18;
+    uint8_t BLUECELL_RESERVE19;
+    uint8_t BLUECELL_RESERVE20;
+    uint8_t BLUECELL_RESERVE21;
     uint8_t bluecell_User_DL1_H;  
     uint8_t bluecell_User_DL1_L;
     uint8_t bluecell_User_DL2_H;  

Bluecell_Src/Bluecell_operate.c

@@ -59,6 +59,8 @@ uint8_t DataRead[512] = {0,};
 uint8_t Txdata[512];
 int8_t AutoControl_Save[sizeof(ALC_dBm_t)];
 uint16_t ADC1Ret[4];
+double ADC1DoubleRet[4];
+double ADC3DoubleRet[5];
 uint16_t ADC3Ret[5];
 
 ATT_TABLE_st Att_DL1;
@@ -1095,30 +1097,6 @@ bool Bluecell_Operate(uint8_t* data){
             bluecell_Currdatastatus.ULO_ALC_ON_OFF = true;
         }
     break;
-    case ALC2_EN :
-        if(data[BLUECELL_DATA]==0){
-            bluecell_Currdatastatus.ATT_ALC2_ONOFF = false;
-        }
-        else{
-            bluecell_Currdatastatus.ATT_ALC2_ONOFF = true;
-        }
-    break;
-    case ALC3_EN :
-        if(data[BLUECELL_DATA]==0){
-            bluecell_Currdatastatus.ATT_ALC3_ONOFF = false;
-        }
-        else{
-            bluecell_Currdatastatus.ATT_ALC3_ONOFF = true;
-        }
-    break;
-    case ALC4_EN :
-        if(data[BLUECELL_DATA]==0){
-            bluecell_Currdatastatus.ATT_ALC4_ONOFF = false;
-        }
-        else{
-            bluecell_Currdatastatus.ATT_ALC4_ONOFF = true;
-        }
-    break;
     case AGC1_EN :
         if(data[BLUECELL_DATA]==0){
             bluecell_Currdatastatus.DLI_AGC_ON_OFF = false;
@@ -1128,33 +1106,6 @@ bool Bluecell_Operate(uint8_t* data){
         }
 //        printf("bluecell_Currdatastatus.ATT_AGC1_ONOFF : %d \r\n",bluecell_Currdatastatus.ATT_AGC1_ONOFF);
     break;
-    case AGC2_EN :
-        if(data[BLUECELL_DATA]==0){
-            bluecell_Currdatastatus.ATT_AGC2_ONOFF = false;
-        }
-        else{
-            bluecell_Currdatastatus.ATT_AGC2_ONOFF = true;
-        }
-
-    break;
-    case AGC3_EN :
-        if(data[BLUECELL_DATA]==0){
-            bluecell_Currdatastatus.ATT_AGC3_ONOFF = false;
-        }
-        else{
-            bluecell_Currdatastatus.ATT_AGC3_ONOFF = true;
-        }
-
-    break;
-    case AGC4_EN :
-        if(data[BLUECELL_DATA]==0){
-            bluecell_Currdatastatus.ATT_AGC4_ONOFF = false;
-        }
-        else{
-            bluecell_Currdatastatus.ATT_AGC4_ONOFF = true;
-        }
-
-      break;
     case ATT_TableSet:
         Bluecell_TableSave(data, data[BLUECELL_DATA]);
     case ATT_TableGet:
@@ -2504,7 +2455,8 @@ void ADC_Check(void){
         }
 
         for(int i = 0; i < 5; i++){
-            ADC3Ret[i] = ADC3_Average_value[i] / cnt[i];
+            ADC3DoubleRet[i] = (((ADC3_Average_value[i] / cnt[i]) * 3.3 /4095) * 1000);
+            ADC3Ret[i] = ADC3DoubleRet[i];
             ADC3_Average_value[i] = 0;
         }
         adc3cnt = 0;
@@ -2571,7 +2523,9 @@ void ADC_Check(void){
         }
 
         for(int i = 0; i < 4; i++){
-            ADC1Ret[i] = ADC1_Average_value[i] / cnt[i];
+            ADC1DoubleRet[i] = (((ADC1_Average_value[i] / cnt[i]) * 3.3 /4095) * 1000);
+            ADC1Ret[i] = ADC1DoubleRet[i];
+//            ADC1Ret[i] = ADC1_Average_value[i] / cnt[i];
             ADC1_Average_value[i] = 0;
         }
         adc1cnt = 0;
@@ -2602,7 +2556,7 @@ void ADC_Check(void){
 /* *
 온도 소수점 제거  
 */
-    temp = (ADC1Ret[3] * 3.3 / 4095);
+    temp = (ADC1Ret[3] * 0.001);
 //    printf("temp %f \r\n",temp  );
     bluecell_Currdatastatus.DET_TEMP = (uint8_t)( (temp - 0.5) * 100);
 //    printf("DET_TEMP %d \r\n",bluecell_Currdatastatus.DET_TEMP  );
@@ -2801,6 +2755,7 @@ double AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t siz
 #endif // PYJ.2020.05.15_END -- 
 
 #endif // PYJ.2020.05.12_END -- 
+#if 0 // PYJ.2020.05.21_BEGIN -- 
 int32_t MinusConvert(uint8_t Temp_h, int32_t Value){
     int32_t ret;
     if((((bluecell_Currdatastatus.ATT_ALC1_MAX_H << 8) & 0xFF00) & 0xF000) == 0xF000){
@@ -2814,6 +2769,7 @@ int32_t MinusConvert(uint8_t Temp_h, int32_t Value){
      
     return ret;
 }
+#endif // PYJ.2020.05.21_END -- 
 int8_t ALC_Calc(int8_t threshold,double CurrDet){
     int8_t ret = 0;
     ret = CurrDet - threshold;