Ref table Index Number 추가

 Det Temp 자료형 부호 있는 자료형으로 변경 /
 Shutdown Alarm 보통 Timer 추가 /
 Temp Timer 추가

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="564629063996780829" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="800489075853895203" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="564629063996780829" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="800489075853895203" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Bluecell_Inc/Bluecell_operate.h

@@ -128,6 +128,20 @@ typedef enum{
     ALC_Alarm_UL4_Index,            
     ALC_Alarm_UL_Index_MAX,            
 };
+typedef enum{
+    AGC_Table_DL1_Ref_Index = 0,
+    AGC_Table_DL2_Ref_Index,        
+    AGC_Table_DL3_Ref_Index,        
+    AGC_Table_DL4_Ref_Index,            
+    AGC_Table_DL_Ref_Index_MAX,      
+};
+typedef enum{
+    ALC_Table_UL1_Ref_Index = 0,
+    ALC_Table_UL2_Ref_Index,        
+    ALC_Table_UL3_Ref_Index,        
+    ALC_Table_UL4_Ref_Index,            
+    ALC_Table_UL_Ref_Index_MAX,      
+};
 
 typedef enum{
 	Alarm_Bit_List = 0x00,
@@ -258,7 +272,17 @@ typedef enum{
     MBIC_PROT_INDEX_MAX,
 
 };
-    
+typedef enum{
+    MBIC_Table_DL1_INDEX = 0,
+    MBIC_Table_DL2_INDEX ,
+    MBIC_Table_DL3_INDEX , 
+    MBIC_Table_DL4_INDEX ,    
+    MBIC_Table_UL1_INDEX ,
+    MBIC_Table_UL2_INDEX ,
+    MBIC_Table_UL3_INDEX , 
+    MBIC_Table_UL4_INDEX ,    
+    MBIC_Table_INDEX ,        
+}MBIC_ALC_TableIndex;
 
 //5~ - 25 
 typedef struct{
@@ -721,7 +745,7 @@ typedef struct{
     uint8_t DLI_P3_Level3_L;
     uint8_t DLI_P4_Level4_H;
     uint8_t DLI_P4_Level4_L;    
-    uint8_t DET_TEMP;
+    int8_t DET_TEMP;
     uint8_t DLI_AGC_ON_OFF;
     uint8_t ULO_ALC_ON_OFF;
     uint8_t ULO_Level1_H;

Inc/main.h

@@ -183,8 +183,9 @@ extern I2C_HandleTypeDef hi2c2;
 #define ATT_EN_DL1_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 #define MBIC_ON_MAINTAIN_SEC 3000
-#define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000
-#define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 35000
+#define MBIC_ON_SHUTDOWN_MAINTAIN_SEC 5000//5
+#define MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC 30000//30
+#define MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC 60000 * 5 //5min
 
 
 #define MBIC_OFF_MAINTAIN_SEC 10000

Src/main.c

@@ -93,6 +93,9 @@ volatile uint32_t DET_DL_High_On_AlarmTimerCnt[DET_Alarm_DL_Index_MAX] = {0,};
 volatile uint32_t DET_DL_Low_Off_AlarmTimerCnt[DET_Alarm_DL_Index_MAX] = {0,};
 volatile uint32_t DET_DL_High_Off_AlarmTimerCnt[DET_Alarm_DL_Index_MAX] = {0,};
 
+volatile uint32_t DET_DL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL_Index_MAX] = {0,};
+volatile uint32_t DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL_Index_MAX] = {0,};
+
 
 volatile uint32_t DET_UL_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL_Index_MAX] = {0,};
 volatile uint32_t DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL_Index_MAX] = {0,};
@@ -105,8 +108,26 @@ volatile uint32_t AlarmTimerOffCnt = 0;
 volatile uint32_t AlarmTimerOnCnt = 0;
 
 
+volatile uint32_t Alarm_Temp_TimerOffCnt = 0;
+volatile uint32_t Alarm_Temp_TimerOnCnt = 0;
+
+volatile uint32_t Alarm_DL_Level_TimerOffCnt = 0;
+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 bool     AlarmTimerOnSet = 0;
 volatile bool     AlarmTimerOffSet = 0;
+
+
 //extern bool AGC_AlarmTimerSet[AGC_Alarm_DL_Index_MAX];
 extern bool ADC_Alarm_DL_High_Set[DET_Alarm_DL_Index_MAX];
 extern bool ADC_Alarm_DL_Low_Set[DET_Alarm_DL_Index_MAX];
@@ -116,6 +137,13 @@ extern uint8_t ALC_AlarmSet[ALC_Alarm_UL_Index_MAX];
 extern bool AGC_AlarmSet[AGC_Alarm_DL_Index_MAX];
 extern bool ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL_Shutdown_Index_MAX];
 extern bool ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL_Shutdown_Index_MAX];
+extern bool ADC_Alarm_DL_Normal_Shutdown_Set[DET_Alarm_DL_Shutdown_Index_MAX];
+extern bool ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL_Shutdown_Index_MAX];
+uint8_t* MBIC_UL_ShutdownCount;
+uint8_t* MBIC_DL_ShutdownCount;
+uint8_t* PrevMBIC_UL_ShutdownCount;
+uint8_t* PrevMBIC_DL_ShutdownCount;
+
 
 /* USER CODE END PV */
 
@@ -921,22 +949,52 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       ALCTimerCnt++;
       AGCTimerCnt++;
 
-
-      if(ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index] == true){
-              DET_UL_Shutdown_Off_AlarmTimerCnt[ALC_Alarm_UL1_Index] = 0;
-              DET_UL_Shutdown_On_AlarmTimerCnt[ALC_Alarm_UL1_Index]++;
-              if(DET_UL_Shutdown_On_AlarmTimerCnt[ALC_Alarm_UL1_Index] == 0xFFFFFFFF){
-                DET_UL_Shutdown_On_AlarmTimerCnt[ALC_Alarm_UL1_Index] = MBIC_ON_MAINTAIN_SEC;
-              }
-          }else{
-              DET_UL_Shutdown_On_AlarmTimerCnt[ALC_Alarm_UL1_Index] = 0;
-              DET_UL_Shutdown_Off_AlarmTimerCnt[ALC_Alarm_UL1_Index]++;
-              if(DET_UL_Shutdown_Off_AlarmTimerCnt[ALC_Alarm_UL1_Index] == 0xFFFFFFFF){
-                DET_UL_Shutdown_Off_AlarmTimerCnt[ALC_Alarm_UL1_Index] = MBIC_OFF_MAINTAIN_SEC;
-              }
-
-
-      }
+    for(int i = 0; i < DET_Alarm_UL_Shutdown_Index_MAX; i++){
+        if(ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] == true){
+            DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] = 0; // OFF CNT = 0;
+            DET_UL_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i]++;
+            if(DET_UL_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] == 0xFFFFFFFF){
+                DET_UL_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] = MBIC_ON_MAINTAIN_SEC;
+            }
+        }else{
+            DET_UL_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] = 0;
+            DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i]++;
+            if(DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] == 0xFFFFFFFF){
+                DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] = MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC;
+            }
+        }
+        if(ADC_Alarm_UL_Normal_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + i] == true){
+            DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i]++;
+            if(DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] == 0xFFFFFFFF){
+                DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] = MBIC_OFF_MAINTAIN_SEC;
+            }                
+        }else{
+            DET_UL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + i] = 0;
+        }
+    }
+    for(int i = 0; i < DET_Alarm_DL_Shutdown_Index_MAX; i++){
+        if(ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] == true){
+            DET_DL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] = 0; // OFF CNT = 0;
+            DET_DL_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i]++;
+            if(DET_DL_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] == 0xFFFFFFFF){
+                DET_DL_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] = MBIC_ON_MAINTAIN_SEC;
+            }
+        }else{
+            DET_DL_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] = 0;
+            DET_DL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i]++;
+            if(DET_DL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] == 0xFFFFFFFF){
+                DET_DL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] = MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC;
+            }
+        }
+        if(ADC_Alarm_DL_Normal_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] == true){
+            DET_DL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i]++;
+            if(DET_DL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] == 0xFFFFFFFF){
+                DET_DL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] = MBIC_OFF_MAINTAIN_SEC;
+            }                
+        }else{
+            DET_DL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] = 0;
+        }
+    }    
       /*ALC Alarm timer start*/
       if(ALC_AlarmSet[ALC_Alarm_UL1_Index] == true){
           ALC_Off_AlarmTimerCnt[ALC_Alarm_UL1_Index] = 0;
@@ -1286,7 +1344,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 #endif // PYJ.2020.06.19_END -- 
 
 
-    /*3 Sec Time Cnt */
+        /*3 Sec Time Cnt */
     
       if(AlarmTimerOnSet == true){
         if(AlarmTimerOnCnt == 0xFFFFFFFF)
@@ -1311,6 +1369,99 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       else{
         AlarmTimerOffCnt = 0;
       }
+
+
+      if(AlarmTimerOnSet == true){
+        if(AlarmTimerOnCnt == 0xFFFFFFFF)
+            AlarmTimerOnCnt = MBIC_ON_MAINTAIN_SEC;
+        else{
+            AlarmTimerOnCnt++;
+        }
+      }
+      else{
+        AlarmTimerOnCnt = 0;
+      }
+
+        
+      /*10 Sec Time Cnt*/
+      if(bluecell_Currdatastatus.Temp_High_Alarm == false){
+        if(Alarm_Temp_TimerOffCnt >= 0xFFFFFFFF){
+            Alarm_Temp_TimerOffCnt = MBIC_OFF_MAINTAIN_SEC;
+        }
+        else{
+            Alarm_Temp_TimerOffCnt++;
+        }
+      }
+      else{
+        Alarm_Temp_TimerOffCnt = 0;
+      }
+
+
+      if(bluecell_Currdatastatus.Temp_High_Alarm == true){
+        if(Alarm_Temp_TimerOnCnt >= 0xFFFFFFFF){
+            Alarm_Temp_TimerOnCnt = MBIC_ON_MAINTAIN_SEC;
+        }
+        else{
+            Alarm_Temp_TimerOnCnt++;
+        }
+      }
+      else{
+        Alarm_Temp_TimerOnCnt = 0;
+      }
+
+
+
+
+
+
+
+      /*10 Sec Time Cnt*/
+      if(Alarm_DL_Level_TimerOffCnt == true){
+        if(Alarm_DL_Level_TimerOffCnt == 0xFFFFFFFF)
+            Alarm_DL_Level_TimerOffCnt = MBIC_OFF_MAINTAIN_SEC;
+        else{
+            Alarm_DL_Level_TimerOffCnt++;
+        }
+      }
+      else{
+        Alarm_DL_Level_TimerOffCnt = 0;
+      }
+
+
+      if(Alarm_DL_Level_TimerOnCnt == true){
+        if(Alarm_DL_Level_TimerOnCnt == 0xFFFFFFFF)
+            Alarm_DL_Level_TimerOnCnt = MBIC_ON_MAINTAIN_SEC;
+        else{
+            Alarm_DL_Level_TimerOnCnt++;
+        }
+      }
+      else{
+        Alarm_DL_Level_TimerOnCnt = 0;
+      }        
+      
+     /*10 Sec Time Cnt*/
+      if(Alarm_UL_Level_TimerOffCnt == true){
+        if(Alarm_UL_Level_TimerOffCnt == 0xFFFFFFFF)
+            Alarm_UL_Level_TimerOffCnt = MBIC_OFF_MAINTAIN_SEC;
+        else{
+            Alarm_UL_Level_TimerOffCnt++;
+        }
+      }
+      else{
+        Alarm_UL_Level_TimerOffCnt = 0;
+      }
+
+
+      if(Alarm_DL_Level_TimerOnCnt == true){
+        if(Alarm_UL_Level_TimerOnCnt == 0xFFFFFFFF)
+            Alarm_UL_Level_TimerOnCnt = MBIC_ON_MAINTAIN_SEC;
+        else{
+            Alarm_UL_Level_TimerOnCnt++;
+        }
+      }
+      else{
+        Alarm_UL_Level_TimerOnCnt = 0;
+      }  
   }
   /* USER CODE END Callback 1 */
 }