ALC AGC 기능 추가 / USER 프로토콜 추가 //EEPROM 메모리 이름 변경

ALC AGC Table 추가

Bluecell_Inc/Bluecell_operate.h

@@ -309,6 +309,7 @@ struct Alarm_UL {
 };
 enum DATATYPE
 {
+    BLUECELL_SOFTWARERESET = 0,
 	ATTSET  = 0x11,
 	ATT_DL1_PATH = 0x12,
 	ATT_UL1_PATH = 0x16,
@@ -334,6 +335,16 @@ enum DATATYPE
     ATT_TableGet = 0x71,
 	Bluecell_StatusReq = 0x77,
 	Bluecell_StatusSave = 0x78,
+    Bluecell_DL1_USER = 0x80,
+    Bluecell_DL2_USER = 0x81,
+    Bluecell_DL3_USER = 0x82,
+    Bluecell_DL4_USER = 0x83,    
+    Bluecell_UL1_USER = 0x84,
+    Bluecell_UL2_USER = 0x85,
+    Bluecell_UL3_USER = 0x86,
+    Bluecell_UL4_USER = 0x87,    
+    Bluecell_TEMP_USER = 0x88,    
+    
 };
 
 
@@ -435,6 +446,17 @@ typedef struct{
   uint16_t m24_dBm;
   uint16_t m25_dBm;
 }DET_DL;
+typedef struct{
+    uint8_t bluecell_User_DL1_H;  uint8_t bluecell_User_DL1_L;
+    uint8_t bluecell_User_DL2_H;  uint8_t bluecell_User_DL2_L;
+    uint8_t bluecell_User_DL3_H;  uint8_t bluecell_User_DL3_L;
+    uint8_t bluecell_User_DL4_H;  uint8_t bluecell_User_DL4_L;
+    uint8_t bluecell_User_UL1_H;  uint8_t bluecell_User_UL1_L;
+    uint8_t bluecell_User_UL2_H;  uint8_t bluecell_User_UL2_L;
+    uint8_t bluecell_User_UL3_H;  uint8_t bluecell_User_UL3_L;
+    uint8_t bluecell_User_UL4_H;  uint8_t bluecell_User_UL4_L;
+}USER_ATTEN_st;
+
 typedef struct{
     uint8_t bluecell_header;
     uint8_t bluecell_type;
@@ -494,22 +516,31 @@ typedef struct{
     uint8_t ATT_ALC3_ONOFF;
     uint8_t ATT_AGC4_ONOFF;
     uint8_t ATT_ALC4_ONOFF;
-    uint8_t ATT_ALC1_H;
-    uint8_t ATT_ALC1_L;
-    uint8_t ATT_ALC2_H;
-    uint8_t ATT_ALC2_L;
-    uint8_t ATT_ALC3_H;
-    uint8_t ATT_ALC3_L;
-    uint8_t ATT_ALC4_H;
-    uint8_t ATT_ALC4_L;
-    uint8_t ATT_AGC1_H;
-    uint8_t ATT_AGC1_L;
-    uint8_t ATT_AGC2_H;
-    uint8_t ATT_AGC2_L;
-    uint8_t ATT_AGC3_H;
-    uint8_t ATT_AGC3_L;
-    uint8_t ATT_AGC4_H;
-    uint8_t ATT_AGC4_L;
+    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 ATT_ALC1_MIN_H;
+    uint8_t ATT_ALC1_MIN_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_User_DL1_H;  uint8_t bluecell_User_DL1_L;
+    uint8_t bluecell_User_DL2_H;  uint8_t bluecell_User_DL2_L;
+    uint8_t bluecell_User_DL3_H;  uint8_t bluecell_User_DL3_L;
+    uint8_t bluecell_User_DL4_H;  uint8_t bluecell_User_DL4_L;
+    uint8_t bluecell_User_UL1_H;  uint8_t bluecell_User_UL1_L;
+    uint8_t bluecell_User_UL2_H;  uint8_t bluecell_User_UL2_L;
+    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_crc;
     uint8_t bluecell_etx;
 
@@ -829,9 +860,15 @@ extern TEMP_TABLE_st Temp_UL3;
 extern TEMP_TABLE_st Temp_UL4;
 
 extern BLUESTATUS_st bluecell_Currdatastatus;
+extern USER_ATTEN_st bluecell_UserData;
+extern volatile uint32_t ALCTimerCnt;
+extern volatile uint32_t AGCTimerCnt;
 
 
 
 extern void Bluecell_DataInit();
+extern void ALC_Function();
+extern void AGC_Function();
+
 
 #endif /* BLUECELL_OPERATE_H_ */

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) + 20)) & 0xFFFF) //96byte
+#define EEPROM_WINDOW_STATUS_ADDRESDS	 ((EEPROM_ATT_BASE + (sizeof(BLUESTATUS_st) + 2)) & 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)
@@ -39,6 +39,8 @@
 #define EEPROM_TEMP_UL2_TABLE_ADDRESDS	 (( EEPROM_TEMP_UL1_TABLE_ADDRESDS +( sizeof(TEMP_TABLE_st)+12))     & 0xFFFF)
 #define EEPROM_TEMP_UL3_TABLE_ADDRESDS	 (( EEPROM_TEMP_UL2_TABLE_ADDRESDS +( sizeof(TEMP_TABLE_st)+12))     & 0xFFFF)
 #define EEPROM_TEMP_UL4_TABLE_ADDRESDS	 (( EEPROM_TEMP_UL3_TABLE_ADDRESDS +( sizeof(TEMP_TABLE_st)+12))     & 0xFFFF)
+#define EEPROM_USER_ATTEN_VALUE_ADDRESDS (( EEPROM_TEMP_UL4_TABLE_ADDRESDS +( sizeof(USER_ATTEN_st)+16))     & 0xFFFF)
+
 #else
 #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

Bluecell_Src/eeprom.c

@@ -30,8 +30,9 @@ bool		EEPROM24XX_Load(uint16_t Address,void *data,size_t size_of_data);
 
 
 void EEPROM_M24C08_Init(void){
+    EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_ATT_BASE,&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st) );
+    
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_WINDOW_STATUS_ADDRESDS,&Att_DL1.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
-//    printf("%x\r\n",Att_DL1.Table_0_0_dBm_H);
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_ATT_DL1_TABLE_ADDRESDS,&Att_DL2.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_ATT_DL2_TABLE_ADDRESDS,&Att_DL3.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_ATT_DL3_TABLE_ADDRESDS,&Att_DL4.Table_0_0_dBm_H,sizeof(ATT_TABLE_st) );
@@ -63,8 +64,11 @@ void EEPROM_M24C08_Init(void){
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL1_TABLE_ADDRESDS,&Temp_UL2.Table_10_Temp_H,sizeof(TEMP_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL2_TABLE_ADDRESDS,&Temp_UL3.Table_10_Temp_H,sizeof(TEMP_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL3_TABLE_ADDRESDS,&Temp_UL4.Table_10_Temp_H,sizeof(TEMP_TABLE_st) );
+    EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_USER_ATTEN_VALUE_ADDRESDS,&bluecell_UserData.bluecell_User_DL1_H,sizeof(USER_ATTEN_st) );
+
 
-    EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL4_TABLE_ADDRESDS,&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st) );
+
+    
 //    printf("bluecell_Currdatastatus.ATT_DL1_H : %x\r\n",bluecell_Currdatastatus.ATT_DL1_H);
 //    printf("bluecell_Currdatastatus.ATT_DL1_L : %x\r\n",bluecell_Currdatastatus.ATT_DL1_L);        
 //    

Inc/main.h

@@ -60,8 +60,8 @@ extern volatile uint16_t ADC3value[5];
 extern volatile uint32_t ADC1_Average_value[4];
 extern volatile uint32_t ADC3_Average_value[5];
 
-extern uint8_t adc1cnt;
-extern uint8_t adc3cnt;
+extern uint16_t adc1cnt;
+extern uint16_t adc3cnt;
 
 extern ADC_HandleTypeDef hadc1;
 extern ADC_HandleTypeDef hadc3;
@@ -71,6 +71,8 @@ extern I2C_HandleTypeDef hi2c2;
 /* USER CODE END EFP */
 
 /* Private defines -----------------------------------------------------------*/
+#define LED_FAIL_Pin GPIO_PIN_3
+#define LED_FAIL_GPIO_Port GPIOE
 #define FAIL_MBIC_Pin GPIO_PIN_4
 #define FAIL_MBIC_GPIO_Port GPIOE
 #define BOOT_LED_Pin GPIO_PIN_15

STM32F103ZET_JDASMBIC.ioc

@@ -309,6 +309,8 @@ PE15.GPIOParameters=GPIO_Label
 PE15.GPIO_Label=PATH_EN_UL4
 PE15.Locked=true
 PE15.Signal=GPIO_Output
+PE3.GPIOParameters=GPIO_Label
+PE3.GPIO_Label=LED_FAIL
 PE3.Locked=true
 PE3.Signal=GPIO_Output
 PE4.GPIOParameters=GPIO_Label

Src/main.c

@@ -71,6 +71,10 @@ volatile uint32_t AdcTimerCnt = 0;
 volatile uint32_t LedTimerCnt = 0;
 volatile uint32_t UartRxTimerCnt = 0;
 volatile uint32_t LDTimerCnt = 0;
+volatile uint32_t ALCTimerCnt = 0;
+volatile uint32_t AGCTimerCnt = 0;
+
+
 /* USER CODE END PV */
 
 /* Private function prototypes -----------------------------------------------*/
@@ -106,8 +110,8 @@ int _write (int file, uint8_t *ptr, uint16_t len)
     HAL_UART_Transmit(&huart1, ptr, len,10);
     return len;
 }
-uint8_t adc1cnt = 0 ;
-uint8_t adc3cnt = 0 ;
+uint16_t adc1cnt = 0 ;
+uint16_t adc3cnt = 0 ;
 
 
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
@@ -117,7 +121,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
 
     if(hadc->Instance == hadc1.Instance)
     {
-        if(adc1cnt < 100){
+        if(adc1cnt < 500){
             for(int i = 0; i < 4; i++){
                 ADC1_Average_value[i] += ADC1value[i]  ;
             }
@@ -126,7 +130,7 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef* hadc)
     }
     if(hadc->Instance == hadc3.Instance)
     {
-        if(adc3cnt < 100){
+        if(adc3cnt < 500){
             for(int i = 0; i < 5; i++){
                 ADC3_Average_value[i] += ADC3value[i]  ;
             }
@@ -211,7 +215,7 @@ uint8_t eepromtestarray1[EEPROM_WINDOW_STATUS_ADDRESDS];
 uint8_t eepromtestReadarray1[EEPROM_WINDOW_STATUS_ADDRESDS];
 #define TESTINDEX  sizeof(TEMP_TABLE_st) 
 void EEPROMTEST_J(){
-#if 1 // PYJ.2020.04.25_BEGIN -- 
+#if 0 // PYJ.2020.04.25_BEGIN -- 
       for(int i = 0; i< TESTINDEX; i++)
           eepromtestarray[i] = i;
       printf("Value %x\r\n",eepromtestarray[1]);
@@ -225,6 +229,11 @@ 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 -- 
 
 
@@ -289,6 +298,7 @@ void eepromtest_j1(){
 }
 #endif // PYJ.2020.04.23_END -- 
 
+extern void ALC_Function();
 
 /* USER CODE END 0 */
 
@@ -369,6 +379,8 @@ int main(void)
     Boot_LED_Toggle();
     Uart_Check();
     ADC_Check();
+    ALC_Function();
+    AGC_Function();
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
@@ -641,7 +653,6 @@ static void MX_I2C2_Init(void)
   hi2c2.Instance = I2C2;
   hi2c2.Init.ClockSpeed = 400000;
   hi2c2.Init.DutyCycle = I2C_DUTYCYCLE_2;
-  
   hi2c2.Init.OwnAddress1 = 0;
   hi2c2.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
   hi2c2.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
@@ -793,7 +804,7 @@ static void MX_GPIO_Init(void)
   __HAL_RCC_GPIOD_CLK_ENABLE();
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOE, GPIO_PIN_3|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
+  HAL_GPIO_WritePin(GPIOE, LED_FAIL_Pin|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
                           |ATT_EN_DL4_Pin|ATT_EN_UL4_Pin|PATH_EN_DL4_Pin|PATH_EN_UL4_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pin Output Level */
@@ -813,9 +824,9 @@ static void MX_GPIO_Init(void)
   HAL_GPIO_WritePin(GPIOD, PATH_EN_DL2_Pin|PATH_EN_UL2_Pin|LED_ACT_Pin|GPIO_PIN_15 
                           |ATT_CLOCK2_Pin|ATT_DATA2_Pin|ATT_EN_DL2_Pin|ATT_EN_UL2_Pin, GPIO_PIN_RESET);
 
-  /*Configure GPIO pins : PE3 FAIL_MBIC_Pin ATT_CLOCK4_Pin ATT_DATA4_Pin 
+  /*Configure GPIO pins : LED_FAIL_Pin FAIL_MBIC_Pin ATT_CLOCK4_Pin ATT_DATA4_Pin 
                            ATT_EN_DL4_Pin ATT_EN_UL4_Pin PATH_EN_DL4_Pin PATH_EN_UL4_Pin */
-  GPIO_InitStruct.Pin = GPIO_PIN_3|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
+  GPIO_InitStruct.Pin = LED_FAIL_Pin|FAIL_MBIC_Pin|ATT_CLOCK4_Pin|ATT_DATA4_Pin 
                           |ATT_EN_DL4_Pin|ATT_EN_UL4_Pin|PATH_EN_DL4_Pin|PATH_EN_UL4_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -888,6 +899,8 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       LedTimerCnt++;
       AdcTimerCnt++;
       LDTimerCnt++;
+      ALCTimerCnt++;
+      AGCTimerCnt++;
   }
   /* USER CODE END Callback 1 */
 }