SelfTest 기능 통합

Gain Value 저장 기능 추가

Bluecell_Inc/Bluecell_operate.h

@@ -492,6 +492,11 @@ ULO_SelfTest1,
 ULO_SelfTest2,
 ULO_SelfTest3,
 ULO_SelfTest4,
+ULO_PATH1_GAIN,
+ULO_PATH2_GAIN,
+ULO_PATH3_GAIN,
+ULO_PATH4_GAIN,
+ULO_SelfTest_ONOFF,
 ULO_ALC_ON_OFF=0x80,
 ULO_ALC_Threshold,
 ULO_ALC_Threshold_Default,
@@ -554,16 +559,13 @@ enum DATATYPE
     BLUECELL_SOFTWARERESET = 0,
 	ATT_DL1_PATH = 0x12,
 	ATT_UL1_PATH = 0x16,
-	ATT_SelfTest1 = 0x18,
+	ATT_SelfTest = 0x18,
 	ATT_DL2_PATH = 0x22,
 	ATT_UL2_PATH = 0x26,
-	ATT_SelfTest2 = 0x28,
 	ATT_DL3_PATH = 0x32,
 	ATT_UL3_PATH = 0x36,
-	ATT_SelfTest3 = 0x38,
 	ATT_DL4_PATH = 0x42,
 	ATT_UL4_PATH = 0x46,
-	ATT_SelfTest4 = 0x48,
 	Bluecell_ULO_ALC_ON_OFF = 0x51,
     Bluecell_DLI_AGC_ON_OFF = 0x61,
     ATT_TableSet = 0x70,
@@ -633,7 +635,11 @@ enum DATATYPE
     Bluecell_UL_Det_Path2_Offset,    
     Bluecell_UL_Det_Path3_Offset,    
     Bluecell_UL_Det_Path4_Offset, 
-    Bluecell_Temp_Shutdown_Path_ON_OFF
+    Bluecell_Temp_Shutdown_Path_ON_OFF,
+    Bluecell_Path1_GainValue,
+    Bluecell_Path2_GainValue,
+    Bluecell_Path3_GainValue,
+    Bluecell_Path4_GainValue,
 };
 typedef enum{    
 	DLI_P1_Level_Table_Number = 0x00,
@@ -786,10 +792,10 @@ typedef struct{
     uint8_t bluecell_type;
     uint8_t bluecell_length;
     uint8_t bluecell_crcindex;
-    uint8_t Selftest1;
-    uint8_t Selftest2;
-    uint8_t Selftest3;
-    uint8_t Selftest4;
+    int8_t Path1_GainValue;
+    int8_t Path2_GainValue;
+    int8_t Path3_GainValue;
+    int8_t Path4_GainValue;
     uint8_t ATT_DL1_PATH;
     uint8_t ATT_DL2_PATH;
     uint8_t ATT_DL3_PATH;
@@ -1002,51 +1008,32 @@ typedef struct{
     uint8_t MBIC_ULO_ALC_Atten3_L;
     uint8_t MBIC_ULO_ALC_Atten4_H;
     uint8_t MBIC_ULO_ALC_Atten4_L;
-    int8_t MBIC_DLI_P1_Level_Table_Ref;
-    int8_t MBIC_DLI_P2_Level_Table_Ref;
-    int8_t MBIC_DLI_P3_Level_Table_Ref;
-    int8_t MBIC_DLI_P4_Level_Table_Ref;
-    int8_t MBIC_ULO_P1_Level_Table_Ref;
-    int8_t MBIC_ULO_P2_Level_Table_Ref;
-    int8_t MBIC_ULO_P3_Level_Table_Ref;
-    int8_t MBIC_ULO_P4_Level_Table_Ref;
-    int8_t MBIC_TEMP_DL_P1_Level_Table_Ref;
-    int8_t MBIC_TEMP_DL_P2_Level_Table_Ref;
-    int8_t MBIC_TEMP_DL_P3_Level_Table_Ref;
-    int8_t MBIC_TEMP_DL_P4_Level_Table_Ref;
-    int8_t MBIC_TEMP_UL_P1_Level_Table_Ref;
-    int8_t MBIC_TEMP_UL_P2_Level_Table_Ref;
-    int8_t MBIC_TEMP_UL_P3_Level_Table_Ref;
-    int8_t MBIC_TEMP_UL_P4_Level_Table_Ref;
-    int8_t MBIC_DLI_P1_Table_Length;
-    int8_t MBIC_DLI_P2_Table_Length;
-    int8_t MBIC_DLI_P3_Table_Length;
-    int8_t MBIC_DLI_P4_Table_Length;
-    int8_t MBIC_ULO_P1_Table_Length;
-    int8_t MBIC_ULO_P2_Table_Length;
-    int8_t MBIC_ULO_P3_Table_Length;
-    int8_t MBIC_ULO_P4_Table_Length;
-    int8_t MBIC_DLI_P1_Level_Table_Length;
-    int8_t MBIC_DLI_P2_Level_Table_Length;
-    int8_t MBIC_DLI_P3_Level_Table_Length;
-    int8_t MBIC_DLI_P4_Level_Table_Length;
-    int8_t MBIC_ULO_P1_Level_Table_Length;
-    int8_t MBIC_ULO_P2_Level_Table_Length;
-    int8_t MBIC_ULO_P3_Level_Table_Length;
-    int8_t MBIC_ULO_P4_Level_Table_Length;
-    int8_t MBIC_TEMP_DL_P1_Level_Table_Length;
-    int8_t MBIC_TEMP_DL_P2_Level_Table_Length;
-    int8_t MBIC_TEMP_DL_P3_Level_Table_Length;
-    int8_t MBIC_TEMP_DL_P4_Level_Table_Length;
-    int8_t MBIC_TEMP_UL_P1_Level_Table_Length;
-    int8_t MBIC_TEMP_UL_P2_Level_Table_Length;
-    int8_t MBIC_TEMP_UL_P3_Level_Table_Length;
-    int8_t MBIC_TEMP_UL_P4_Level_Table_Length;
     uint8_t DL_Det_ALL_Offset;
     uint8_t MBIC_Download_Auto_Restart_Set;    
     uint8_t Path_TempSave_Bit;/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
     uint8_t Path_TempShutdown_Set;/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
-    int8_t UL_Det_Path_Offset[1];
+    uint8_t SelfTest;
+    /**/
+    /*Add*/
+    uint8_t SelfTest_ATT_DL1_H;
+    uint8_t SelfTest_ATT_DL1_L;
+    uint8_t SelfTest_ATT_DL2_H;
+    uint8_t SelfTest_ATT_DL2_L;
+    uint8_t SelfTest_ATT_DL3_H;
+    uint8_t SelfTest_ATT_DL3_L;
+    uint8_t SelfTest_ATT_DL4_H;
+    uint8_t SelfTest_ATT_DL4_L;
+
+    uint8_t SelfTest_ATT_UL1_H;
+    uint8_t SelfTest_ATT_UL1_L;
+    uint8_t SelfTest_ATT_UL2_H;
+    uint8_t SelfTest_ATT_UL2_L;
+    uint8_t SelfTest_ATT_UL3_H;
+    uint8_t SelfTest_ATT_UL3_L;
+    uint8_t SelfTest_ATT_UL4_H;
+    uint8_t SelfTest_ATT_UL4_L;
+    uint8_t Reserve[24];
+    /**/
     uint8_t bluecell_crc_H;
     uint8_t bluecell_crc_L;
     uint8_t bluecell_etx;

Bluecell_Inc/eeprom.h

@@ -40,7 +40,7 @@
 #define EEPROM_TEMP_UL3_TABLE_ADDRESDS	 (( EEPROM_TEMP_UL2_TABLE_ADDRESDS +( sizeof(TEMP_TABLE_st)))     & 0xFFFF)
 #define EEPROM_TEMP_UL4_TABLE_ADDRESDS	 (( EEPROM_TEMP_UL3_TABLE_ADDRESDS +( sizeof(TEMP_TABLE_st)))     & 0xFFFF)
 #define EEPROM_USER_ATTEN_VALUE_ADDRESDS (( EEPROM_TEMP_UL4_TABLE_ADDRESDS +( sizeof(USER_ATTEN_st)+16))     & 0xFFFF)
-#define EEPROM_WINDOW_STATUS_ADDRESDS	 ((EEPROM_USER_ATTEN_VALUE_ADDRESDS + (sizeof(BLUESTATUS_st))) & 0xFFFF) //96byte
+#define EEPROM_WINDOW_STATUS_ADDRESDS	 ((EEPROM_USER_ATTEN_VALUE_ADDRESDS + (sizeof(BLUESTATUS_st))) & 0xFFFF) //128byte
 
 #else
 #define EEPROM_WINDOW_STATUS_ADDRESDS	 ((EEPROM_ATT_BASE + (sizeof(BLUESTATUS_st))) & 0xFFFF) //96byte

Bluecell_Src/eeprom.c

@@ -241,10 +241,30 @@ void EEPROM_M24C08_Init(void){
     bluecell_Currdatastatus.DLI_FRBT_Atten3_L = 0;    
     bluecell_Currdatastatus.DLI_FRBT_Atten4_L = 0;
     bluecell_Currdatastatus.DLI_FRBT_D_Day = 0;
-    bluecell_Currdatastatus.Selftest1 = false;
-    bluecell_Currdatastatus.Selftest2 = false;
-    bluecell_Currdatastatus.Selftest3 = false;
-    bluecell_Currdatastatus.Selftest4 = false;    
+    if(bluecell_Currdatastatus.SelfTest == true){
+        bluecell_Currdatastatus.ATT_DL1_H = bluecell_Currdatastatus.SelfTest_ATT_DL1_H ;
+        bluecell_Currdatastatus.ATT_DL2_H = bluecell_Currdatastatus.SelfTest_ATT_DL2_H ;
+        bluecell_Currdatastatus.ATT_DL3_H = bluecell_Currdatastatus.SelfTest_ATT_DL3_H ;
+        bluecell_Currdatastatus.ATT_DL4_H = bluecell_Currdatastatus.SelfTest_ATT_DL4_H ;
+        
+        bluecell_Currdatastatus.ATT_DL1_L = bluecell_Currdatastatus.SelfTest_ATT_DL1_L ;
+        bluecell_Currdatastatus.ATT_DL2_L = bluecell_Currdatastatus.SelfTest_ATT_DL2_L ;
+        bluecell_Currdatastatus.ATT_DL3_L = bluecell_Currdatastatus.SelfTest_ATT_DL3_L ;
+        bluecell_Currdatastatus.ATT_DL4_L = bluecell_Currdatastatus.SelfTest_ATT_DL4_L ;                    
+        
+        bluecell_Currdatastatus.ATT_UL1_H = bluecell_Currdatastatus.SelfTest_ATT_UL1_H ;
+        bluecell_Currdatastatus.ATT_UL2_H = bluecell_Currdatastatus.SelfTest_ATT_UL2_H ;
+        bluecell_Currdatastatus.ATT_UL3_H = bluecell_Currdatastatus.SelfTest_ATT_UL3_H ;
+        bluecell_Currdatastatus.ATT_UL4_H = bluecell_Currdatastatus.SelfTest_ATT_UL4_H ;
+        
+        bluecell_Currdatastatus.ATT_UL1_L = bluecell_Currdatastatus.SelfTest_ATT_UL1_L ;
+        bluecell_Currdatastatus.ATT_UL2_L = bluecell_Currdatastatus.SelfTest_ATT_UL2_L ;
+        bluecell_Currdatastatus.ATT_UL3_L = bluecell_Currdatastatus.SelfTest_ATT_UL3_L ;
+        bluecell_Currdatastatus.ATT_UL4_L = bluecell_Currdatastatus.SelfTest_ATT_UL4_L ;                    
+    }
+    bluecell_Currdatastatus.SelfTest = false;
+printf("bluecell_Currdatastatus.DLI_Level_High_Threshold_H : %x \r\n",bluecell_Currdatastatus.DLI_Level_High_Threshold_H);
+printf("bluecell_Currdatastatus.DLI_Level_High_Threshold_L : %x \r\n",bluecell_Currdatastatus.DLI_Level_High_Threshold_L);
 //    bluecell_Currdatastatus.DLI_FRBT_Status = 7;
     bluecell_Currdatastatus.ALARM_TESTMODE = 0;
     bluecell_Currdatastatus.Type = 0;

Src/main.c

@@ -124,7 +124,7 @@ volatile uint32_t Alarm_DL_Level_TimerOnCnt = 0;
 volatile uint32_t Alarm_UL_Level_TimerOffCnt = 0;
 volatile uint32_t Alarm_UL_Level_TimerOnCnt = 0;
 
-volatile uint32_t SelfTestLifeCnt[4] = {0,};
+volatile uint32_t SelfTestLifeCnt = 0;
 
 volatile uint32_t ADC_100ms_Cnt = 0;
 
@@ -942,11 +942,12 @@ void UL_Shutdown_Timer(uint8_t Table_num){
           }
   }
 }
-void UL_SelfTestTimer(uint8_t Table_Num,uint8_t* selftest_status){
+void UL_SelfTestTimer(uint8_t* selftest_status){
     if((*selftest_status) == true){
-        SelfTestLifeCnt[Table_Num]++;
+        SelfTestLifeCnt++;
+//        printf("selftest_status : %d SelfTestLifeCnt , :%d\r\n",(*selftest_status),SelfTestLifeCnt);
     }else{
-        SelfTestLifeCnt[Table_Num] = 0;
+        SelfTestLifeCnt = 0;
     }
 
 }
@@ -997,10 +998,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
     DL_Shutdown_Timer(DET_Alarm_DL4_Shutdown_Index);
 
 
-    UL_SelfTestTimer(0,&bluecell_Currdatastatus.Selftest1);
-    UL_SelfTestTimer(1,&bluecell_Currdatastatus.Selftest2);
-    UL_SelfTestTimer(2,&bluecell_Currdatastatus.Selftest3);
-    UL_SelfTestTimer(3,&bluecell_Currdatastatus.Selftest4);    
+    UL_SelfTestTimer(&bluecell_Currdatastatus.SelfTest);
         
     
       /*ALC Alarm timer start*/