HFR ADC - > Bluecell ADC Algorithm 으로 변경

Temp Shutdown 기능 실행시 각 Path data 변경 할 때 전부 Save 할 수 있도록 변경

Bluecell_Src/Bluecell_operate.c

@@ -29,6 +29,7 @@ extern void PE43711_atten_ctrl2(PE43711_st* ATT ,uint8_t data);
 extern void PE43711_UL4_atten_ctrl(uint8_t data);
 
 
+
 /***************************************************************************************/
 /*                                  Extern Valuable                                    */
 /***************************************************************************************/
@@ -107,6 +108,8 @@ void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
 void Factory_Set();
 void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,uint8_t* UL_Atten);
 void TimeSetting(uint8_t* data);
+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);
 /***************************************************************************************/
 /*                                  Valuable                                           */
@@ -2070,10 +2073,11 @@ bool Bluecell_Operate(uint8_t* data){
 //       printf("DL PATH 1 : %d \r\n",data[BLUECELL_DATA]);
        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
               return true;
-       if(data[MBIC_PAYLOADSTART] != 0)
-           bluecell_Currdatastatus.Path_TempSave_Bit = 0x80;
+       if(data[BLUECELL_DATA] != 0)
+           bluecell_Currdatastatus.Path_TempSave_Bit |= 0x80;
        else
           bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x80;
+       printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
 
        DL_Path_OnOff(Path1_OnOff,
@@ -2103,10 +2107,11 @@ bool Bluecell_Operate(uint8_t* data){
 #else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x08;
+        if(data[BLUECELL_DATA] != 0)
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x08;
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x08;
+        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
         UL_Path_OnOff(Path1_OnOff,
              data[BLUECELL_DATA],
@@ -2174,10 +2179,11 @@ bool Bluecell_Operate(uint8_t* data){
 #else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
           return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x40;
+        if(data[BLUECELL_DATA] != 0)
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x40;
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x40;
+        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
         DL_Path_OnOff(Path2_OnOff,
              data[BLUECELL_DATA],
@@ -2209,10 +2215,11 @@ bool Bluecell_Operate(uint8_t* data){
 #else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
           return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x04;
+        if(data[BLUECELL_DATA] != 0)
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x04;
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x04;
+        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
         UL_Path_OnOff(Path2_OnOff,
              data[BLUECELL_DATA],
@@ -2258,10 +2265,11 @@ bool Bluecell_Operate(uint8_t* data){
 #else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
           return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x20;
+        if(data[BLUECELL_DATA] != 0)
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x20;
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x20;
+        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
         DL_Path_OnOff(Path3_OnOff,
              data[BLUECELL_DATA],
@@ -2289,10 +2297,11 @@ bool Bluecell_Operate(uint8_t* data){
 #else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
           return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x02;
+        if(data[BLUECELL_DATA] != 0)
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x02;
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x02;
+        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
         UL_Path_OnOff(Path3_OnOff,
              data[BLUECELL_DATA],
@@ -2321,26 +2330,18 @@ bool Bluecell_Operate(uint8_t* data){
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_DL4_PATH :
-#if 0 // PYJ.2020.07.03_BEGIN -- 
-        if(data[BLUECELL_DATA]==0){
-            HAL_GPIO_WritePin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin,GPIO_PIN_RESET);//CLOCK
-            bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4 = 0;
-        }else{
-            HAL_GPIO_WritePin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin,GPIO_PIN_SET);//CLOCK    
-            bluecell_Prevdatastatus.ATT_DL4_H =0xFF;
-            bluecell_Prevdatastatus.ATT_DL4_L = 0xFF;
-            CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
-
-        }
-        bluecell_Currdatastatus.ATT_DL4_PATH = data[BLUECELL_DATA];
-//		printf("Function : %s Line %d \r\n",__func__,__LINE__);
-#else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
           return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x10;
-        else
+        if(data[BLUECELL_DATA] != 0){
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x10;
+        }
+        else{
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x10;
+        }
+
+        printf("data[BLUECELL_DATA] : %d \r\n",data[BLUECELL_DATA]);
+        
+        printf("3.bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",bluecell_Currdatastatus.Path_TempSave_Bit);
 
         DL_Path_OnOff(Path4_OnOff,
              data[BLUECELL_DATA],
@@ -2349,7 +2350,6 @@ bool Bluecell_Operate(uint8_t* data){
              &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,
              &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count4)  ;  
 
-#endif // PYJ.2020.07.03_END -- 
 		break;
 	case ATT_UL4_PATH:
 #if 0 // PYJ.2020.07.03_BEGIN -- 
@@ -2371,10 +2371,11 @@ bool Bluecell_Operate(uint8_t* data){
 #else
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
           return true;
-        if(data[MBIC_PAYLOADSTART] != 0)
-            bluecell_Currdatastatus.Path_TempSave_Bit = 0x01;
+        if(data[BLUECELL_DATA] != 0)
+            bluecell_Currdatastatus.Path_TempSave_Bit |= 0x01;
         else
            bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x01;
+        printf("%d :  bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",data[BLUECELL_DATA], bluecell_Currdatastatus.Path_TempSave_Bit);
 
         UL_Path_OnOff(Path4_OnOff,
              data[BLUECELL_DATA],
@@ -3067,7 +3068,9 @@ bool Bluecell_Operate(uint8_t* data){
         break;
     case Bluecell_Temp_Shutdown_Path_ON_OFF:
          bluecell_Currdatastatus.Path_TempShutdown_Set = data[BLUECELL_DATA];
-         Temp_Shutdown_ONOFF(bluecell_Prevdatastatus.Path_TempShutdown_Set);
+         printf("data[BLUECELL_DATA] : %d \r\n",data[BLUECELL_DATA]);
+         printf("Path_TempShutdown_Set : %d \r\n",bluecell_Currdatastatus.Path_TempShutdown_Set);    
+         Temp_Shutdown_ONOFF(bluecell_Currdatastatus.Path_TempShutdown_Set);
         break;
   }
   
@@ -3153,6 +3156,7 @@ void HFR_TypeInit(){
         PrevMBIC_DL_ShutdownCount[i] = 0xFF;        
     }
 #if 1 // PYJ.2020.06.17_BEGIN -- 
+    printf("bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n",bluecell_Currdatastatus.Path_TempSave_Bit);
     if(bluecell_Currdatastatus.Path_TempSave_Bit & 0x80)
         bluecell_Currdatastatus.ATT_DL1_PATH = true;
     else
@@ -4581,7 +4585,11 @@ void Carrier_ONOFF(uint8_t val){
     }
 }
 void Temp_Shutdown_ONOFF(uint8_t val){
+    printf("val :%d \r\n",val);
+    printf("Path_TempShutdown_Set : %d \r\n",bluecell_Currdatastatus.Path_TempShutdown_Set);    
+    printf(" bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n", bluecell_Currdatastatus.Path_TempSave_Bit);
     if(val == 0){// ON //Path ON
+#if 0 // PYJ.2020.08.14_BEGIN -- 
          bluecell_Currdatastatus.ATT_DL1_PATH= TempShutdown_DL_SaveData[0];    
          bluecell_Currdatastatus.ATT_DL2_PATH= TempShutdown_DL_SaveData[1];    
          bluecell_Currdatastatus.ATT_DL3_PATH= TempShutdown_DL_SaveData[2];    
@@ -4590,10 +4598,52 @@ void Temp_Shutdown_ONOFF(uint8_t val){
          bluecell_Currdatastatus.ATT_UL2_PATH= TempShutdown_UL_SaveData[1];    
          bluecell_Currdatastatus.ATT_UL3_PATH= TempShutdown_UL_SaveData[2];    
          bluecell_Currdatastatus.ATT_UL4_PATH= TempShutdown_UL_SaveData[3];   
+#endif // PYJ.2020.08.14_END -- 
+        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;
+          printf("Path ON \r\n");
 
+    }
+    else{// OFF
 
-    }else{// OFF
-
+#if 0 // PYJ.2020.08.14_BEGIN -- 
         TempShutdown_DL_SaveData[0] = bluecell_Currdatastatus.ATT_DL1_PATH;
         TempShutdown_DL_SaveData[1] = bluecell_Currdatastatus.ATT_DL2_PATH;
         TempShutdown_DL_SaveData[2] = bluecell_Currdatastatus.ATT_DL3_PATH;
@@ -4602,6 +4652,7 @@ void Temp_Shutdown_ONOFF(uint8_t val){
         TempShutdown_UL_SaveData[1] = bluecell_Currdatastatus.ATT_UL2_PATH;
         TempShutdown_UL_SaveData[2] = bluecell_Currdatastatus.ATT_UL3_PATH;
         TempShutdown_UL_SaveData[3] = bluecell_Currdatastatus.ATT_UL4_PATH;
+#endif // PYJ.2020.08.14_END -- 
 
         
         bluecell_Currdatastatus.ATT_DL1_PATH = false;    
@@ -4612,7 +4663,7 @@ void Temp_Shutdown_ONOFF(uint8_t val){
         bluecell_Currdatastatus.ATT_UL2_PATH = false;    
         bluecell_Currdatastatus.ATT_UL3_PATH = false;    
         bluecell_Currdatastatus.ATT_UL4_PATH = false;   
-       
+        printf("Path OOF \r\n");
         bluecell_Currdatastatus.ALARM_TEMP_HIGH = 0;
         bluecell_Currdatastatus.ALARM_DLI_Level = 0;
         bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN = 0;
@@ -4888,12 +4939,7 @@ uint8_t* Alarm_Report_Send(uint8_t Alarm_type,uint8_t val){
     Alarm_ReportData[MBIC_PAYLOADSTART + (Alarm_ReportData[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] ) + 5] =(( crcret  & 0xFF00)>> 8);  
     Alarm_ReportData[MBIC_PAYLOADSTART + (Alarm_ReportData[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] ) + 6] = (( crcret  & 0x00FF));  
     Alarm_ReportData[MBIC_PAYLOADSTART + (Alarm_ReportData[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] ) + 7] = 0x03; 
-
     Uart1_Data_Send(Alarm_ReportData,sizeof(Alarm_ReportData));
-
-    
-    
-
 }
 
 bool MBIC_Operate(uint8_t* data){
@@ -5073,7 +5119,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                     return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x80;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x80;
                 else
                    bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x80;
                 DL_Path_OnOff(Path1_OnOff,
@@ -5087,9 +5133,10 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                     return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x40; 
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x40; 
                 else
-                   bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x40;               
+                   bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x40;       
+                
                 DL_Path_OnOff(Path2_OnOff,
                     data[MBIC_PAYLOADSTART + 3],
                     &bluecell_Currdatastatus.ATT_DL2_PATH,
@@ -5101,7 +5148,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                     return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x20;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x20;
                     else
                    bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x20;
                 DL_Path_OnOff(Path3_OnOff,
@@ -5116,7 +5163,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                     return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x10;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x10;
                 else
                    bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x10;
                 DL_Path_OnOff(Path4_OnOff,
@@ -5295,7 +5342,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                     return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x08;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x08;
                 else
                    bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x08;
                 UL_Path_OnOff(Path1_OnOff,
@@ -5310,7 +5357,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                   return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x04;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x04;
                 else
                     bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x04;
                 UL_Path_OnOff(Path2_OnOff,
@@ -5324,7 +5371,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                   return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x02;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x02;
                 else
                     bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x02;
                 UL_Path_OnOff(Path3_OnOff,
@@ -5338,7 +5385,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
                   return true;
                 if(data[MBIC_PAYLOADSTART + 3] != 0)
-                    bluecell_Currdatastatus.Path_TempSave_Bit = 0x01;
+                    bluecell_Currdatastatus.Path_TempSave_Bit |= 0x01;
                 else
                     bluecell_Currdatastatus.Path_TempSave_Bit &= ~0x01;
                 UL_Path_OnOff(Path4_OnOff,
@@ -6990,8 +7037,8 @@ void ADC_Check(void){
     DET_LevelAlarmCheck();/*DL UL Alarm Check*/
 }
 #else
-#define Percent      2
-#define Percent100 10
+#define Percent       2
+#define Percent100 5
 void ADC_Check(void){
 #if 1 // PYJ.2020.08.07_BEGIN -- 
     //static uint8_t Cnt = 0;
@@ -7000,8 +7047,6 @@ void ADC_Check(void){
    uint32_t ADC1_Average_value[ADC1_CNT];
    static uint32_t HFR_ADC1_Average_value[ADC1_CNT];
    uint32_t ADC3_Average_value[ADC3_CNT];
-
-   // double ret = 0;
     uint16_t MIN_ADC[ADC3_CNT] = {0,};
     uint16_t cnt[ADC3_CNT] = {0,};
     double temp;
@@ -7026,17 +7071,18 @@ void ADC_Check(void){
             Adc3_HFR_Array[i][Total_SamplingCnt] = ADC3_Average_value[i]; 
              for(int index = 0; index <6; index++){
                  Adc3_HFR_Desc_Array[i][index] = Adc3_HFR_Array[i][index] ;
+//                 if(i == 4)
+//                 printf("%d   Adc3_HFR_Desc_Array : %d \r\n",index,Adc3_HFR_Desc_Array[i][index]);
              }                  
             
 
              DascendigFunc(&Adc3_HFR_Desc_Array[i][0],6);
              ADC3_Average_value[i] = 0;
-             
-            for(int index = 0; index <Percent; index++)
+
+            for(int index = 0; index <Percent; index++){
                  ADC3_Average_value[i] += Adc3_HFR_Desc_Array[i][index];
-            
-            ADC3_Average_value[i] /= Percent;                
-            
+            }
+            ADC3_Average_value[i] /= Percent;
         }
         else{
             Adc3_HFR_Array[i][Total_SamplingCnt] = ADC3_Average_value[i];

Src/main.c

@@ -261,7 +261,7 @@ extern void DET_LevelAlarmCheck();
 extern void ALC_Function();
 extern void Boot_LED_Toggle(void);
 extern void ADC_Check(void);
-extern void ADC_Sampling_Func(uint8_t mode,uint16_t Timer2ms_AdcValue,uint8_t index);
+extern void ADC_Sampling_Func();
 
 uint8_t MBICTest_Firmdata[8]  = {1,2,3,4,5,6,7,8};
 
@@ -349,7 +349,7 @@ int main(void)
   /* USER CODE BEGIN WHILE */
   while (1)
   {
-//    ADC_Sampling_Func();
+    //ADC_Sampling_Func();
     ADC_Check();       /*Det Calc + DL/UL Alarm Check Function*/
     Boot_LED_Toggle(); /*LED Check*/
     Uart_Check();      /*Usart Rx*/