ALARM Check 부분 추가 AGC 기능 수정및 보완/EEPROM 주소 값 32byte 배수 형태로 변경/ DL UL Table INDEX MBIC와 동일하게 변경

Bluecell_Inc/Bluecell_operate.h

@@ -86,7 +86,7 @@ typedef enum{
 
 	MBIC_HEADERCHECKSUM_0,
 	MBIC_PAYLOADSTART,
-	/*
+    /*
 	 * PayLoadSTART
 	 */
 }MBICProt_st;
@@ -163,6 +163,10 @@ DLI_Level_Low_Alarm1,
 DLI_Level_Low_Alarm2,
 DLI_Level_Low_Alarm3,
 DLI_Level_Low_Alarm4,
+SERIAL_DL_NULL0,
+DLI_FRBT_Atten,
+DLI_FRBT_D_Day,
+DLI_FRBT_Status,
 DLI_AGC_ON_OFF=0xE050,
 DLI_AGC_Threshold,
 DLI_AGC_Threshold_Default,
@@ -308,7 +312,33 @@ enum DATATYPE
     Bluecell_Reset,
 
 };
-
+typedef enum{    
+	DLI_P1_Level_Table_Number = 0x00,
+	DLI_P2_Level_Table_Number = 0x01,
+	DLI_P3_Level_Table_Number = 0x02,
+	DLI_P4_Level_Table_Number = 0x03,
+	ULO_P1_Level_Table_Number = 0x10,
+	ULO_P2_Level_Table_Number = 0x11,
+	ULO_P3_Level_Table_Number = 0x12,
+	ULO_P4_Level_Table_Number = 0x13,
+	DLI_P1_ATT_Temp_guarantee_Table_Number = 0x20,
+	DLI_P2_ATT_Temp_guarantee_Table_Number = 0x21,
+	DLI_P3_ATT_Temp_guarantee_Table_Number = 0x22,
+	DLI_P4_ATT_Temp_guarantee_Table_Number = 0x23,
+	ULO_P1_ATT_Temp_guarantee_Table_Number = 0x30,
+	ULO_P2_ATT_Temp_guarantee_Table_Number = 0x31,
+	ULO_P3_ATT_Temp_guarantee_Table_Number = 0x32,
+	ULO_P4_ATT_Temp_guarantee_Table_Number = 0x33,
+	DLI_P1_ATT_Accuracy_Table_Number = 0x40,
+	DLI_P2_ATT_Accuracy_Table_Number = 0x41,
+	DLI_P3_ATT_Accuracy_Table_Number = 0x42,
+	DLI_P4_ATT_Accuracy_Table_Number = 0x43,
+	ULO_P1_ATT_Accuracy_Table_Number = 0x50,
+	ULO_P2_ATT_Accuracy_Table_Number = 0x51,
+	ULO_P3_ATT_Accuracy_Table_Number = 0x52,
+	ULO_P4_ATT_Accuracy_Table_Number = 0x53,
+}MBIC_Table_Number;
+#define UNIT_TYPE_MBIC 0x01
 /*FLAG BIT START */
 #define ENVIRONMENT_TEMPHIGH 0x80
 #define ALARM_DLI_P4_LEVEL_LOW 0x80
@@ -369,7 +399,7 @@ enum DATATYPE
 #define MBIC_ULO_Shutdown_Threshold_Default_H 0xFF
 #define MBIC_ULO_Shutdown_Threshold_Default_L 0xF0
 
-
+#define HIDDENATTEN 5 * 10
 typedef enum{
 	ENVIRONMENT = 0,
 	DL1,
@@ -442,7 +472,7 @@ typedef struct{
     uint8_t DET_UL4_IN_L;//ADC3   4
     uint8_t BLUECELL_RESERVE1;
     uint8_t DET_TEMP;
-    uint8_t ATT_AGC1_ONOFF;
+    uint8_t DLI_AGC_ON_OFF;
     uint8_t ATT_ALC1_ONOFF;
     uint8_t ATT_AGC2_ONOFF;
     uint8_t ATT_ALC2_ONOFF;
@@ -458,8 +488,8 @@ typedef struct{
     uint8_t ATT_ALC3_MAX_L;
     uint8_t ATT_ALC4_MAX_H;
     uint8_t ATT_ALC4_MAX_L;
-    uint8_t ULO_ALC_Threshold_H;
-    uint8_t ULO_ALC_Threshold_L;
+    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;
@@ -496,7 +526,7 @@ typedef struct{
     uint8_t ALARM_DLI_Level;
     uint8_t ALARM_DLI_AGC_SHTUTDOWN;
     uint8_t ALARM_ULO_Level;
-    uint8_t ALARM_ULO_AGC_SHTUTDOWN;
+    uint8_t ALARM_ULO_ALC_SHTUTDOWN;
     uint8_t ALARM_MASK1;
     uint8_t ALARM_TESTMODE;
     uint8_t ALARM_Test_Dummy1;
@@ -569,7 +599,6 @@ typedef struct{
     
     uint8_t DLI_FRBT_Status;
     
-    uint8_t DLI_AGC_ON_OFF;
     uint8_t DLI_AGC_Threshold_H;
     uint8_t DLI_AGC_Threshold_L;
     uint8_t DLI_AGC_Threshold_default;
@@ -618,8 +647,6 @@ typedef struct{
     uint8_t ULO_Level_High_Alarm3;
     uint8_t ULO_Level_High_Alarm4;
     uint8_t ULO_ALC_ON_OFF;
-//    uint8_t ULO_ALC_Threshold_H;
-//    uint8_t ULO_ALC_Threshold_L;    
     uint8_t ULO_ALC_Threshold_Default;
     uint8_t ULO_Shutdown_ON_OFF;
     uint8_t ULO_Shutdown_Threshold_H;
@@ -637,6 +664,18 @@ typedef struct{
     uint8_t ULO_Shutdown_Alarm2;
     uint8_t ULO_Shutdown_Alarm3;
     uint8_t ULO_Shutdown_Alarm4;
+
+    uint8_t Reserve0;
+    uint8_t Reserve1;
+    uint8_t Reserve2;
+    uint8_t Reserve3;
+    uint8_t Reserve4;
+    uint8_t Reserve5;
+    uint8_t Reserve6;
+    uint8_t Reserve7;    
+    uint8_t Reserve8;
+    uint8_t Reserve9;
+
     uint8_t bluecell_crc;
     uint8_t bluecell_etx;
 

Bluecell_Inc/eeprom.h

@@ -15,7 +15,7 @@
 
 #if 1 // PYJ.2020.04.25_BEGIN -- 
 
-#define EEPROM_ATT_DL1_TABLE_ADDRESDS	 (( EEPROM_ATT_BASE                 +(sizeof(ATT_TABLE_st))   )  & 0xFFFF) //128
+#define EEPROM_ATT_DL1_TABLE_ADDRESDS	 (( EEPROM_ATT_BASE                 + (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)
 #define EEPROM_ATT_DL4_TABLE_ADDRESDS	 (( EEPROM_ATT_DL3_TABLE_ADDRESDS  + (sizeof(ATT_TABLE_st))  ) & 0xFFFF)

Src/main.c

@@ -346,6 +346,7 @@ int main(void)
     ADC_Check();
     ALC_Function();
     AGC_Function();
+    Alarm_Check();
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */