ADC 500 10mV이내 값 평균 내는 기능 추가

/ EERPROM Table ZeroWrite 기능 추가

Bluecell_Inc/Bluecell_operate.h

@@ -533,6 +533,7 @@ typedef struct{
     uint8_t bluecell_User_UL3_H;  uint8_t bluecell_User_UL3_L;
     uint8_t bluecell_User_UL4_H;  uint8_t bluecell_User_UL4_L;
     uint8_t bluecell_User_TEMP_H;  uint8_t bluecell_User_TEMP_L;
+    uint8_t bluecell_User_TEMP_OFFSET_H;  uint8_t bluecell_User_TEMP_OFFSET_L;    
     uint8_t bluecell_crc;
     uint8_t bluecell_etx;
 

Bluecell_Inc/eeprom.h

@@ -14,7 +14,7 @@
 #define EEPROM_ATT_BASE					  0x0000
 
 #if 1 // PYJ.2020.04.25_BEGIN -- 
-#define EEPROM_WINDOW_STATUS_ADDRESDS	 ((EEPROM_ATT_BASE + (sizeof(BLUESTATUS_st) + 2)) & 0xFFFF) //96byte
+#define EEPROM_WINDOW_STATUS_ADDRESDS	 ((EEPROM_ATT_BASE + (sizeof(BLUESTATUS_st))) & 0xFFFF) //96byte
 #define EEPROM_ATT_DL1_TABLE_ADDRESDS	 (( EEPROM_WINDOW_STATUS_ADDRESDS  + (sizeof(ATT_TABLE_st))  )& 0xFFFF) //128
 #define EEPROM_ATT_DL2_TABLE_ADDRESDS	 (( EEPROM_ATT_DL1_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF) 
 #define EEPROM_ATT_DL3_TABLE_ADDRESDS	 (( EEPROM_ATT_DL2_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF)
@@ -89,6 +89,7 @@ HAL_StatusTypeDef EEPROM_M24C08_write(uint8_t devid,uint16_t Address,uint8_t* da
 
 HAL_StatusTypeDef EEPROM_M24C08_ByteRead(uint16_t devid,uint16_t Address,uint8_t* data,uint8_t size);
 HAL_StatusTypeDef EEPROM_M24C08_Bytewrite(uint16_t devid,uint16_t Address,uint8_t* data,uint8_t size);
+HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address);
 
 void EEPROM_M24C08_Init(void);
 

Bluecell_Src/Bluecell_operate.c

@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include "main.h"
 #include "Bluecell_operate.h"
 #include "PE43711.h"
@@ -257,6 +258,7 @@ uint8_t MBIC_TxDataArray[256] = {0,};
 void Boot_LED_Toggle(void){
   if(LedTimerCnt > 500){
     HAL_GPIO_TogglePin(BOOT_LED_GPIO_Port,BOOT_LED_Pin);
+    HAL_GPIO_TogglePin(LED_ACT_GPIO_Port,LED_ACT_Pin);
     LedTimerCnt = 0;
 //    printf("LED OF OFF\r\n");
   }
@@ -974,6 +976,8 @@ void Bluecell_TableSave(uint8_t* data){
     
 }
 uint8_t Txdata[512];
+extern HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address);
+
 bool Bluecell_Operate(uint8_t* data){
   uint8_t datatype = data[BLUECELL_TYPE];
 
@@ -1048,6 +1052,7 @@ bool Bluecell_Operate(uint8_t* data){
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 //            printf("ATT_DL1_PATH ON\r\n");
         }
+        bluecell_Currdatastatus.ATT_DL1_PATH = data[BLUECELL_DATA];
 	
 
 		break;
@@ -1062,18 +1067,19 @@ bool Bluecell_Operate(uint8_t* data){
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
         }
+        bluecell_Currdatastatus.ATT_UL1_PATH = data[BLUECELL_DATA];
 //        printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_SelfTest1		 :
         if(data[BLUECELL_DATA]==0){
-        HAL_GPIO_WritePin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin,GPIO_PIN_RESET);//CLOCK
-        HAL_GPIO_WritePin(PATH_SW1_GPIO_Port,PATH_SW1_Pin,GPIO_PIN_SET);//CLOCK
+            HAL_GPIO_WritePin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin,GPIO_PIN_RESET);//CLOCK
+            HAL_GPIO_WritePin(PATH_SW1_GPIO_Port,PATH_SW1_Pin,GPIO_PIN_SET);//CLOCK
         }
         else{
             HAL_GPIO_WritePin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin,GPIO_PIN_SET);//CLOCK
             HAL_GPIO_WritePin(PATH_SW1_GPIO_Port,PATH_SW1_Pin,GPIO_PIN_RESET);//CLOCK
         }
-        bluecell_Prevdatastatus.Selftest1 = data[BLUECELL_DATA];
+        bluecell_Currdatastatus.Selftest1 = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_DL2_PATH		 :
@@ -1082,7 +1088,11 @@ bool Bluecell_Operate(uint8_t* data){
         }
         else{
             HAL_GPIO_WritePin(PATH_EN_DL2_GPIO_Port,PATH_EN_DL2_Pin,GPIO_PIN_SET);//CLOCK
+            bluecell_Prevdatastatus.ATT_DL2_H = ~bluecell_Prevdatastatus.ATT_DL2_H;
+            bluecell_Prevdatastatus.ATT_DL2_L = ~bluecell_Prevdatastatus.ATT_DL2_L;
+            CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
         }
+        bluecell_Currdatastatus.ATT_DL2_PATH = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 
@@ -1097,6 +1107,7 @@ bool Bluecell_Operate(uint8_t* data){
             bluecell_Prevdatastatus.ATT_UL2_L = ~bluecell_Prevdatastatus.ATT_UL2_L;
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
         }
+        bluecell_Currdatastatus.ATT_UL2_PATH = data[BLUECELL_DATA];
 		break;
 	case ATT_SelfTest2		 :
         if(data[BLUECELL_DATA]==0){
@@ -1106,7 +1117,7 @@ bool Bluecell_Operate(uint8_t* data){
             HAL_GPIO_WritePin(PATH_SW2_GPIO_Port,PATH_SW2_Pin,GPIO_PIN_RESET);//CLOCK
             HAL_GPIO_WritePin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin,GPIO_PIN_SET);//CLOCK
         }
-        bluecell_Prevdatastatus.Selftest2 = data[BLUECELL_DATA];
+        bluecell_Currdatastatus.Selftest2 = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_DL3_PATH :
@@ -1119,6 +1130,7 @@ bool Bluecell_Operate(uint8_t* data){
             bluecell_Prevdatastatus.ATT_DL3_L = ~bluecell_Prevdatastatus.ATT_DL3_L;
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
         }
+        bluecell_Currdatastatus.ATT_DL3_PATH = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_UL3_PATH :
@@ -1131,6 +1143,7 @@ bool Bluecell_Operate(uint8_t* data){
             bluecell_Prevdatastatus.ATT_UL3_L = ~bluecell_Prevdatastatus.ATT_UL3_L;
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
         }
+        bluecell_Currdatastatus.ATT_UL3_PATH = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_SelfTest3 :
@@ -1142,7 +1155,7 @@ bool Bluecell_Operate(uint8_t* data){
             HAL_GPIO_WritePin(PATH_SW3_GPIO_Port,PATH_SW3_Pin,GPIO_PIN_RESET);//CLOCK
             HAL_GPIO_WritePin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin,GPIO_PIN_SET);//CLOCK
         }
-        bluecell_Prevdatastatus.Selftest3 = data[BLUECELL_DATA];
+        bluecell_Currdatastatus.Selftest3 = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_DL4_PATH :
@@ -1155,6 +1168,7 @@ bool Bluecell_Operate(uint8_t* data){
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
         }
+        bluecell_Currdatastatus.ATT_DL4_PATH = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_UL4_PATH:
@@ -1167,6 +1181,7 @@ bool Bluecell_Operate(uint8_t* data){
             bluecell_Prevdatastatus.ATT_UL4_L = ~bluecell_Prevdatastatus.ATT_UL4_L;
             CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
         }
+        bluecell_Currdatastatus.ATT_UL4_PATH = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
 	case ATT_SelfTest4 :
@@ -1177,7 +1192,7 @@ bool Bluecell_Operate(uint8_t* data){
 	    HAL_GPIO_WritePin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin,GPIO_PIN_SET);//CLOCK
 	    HAL_GPIO_WritePin(PATH_SW4_GPIO_Port,PATH_SW4_Pin,GPIO_PIN_RESET);//CLOCK
 	  }
-      bluecell_Prevdatastatus.Selftest4 = data[BLUECELL_DATA];
+      bluecell_Currdatastatus.Selftest4 = data[BLUECELL_DATA];
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
 		break;
     case ALC1_EN :
@@ -1278,11 +1293,13 @@ bool Bluecell_Operate(uint8_t* data){
         break;
     case Bluecell_StatusSave:
 //        printf("Copy Complete");
-        Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
-        EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE),&DataWrite[0],sizeof(BLUESTATUS_st));
-        Bluecell_StructCpy(&Txdata[0],&DataWrite[0],sizeof(BLUESTATUS_st));
-        Txdata[sizeof(BLUESTATUS_st) - 2] = STH30_CreateCrc(&Txdata[BLUECELL_TYPE], sizeof(BLUESTATUS_st) - 3);
-        Uart1_Data_Send(&Txdata[0], sizeof(BLUESTATUS_st));        
+//        Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
+//        EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE),&DataWrite[0],sizeof(BLUESTATUS_st));
+//        Bluecell_StructCpy(&Txdata[0],&DataWrite[0],sizeof(BLUESTATUS_st));
+//        Txdata[sizeof(BLUESTATUS_st) - 2] = STH30_CreateCrc(&Txdata[BLUECELL_TYPE], sizeof(BLUESTATUS_st) - 3);
+//        Uart1_Data_Send(&Txdata[0], sizeof(BLUESTATUS_st));        
+        EEPROM_M24C08_Zerowrite(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE));
+
         break;
 
     case Bluecell_DL1_USER: 
@@ -1332,6 +1349,9 @@ bool Bluecell_Operate(uint8_t* data){
   if(datatype != Bluecell_StatusReq){
       Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
       EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE),&DataWrite[0],sizeof(BLUESTATUS_st));
+//      Bluecell_StructCpy(&Txdata[0],&DataWrite[0],sizeof(BLUESTATUS_st));
+//      Txdata[sizeof(BLUESTATUS_st) - 2] = STH30_CreateCrc(&Txdata[BLUECELL_TYPE], sizeof(BLUESTATUS_st) - 3);
+//      Uart1_Data_Send(&Txdata[0], sizeof(BLUESTATUS_st));        
   }
   return true;
 }
@@ -1340,11 +1360,6 @@ void DataStatusSet(void){
         bluecell_Currdatastatus.bluecell_type = Bluecell_StatusReq;
         bluecell_Currdatastatus.bluecell_length = sizeof(bluecell_Currdatastatus) - 3;    
         bluecell_Currdatastatus.bluecell_crcindex = sizeof(bluecell_Currdatastatus) - 2 + 1;    
-        bluecell_Currdatastatus.Selftest1 = HAL_GPIO_ReadPin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin);
-        bluecell_Currdatastatus.Selftest2 = HAL_GPIO_ReadPin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin);
-        bluecell_Currdatastatus.Selftest3 = HAL_GPIO_ReadPin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin);
-        bluecell_Currdatastatus.Selftest4 = HAL_GPIO_ReadPin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin);
-        bluecell_Currdatastatus.ATT_DL1_PATH = HAL_GPIO_ReadPin(PATH_EN_DL1_GPIO_Port,PATH_EN_DL1_Pin);//CLOCK;
         bluecell_Currdatastatus.ATT_DL2_PATH = HAL_GPIO_ReadPin(PATH_EN_DL2_GPIO_Port,PATH_EN_DL2_Pin);//CLOCK;
         bluecell_Currdatastatus.ATT_DL3_PATH = HAL_GPIO_ReadPin(PATH_EN_DL3_GPIO_Port,PATH_EN_DL3_Pin);//CLOCK;
         bluecell_Currdatastatus.ATT_DL4_PATH = HAL_GPIO_ReadPin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin);//CLOCK;
@@ -1356,44 +1371,8 @@ void DataStatusSet(void){
              
         
      
-        /*bluecell_Currdatastatus.ATT_AGC1_ONOFF;
-        bluecell_Currdatastatus.ATT_ALC1_ONOFF;
-        bluecell_Currdatastatus.ATT_AGC2_ONOFF;
-        bluecell_Currdatastatus.ATT_ALC2_ONOFF;
-        bluecell_Currdatastatus.ATT_AGC3_ONOFF;
-        bluecell_Currdatastatus.ATT_ALC3_ONOFF;
-        bluecell_Currdatastatus.ATT_AGC4_ONOFF;
-        bluecell_Currdatastatus.ATT_ALC4_ONOFF;
-        bluecell_Currdatastatus.ATT_ALC1_MIN_H;
-        bluecell_Currdatastatus.ATT_ALC1_MIN_L;
-        bluecell_Currdatastatus.ATT_ALC1_MAX_H;
-        bluecell_Currdatastatus.ATT_ALC1_MAX_L;
-        bluecell_Currdatastatus.ATT_ALC2_MIN_H;
-        bluecell_Currdatastatus.ATT_ALC2_MIN_L;
-        bluecell_Currdatastatus.ATT_ALC2_MAX_H;
-        bluecell_Currdatastatus.ATT_ALC2_MAX_L;
-        bluecell_Currdatastatus.ATT_ALC3_MIN_H;
-        bluecell_Currdatastatus.ATT_ALC3_MIN_L;
-        bluecell_Currdatastatus.ATT_ALC3_MAX_H;
-        bluecell_Currdatastatus.ATT_ALC3_MAX_L;
-        bluecell_Currdatastatus.ATT_ALC4_MIN_H;
-        bluecell_Currdatastatus.ATT_ALC4_MIN_L;
-        bluecell_Currdatastatus.ATT_ALC4_MAX_H;
-        bluecell_Currdatastatus.ATT_ALC4_MAX_L;  */
 }
  void Bluecell_DataInit(){
-    HAL_GPIO_WritePin(PATH_SW1_GPIO_Port,_PATH_SW1_Pin,bluecell_Currdatastatus.Selftest1   );     
-    HAL_GPIO_WritePin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin,bluecell_Currdatastatus.Selftest1   );     
-    
-    HAL_GPIO_WritePin(PATH_SW2_GPIO_Port,_PATH_SW2_Pin,bluecell_Currdatastatus.Selftest2   );     
-    HAL_GPIO_WritePin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin,bluecell_Currdatastatus.Selftest2   );     
-    
-    HAL_GPIO_WritePin(PATH_SW3_GPIO_Port,_PATH_SW3_Pin,bluecell_Currdatastatus.Selftest3   );     
-    HAL_GPIO_WritePin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin,bluecell_Currdatastatus.Selftest3   );     
-    
-    HAL_GPIO_WritePin(PATH_SW4_GPIO_Port,_PATH_SW4_Pin,bluecell_Currdatastatus.Selftest4   );     
-    HAL_GPIO_WritePin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin,bluecell_Currdatastatus.Selftest4   );     
-
 
     
     HAL_GPIO_WritePin(PATH_EN_DL1_GPIO_Port,PATH_EN_DL1_Pin,bluecell_Currdatastatus.ATT_DL1_PATH);   
@@ -1410,39 +1389,44 @@ void DataStatusSet(void){
 
     CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
     if(bluecell_Currdatastatus.Selftest1==0){
+//        printf("Selftest1 : 0 \r\n");
         HAL_GPIO_WritePin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin,GPIO_PIN_RESET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW1_GPIO_Port,PATH_SW1_Pin,GPIO_PIN_SET);//CLOCK
     }else{
+//        printf("Selftest1 : 1 \r\n");
         HAL_GPIO_WritePin(_PATH_SW1_GPIO_Port,_PATH_SW1_Pin,GPIO_PIN_SET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW1_GPIO_Port,PATH_SW1_Pin,GPIO_PIN_RESET);//CLOCK
     }
-    if(bluecell_Currdatastatus.Selftest2=0){
+    if(bluecell_Currdatastatus.Selftest2==0){
+//                printf("Selftest1 : 0 \r\n");
         HAL_GPIO_WritePin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin,GPIO_PIN_RESET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW2_GPIO_Port,PATH_SW2_Pin,GPIO_PIN_SET);//CLOCK
     }else{
+//        printf("Selftest2 : 1 \r\n");
         HAL_GPIO_WritePin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin,GPIO_PIN_SET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW2_GPIO_Port,PATH_SW2_Pin,GPIO_PIN_RESET);//CLOCK
     }
-    if(bluecell_Currdatastatus.Selftest3=0){
+    if(bluecell_Currdatastatus.Selftest3==0){
+//                printf("Selftest1 : 0 \r\n");
         HAL_GPIO_WritePin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin,GPIO_PIN_RESET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW3_GPIO_Port,PATH_SW3_Pin,GPIO_PIN_SET);//CLOCK
     }else{
+//                printf("Selftest3 : 1 \r\n");
         HAL_GPIO_WritePin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin,GPIO_PIN_SET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW3_GPIO_Port,PATH_SW3_Pin,GPIO_PIN_RESET);//CLOCK
     }
-    if(bluecell_Currdatastatus.Selftest4=0){
+    if(bluecell_Currdatastatus.Selftest4==0){
+//                printf("Selftest4 : 0 \r\n");
         HAL_GPIO_WritePin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin,GPIO_PIN_RESET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW4_GPIO_Port,PATH_SW4_Pin,GPIO_PIN_SET);//CLOCK
     }else{
+//                printf("Selftest4 : 1 \r\n");
         HAL_GPIO_WritePin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin,GPIO_PIN_SET);//CLOCK
         HAL_GPIO_WritePin(PATH_SW4_GPIO_Port,PATH_SW4_Pin,GPIO_PIN_RESET);//CLOCK
     }
 
 
     DataStatusSet();
-//    Bluecell_StructCpy(&Txdata[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
-//    Txdata[Txdata[BLUECELL_LENGTH] + 1] = STH30_CreateCrc(&Txdata[BLUECELL_TYPE], Txdata[BLUECELL_LENGTH]);    
-//    Uart1_Data_Send(&Txdata[0], sizeof(BLUESTATUS_st));
 }
 uint8_t* MBIC_HeaderDataSetting(uint8_t* data){
 	ResultData[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
@@ -1477,7 +1461,7 @@ uint8_t* MBIC_HeaderDataSetting(uint8_t* data){
 bool MBIC_Operate(uint8_t* data){
 	uint16_t datatype = 0;
     uint8_t Length = 0;
-    uint8_t SubData[256] = 0;
+    uint8_t SubData[256] = {0,};
     /*AID*/
     datatype = ((data[MBIC_PROT_SUB_DATA_INDEX] << 8) & 0xFF00)  // 2byte Data
               |((data[MBIC_PROT_SUB_DATA_INDEX + 1] << 8) & 0x00FF) ;
@@ -1608,10 +1592,60 @@ bool MBIC_Operate(uint8_t* data){
 	return true;
 }
 
+uint16_t Ascendingcompare(const void *a, const void *b)    // 오름차순 비교 함수 구현
+{
+    uint16_t num1 = *(int *)a;    // void 포인터를 int 포인터로 변환한 뒤 역참조하여 값을 가져옴
+    uint16_t num2 = *(int *)b;    // void 포인터를 int 포인터로 변환한 뒤 역참조하여 값을 가져옴
 
+    if (num1 < num2)    // a가 b보다 작을 때는
+        return -1;      // -1 반환
+    
+    if (num1 > num2)    // a가 b보다 클 때는
+        return 1;       // 1 반환
+    
+    return 0;    // a와 b가 같을 때는 0 반환
+}
+uint16_t Descendingcompare(const void *a, const void *b)    // 내림차순 비교 함수 구현
+{
+    uint16_t num1 = *(uint16_t *)a;    // void 포인터를 uint16_t 포인터로 변환한 뒤 역참조하여 값을 가져옴
+    uint16_t num2 = *(uint16_t *)b;    // void 포인터를 uint16_t 포인터로 변환한 뒤 역참조하여 값을 가져옴
+
+    if (num1 > num2)    // a가 b보다 클 때는
+        return -1;      // -1 반환
+    
+    if (num1 < num2)    // a가 b보다 작을 때는
+        return 1;       // 1 반환
+    
+    return 0;           // a와 b가 같을 때는 0 반환
+}
+void DascendigFunc(uint16_t* data,uint32_t size ){
+
+  int temp;
+  for(int i = 0 ; i < size - 1 ; i ++) {
+      for(int j = i+1 ; j < size ; j ++) {
+          if(data[i] < data[j]) {
+              temp = data[j];
+              data[j] = data[i];
+              data[i] = temp;
+        }
+      }
+  }
+}
+
+uint32_t SumFunc(uint16_t* data,uint16_t size){
+    uint32_t ret = 0;
+    for (uint16_t i = 0; i < size; i++)    // 배열의 요소 개수만큼 반복
+    {
+        ret += data[i];    // sum과 배열의 요소를 더해서 다시 sum에 저장
+    }
+    return ret;
+}
 
 extern volatile uint32_t ADC1_Average_value[4];
 extern volatile uint32_t ADC3_Average_value[5];
+extern volatile uint16_t ADC1valuearray[4][ADC_AVERAGECNT];
+extern volatile uint16_t ADC3valuearray[5][ADC_AVERAGECNT];
+
 uint16_t ADC1Ret[4];
 uint16_t ADC3Ret[5];
 
@@ -1619,11 +1653,33 @@ void ADC_Check(void){
     static uint8_t Cnt = 0;
     double Volt_Calc_val = 3.3 / 4095;
     double ret = 0;
+    uint16_t MIN_ADC[ADC3_CNT] = {0,};
+    uint16_t cnt[ADC3_CNT] = {0,};
 //    if(AdcTimerCnt > 10){
-    
+    // 정렬할 배열, 요소 개수, 요소 크기, 비교 함수를 넣어줌
+
+
+
     if(adc3cnt >= 500){
+  for(int i = 0; i < ADC1_CNT; i++){
+            DascendigFunc(&ADC3valuearray[i][0],ADC_AVERAGECNT);
+            MIN_ADC[i] = ADC3valuearray[i][0] - 12;
+            for(int a = 0; a < ADC_AVERAGECNT; a++){
+//                 printf("ADC3valuearray[%d][%d] : %d \r\n",i,a,ADC3valuearray[i][a]);
+                if(ADC3valuearray[i][a] < MIN_ADC[i]){
+                    cnt[i] = a;
+//                    printf("cnt[i] %d \r\n",cnt[i]);
+                    break;
+                }else{
+                    cnt[i] = ADC_AVERAGECNT;
+                }
+            }
+            ADC3_Average_value[i] = SumFunc(&ADC3valuearray[i][0],cnt[i]);
+//            printf("ADC3_Average_value[%d] : %d / %f \r\n",i,ADC3_Average_value[i],ADC3_Average_value[i]/cnt[i] * Volt_Calc_val);
+        }
+
         for(int i = 0; i < 5; i++){
-            ADC3Ret[i] = ADC3_Average_value[i] / adc3cnt;
+            ADC3Ret[i] = ADC3_Average_value[i] / cnt[i];
             ADC3_Average_value[i] = 0;
         }
         adc3cnt = 0;
@@ -1669,9 +1725,27 @@ void ADC_Check(void){
         printf("ADC3Ret[4] : %d        DL4 : %f\r\n",ADC3Ret[4],ret);
 #endif // PYJ.2020.04.26_END -- 
     }
+
     if(adc1cnt >= 500){ 
+        for(int i = 0; i < ADC1_CNT; i++){
+            DascendigFunc(&ADC1valuearray[i][0],ADC_AVERAGECNT);
+            MIN_ADC[i] = ADC1valuearray[i][0] - 12;
+            for(int a = 0; a < ADC_AVERAGECNT; a++){
+//                 printf("ADC1valuearray[%d][%d] : %d \r\n",i,a,ADC1valuearray[i][a]);
+                if(ADC1valuearray[i][a] < MIN_ADC[i]){
+                    cnt[i] = a;
+//                    printf("cnt[i] %d \r\n",cnt[i]);
+                    break;
+                }else{
+                    cnt[i] = ADC_AVERAGECNT;
+                }
+            }
+            ADC1_Average_value[i] = SumFunc(&ADC1valuearray[i][0],cnt[i]);
+//            printf("ADC1_Average_value[%d] : %d / %f \r\n",i,ADC1_Average_value[i],ADC1_Average_value[i]/cnt[i] * Volt_Calc_val);
+        }
+
         for(int i = 0; i < 4; i++){
-            ADC1Ret[i] = ADC1_Average_value[i] / adc1cnt;
+            ADC1Ret[i] = ADC1_Average_value[i] / cnt[i];
             ADC1_Average_value[i] = 0;
         }
         adc1cnt = 0;

Bluecell_Src/eeprom.c

@@ -165,7 +165,7 @@ HAL_StatusTypeDef EEPROM_M24C08_write(uint8_t devid,uint16_t Address,uint8_t* da
 //    printf("Remain Data Index : %d \r\n",sizeremain);
     
     if(sizeremain > 0){
-         printf("Remain Data Write Start ");
+//         printf("Remain Data Write Start ");
         for(int i = 0; i < sizeremain; i++){
             ret = HAL_I2C_Mem_Write(&hi2c2, devid  ,((Address + addrees_inc + i)& 0xFFFF) ,  I2C_MEMADD_SIZE_16BIT, &data[addrees_inc + i], 1, 1024);
          //       EEPROM24XX_Save( Address,data, size);
@@ -180,6 +180,28 @@ HAL_StatusTypeDef EEPROM_M24C08_write(uint8_t devid,uint16_t Address,uint8_t* da
     return ret;
 }
 
+HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address){
+    HAL_StatusTypeDef ret = HAL_ERROR;
+    uint8_t sizecnt = 0,sizeremain = 0; 
+    uint16_t addrees_inc = 0;
+    addrees_inc = 0;
+    uint8_t data[4096] = {0,};
+
+
+    for(int i = 0 ; i < 128; i++ ){
+         addrees_inc = i * MAXEEPROM_LENG;
+         ret = HAL_I2C_Mem_Write(&hi2c2, devid  ,((Address + addrees_inc) & 0xFFFF) ,  I2C_MEMADD_SIZE_16BIT, &data[0], MAXEEPROM_LENG, 1024);
+
+         if(ret == HAL_ERROR)
+             printf("Write ERR\r\n");
+         else
+             HAL_Delay(20);
+    }
+
+
+    return ret;
+}
+
 
 
 

Bluecell_Src/uart.c

@@ -20,12 +20,11 @@ extern volatile uint32_t UartRxTimerCnt;
 extern bool Bluecell_Operate(uint8_t* data);
 void InitUartQueue(pUARTQUEUE pQueue)
 {
-  setbuf(stdout, NULL);
   pQueue->data = pQueue->head = pQueue->tail = 0;
   uart_hal_tx.output_p = uart_hal_tx.input_p = 0;
   if (HAL_UART_Receive_DMA(&hTerminal, TerminalQueue.Buffer, 1) != HAL_OK)
   {
-    //_Error_Handler(__FILE__, __LINE__);
+//    _Error_Handler(__FILE__, __LINE__);
   }
   //HAL_UART_Receive_DMA(&hTerminal,  TerminalQueue.Buffer, 1);
   //HAL_UART_Receive_IT(hTerminal, pQueue->Buffer + pQueue->head, 1);

Inc/main.h

@@ -174,6 +174,9 @@ extern I2C_HandleTypeDef hi2c2;
 #define ATT_EN_DL1_Pin GPIO_PIN_9
 #define ATT_EN_DL1_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
+#define ADC_AVERAGECNT 500
+#define ADC1_CNT 4
+#define ADC3_CNT 5
 
 /* USER CODE END Private defines */
 

STM32F103ZET_JDASMBIC.ioc

@@ -425,7 +425,7 @@ ProjectManager.StackSize=0x400
 ProjectManager.TargetToolchain=TrueSTUDIO
 ProjectManager.ToolChainLocation=
 ProjectManager.UnderRoot=true
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_ADC1_Init-ADC1-false-HAL-true,6-MX_ADC3_Init-ADC3-false-HAL-true,7-MX_USART2_UART_Init-USART2-false-HAL-true,8-MX_TIM6_Init-TIM6-false-HAL-true,9-MX_CRC_Init-CRC-false-HAL-true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-MX_DMA_Init-DMA-false-HAL-true,3-SystemClock_Config-RCC-false-HAL-false,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_ADC1_Init-ADC1-false-HAL-true,6-MX_ADC3_Init-ADC3-false-HAL-true,7-MX_USART2_UART_Init-USART2-false-HAL-true,8-MX_TIM6_Init-TIM6-false-HAL-true,9-MX_CRC_Init-CRC-false-HAL-true,10-MX_I2C2_Init-I2C2-false-HAL-true
 RCC.ADCFreqValue=14000000
 RCC.ADCPresc=RCC_ADCPCLK2_DIV4
 RCC.AHBFreq_Value=56000000

Src/main.c

@@ -62,10 +62,12 @@ DMA_HandleTypeDef hdma_usart1_rx;
 DMA_HandleTypeDef hdma_usart1_tx;
 
 /* USER CODE BEGIN PV */
-volatile uint16_t ADC1value[4];
-volatile uint16_t ADC3value[5];
-volatile uint32_t ADC1_Average_value[4];
-volatile uint32_t ADC3_Average_value[5];
+volatile uint16_t ADC1value[ADC1_CNT];
+volatile uint16_t ADC3value[ADC3_CNT];
+volatile uint32_t ADC1_Average_value[ADC1_CNT];
+volatile uint32_t ADC3_Average_value[ADC3_CNT];
+volatile uint16_t ADC1valuearray[ADC1_CNT][ADC_AVERAGECNT];
+volatile uint16_t ADC3valuearray[ADC3_CNT][ADC_AVERAGECNT];
 
 volatile uint32_t AdcTimerCnt = 0;
 volatile uint32_t LedTimerCnt = 0;
@@ -117,13 +119,14 @@ uint16_t adc3cnt = 0 ;
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 {
 //?��?��?�� 코드 ?��?��
-//만약 ?��?�� adc?���??? �????��?�� ?�� ?��?���??? ?��?���??? ?��?��?? 같이 조건�??? ?��?��
+//諤嵸烄 ?嚙踝蕭?嚙踝蕭 adc?嚙踝蕭嚙???? 嚙?????嚙踝蕭?嚙踝蕭 ?嚙踝蕭 ?嚙踝蕭?嚙踝蕭嚙???? ?嚙踝蕭?嚙踝蕭嚙???? ?嚙踝蕭?嚙踝蕭?? 穈軤𦚯 魽國探嚙???? ?嚙踝蕭?嚙踝蕭
 
     if(hadc->Instance == hadc1.Instance)
     {
         if(adc1cnt < 500){
             for(int i = 0; i < 4; i++){
-                ADC1_Average_value[i] += ADC1value[i]  ;
+//                ADC1_Average_value[i] += ADC1value[i];
+                ADC1valuearray[i][adc1cnt] = ADC1value[i];
             }
             adc1cnt++;
         }
@@ -132,7 +135,8 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
     {
         if(adc3cnt < 500){
             for(int i = 0; i < 5; i++){
-                ADC3_Average_value[i] += ADC3value[i]  ;
+//                ADC3_Average_value[i] += ADC3value[i]  ;
+                ADC3valuearray[i][adc3cnt] = ADC3value[i];
             }
             adc3cnt++;
         }
@@ -209,13 +213,15 @@ void eepromtest(){
 uint8_t i2ctest[10] = {22,};
 uint8_t i2cTestData[1] = {44};
 #endif // PYJ.2020.04.23_END -- 
+#if 0
 uint8_t eepromtestarray[1024 * 3];
 uint8_t eepromtestReadarray[1024 * 3];
 uint8_t eepromtestarray1[EEPROM_WINDOW_STATUS_ADDRESDS];
 uint8_t eepromtestReadarray1[EEPROM_WINDOW_STATUS_ADDRESDS];
 #define TESTINDEX  sizeof(TEMP_TABLE_st) 
-void EEPROMTEST_J(){
+#endif
 #if 0 // PYJ.2020.04.25_BEGIN -- 
+void EEPROMTEST_J(){
       for(int i = 0; i< TESTINDEX; i++)
           eepromtestarray[i] = i;
       printf("Value %x\r\n",eepromtestarray[1]);
@@ -229,16 +235,15 @@ void EEPROMTEST_J(){
         for(int i = 0; i< TESTINDEX; i++)
             printf("%d ",eepromtestReadarray[i]);
                printf("\r\n");
-#else        
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_ATT_BASE,&eepromtestReadarray[0],sizeof(BLUESTATUS_st) );
     for(int i = 0; i< sizeof(BLUESTATUS_st); i++)
                printf("%d ",eepromtestReadarray[i]);
 
-#endif // PYJ.2020.04.25_END -- 
 
 
 }
-#if 1 // PYJ.2020.04.23_BEGIN -- 
+#endif // PYJ.2020.04.25_END -- 
+#if 0 // PYJ.2020.04.23_BEGIN -- 
 void eepromtest_j1(){
 uint8_t ret  = 0;
   for(int i = 0; i < 128; i++)