Changeset 29 for trunk/firmware_v2/SES/src/mode_secondaryprotection_plus.c

Timestamp:

Nov 1, 2025, 5:04:26 PM (30 hours ago)

Author:

f.jahn

Message:

• Auto Restart mode implementiert
• IWDG implementiert
• 24V Kompiler Version implementiert

File:

• trunk/firmware_v2/SES/src/mode_secondaryprotection_plus.c (modified) (13 diffs)

trunk/firmware_v2/SES/src/mode_secondaryprotection_plus.c

@@ -35 +35 @@
 } SECONDARYPROTECTION_state_t;
 
+typedef enum SECONDARYPROTECTION_ErrorState_enum 
+{
+  ERROR_NONE,
+  ERROR_EXTERNAL_FAULT, //z.B Kurzschluss
+  ERROR_TEMPERATURE,
+  ERROR_VOLTAGE_DROP,
+  ERROR_LVP_AND_OVP,      //z.B. kritische Überspannung, tiefeEntladung
+} SECONDARYPROTECTION_ErrorState_t;
+
 
 static SECONDARYPROTECTION_state_t smState;
-
+static SECONDARYPROTECTION_ErrorState_t smError = ERROR_NONE;
+static int autoRetryMode;
 
 static void SECONDARYPROTECTION_SM_Off(void)
@@ -73 +83 @@
       printf("NEW_STATE: SECONDARYPROTECTION_ON\n");
       smState = SECONDARYPROTECTION_ON;
+          smError = ERROR_NONE;
 
     }
@@ -83 +94 @@
           LEDS_RT_BlinkCode_Start(BLINK_CODE_ERROR_FAULT_INPUT, LED_RT_ON_TIME_WARN_FAULT_INPUT, LED_RT_OFF_TIME, LED_RT_OFF_TIME *5); //Fehler Anzeigen
       printf("NEW_STATE: SECONDARYPROTECTION_ERROR\n");
-      smState =SECONDARYPROTECTION_ERROR;
+      smState = SECONDARYPROTECTION_ERROR;
+          smError = ERROR_EXTERNAL_FAULT;
+        
     }
   }
@@ -121 +134 @@
   }
   
+
+  if (faultInput == 1)
+  {
+    RELAIS_ResetPuls();
+    BUZZER_Beep(BUZZER_ON_TIME_REJECT); //Warnung
+    LEDS_GN_Off();
+    LEDS_RT_BlinkCode_Start(BLINK_CODE_ERROR_FAULT_INPUT, LED_RT_ON_TIME_WARN_FAULT_INPUT, LED_RT_OFF_TIME, LED_RT_OFF_TIME *5); //Fehler Anzeigen
+    BUTTON_SetModeOff(); //Damit nicht von alleine wieder eingeschaltet wird
+    printf("FAULT INPUT EVENT DETECTED!\n");
+    printf("NEW_STATE: SECONDARYPROTECTION_ERROR\n");
+    smState = SECONDARYPROTECTION_ERROR;
+        smError = ERROR_EXTERNAL_FAULT;
+        return;
+  }
+
+
+
   if ((HAL_GPIO_ReadPin(GPIO_INPUT_LVP_GPIO_Port, GPIO_INPUT_LVP_Pin) == GPIO_PIN_SET) &&  (HAL_GPIO_ReadPin(GPIO_INPUT_OVP_GPIO_Port, GPIO_INPUT_OVP_Pin) == GPIO_PIN_SET))
   {
@@ -152 +182 @@
     printf("NEW_STATE: SECONDARYPROTECTION_OFF\n");
     smState = SECONDARYPROTECTION_OFF;
+        smError = ERROR_NONE;
   }
 
@@ -165 +196 @@
           printf("NEW_STATE: SECONDARYPROTECTION_ERROR\n");
           smState = SECONDARYPROTECTION_ERROR;  
+          smError = ERROR_VOLTAGE_DROP;
           VOLTAGE_MEAS_ResetCounter(); // Damit Fehlerzähler bei Neustart auf 0
   }
 
 
-  if (faultInput == 1)
-  {
-    RELAIS_ResetPuls();
-    BUZZER_Beep(BUZZER_ON_TIME_REJECT); //Warnung
-    LEDS_GN_Off();
-    LEDS_RT_BlinkCode_Start(BLINK_CODE_ERROR_FAULT_INPUT, LED_RT_ON_TIME_WARN_FAULT_INPUT, LED_RT_OFF_TIME, LED_RT_OFF_TIME *5); //Fehler Anzeigen
-    BUTTON_SetModeOff(); //Damit nicht von alleine wieder eingeschaltet wird
-    printf("FAULT INPUT EVENT DETECTED!\n");
-    printf("NEW_STATE: SECONDARYPROTECTION_ERROR\n");
-    smState = SECONDARYPROTECTION_ERROR;
-  }
 
   if (lvpAndOvpInput == 1)
@@ -191 +212 @@
     printf("NEW_STATE: SECONDARYPROTECTION_ERROR\n");
     smState = SECONDARYPROTECTION_ERROR;
+        smError = ERROR_LVP_AND_OVP;
   }
 
@@ -202 +224 @@
         printf("NEW_STATE: MAINSWITCH_ERROR, Temp too high\n");
         smState = SECONDARYPROTECTION_ERROR;          
+        smError = ERROR_TEMPERATURE;
   }
 
@@ -228 +251 @@
   int faultInput;
   int lvpAndOvpInput;
+  static uint32_t retry_counter = 0;
+  static uint32_t oldTimeMSTick;
 
   if (HAL_GPIO_ReadPin(GPIO_INPUT_FAULT_GPIO_Port, GPIO_INPUT_FAULT_Pin) == GPIO_PIN_RESET)       
@@ -241 +266 @@
 
   //Prüfe auf Wechsel des Modus AUTO / SM ON
-  if (BUTTON_GetMode() == BUTTON_AUTO)
+  if (BUTTON_GetMode() == BUTTON_AUTO) 
   {
     if (faultInput == 0) 
     {
+          retry_counter = 0;
       RELAIS_SetPuls();
       BUZZER_Beep(BUZZER_ON_TIME_CONFIRM);
@@ -251 +277 @@
       printf("NEW_STATE: SECONDARYPROTECTION_ON\n");
       smState = SECONDARYPROTECTION_ON;
+          smError = ERROR_NONE;
     }
     else
@@ -260 +287 @@
   }
 
+  if (autoRetryMode == 1) {
+
+    if (oldTimeMSTick != HAL_GetTick())
+    {
+        oldTimeMSTick = HAL_GetTick();
+        retry_counter++;
+    }
+
+    if  (retry_counter > 3600000)  // jede stunde
+    {
+        BUTTON_SetModeAuto();
+        retry_counter = 0;
+    }
+  }
   //Prüfe auf Wechsel in MANUAL ON Mode
   //Keine Fehlerüberprüfungen. In diesem Modus werdem alle Alarme ignoriert.
@@ -280 +321 @@
 
 
-void MODE_SECONDARYPROTECTION_PLUS_Exec(void)
-{
-
-  
+void MODE_SECONDARYPROTECTION_PLUS_Exec(int am)
+{
+
+        autoRetryMode = am;
 
   switch (smState)