Add fire alarm handling for DC30 CCS main controller.

Latch fire alarm until reboot, block recovery commands, and send periodic Everest ESTOP while active.

Co-authored-by: Cursor <cursoragent@cursor.com>

CCSModuleSW30Web.ioc

@@ -54,10 +54,50 @@ Dma.ADC1.0.MemInc=DMA_MINC_ENABLE
 Dma.ADC1.0.Mode=DMA_CIRCULAR
 Dma.ADC1.0.PeriphDataAlignment=DMA_PDATAALIGN_HALFWORD
 Dma.ADC1.0.PeriphInc=DMA_PINC_DISABLE
-Dma.ADC1.0.Priority=DMA_PRIORITY_HIGH
+Dma.ADC1.0.Priority=DMA_PRIORITY_MEDIUM
 Dma.ADC1.0.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 Dma.Request0=ADC1
-Dma.RequestsNb=1
+Dma.Request1=USART2_RX
+Dma.Request2=USART2_TX
+Dma.Request3=USART3_RX
+Dma.Request4=USART3_TX
+Dma.RequestsNb=5
+Dma.USART2_RX.1.Direction=DMA_PERIPH_TO_MEMORY
+Dma.USART2_RX.1.Instance=DMA1_Channel6
+Dma.USART2_RX.1.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART2_RX.1.MemInc=DMA_MINC_ENABLE
+Dma.USART2_RX.1.Mode=DMA_NORMAL
+Dma.USART2_RX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART2_RX.1.PeriphInc=DMA_PINC_DISABLE
+Dma.USART2_RX.1.Priority=DMA_PRIORITY_VERY_HIGH
+Dma.USART2_RX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART2_TX.2.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART2_TX.2.Instance=DMA1_Channel7
+Dma.USART2_TX.2.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART2_TX.2.MemInc=DMA_MINC_ENABLE
+Dma.USART2_TX.2.Mode=DMA_NORMAL
+Dma.USART2_TX.2.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART2_TX.2.PeriphInc=DMA_PINC_DISABLE
+Dma.USART2_TX.2.Priority=DMA_PRIORITY_HIGH
+Dma.USART2_TX.2.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART3_RX.3.Direction=DMA_PERIPH_TO_MEMORY
+Dma.USART3_RX.3.Instance=DMA1_Channel3
+Dma.USART3_RX.3.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART3_RX.3.MemInc=DMA_MINC_ENABLE
+Dma.USART3_RX.3.Mode=DMA_NORMAL
+Dma.USART3_RX.3.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART3_RX.3.PeriphInc=DMA_PINC_DISABLE
+Dma.USART3_RX.3.Priority=DMA_PRIORITY_VERY_HIGH
+Dma.USART3_RX.3.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
+Dma.USART3_TX.4.Direction=DMA_MEMORY_TO_PERIPH
+Dma.USART3_TX.4.Instance=DMA1_Channel2
+Dma.USART3_TX.4.MemDataAlignment=DMA_MDATAALIGN_BYTE
+Dma.USART3_TX.4.MemInc=DMA_MINC_ENABLE
+Dma.USART3_TX.4.Mode=DMA_NORMAL
+Dma.USART3_TX.4.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
+Dma.USART3_TX.4.PeriphInc=DMA_PINC_DISABLE
+Dma.USART3_TX.4.Priority=DMA_PRIORITY_HIGH
+Dma.USART3_TX.4.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority
 File.Version=6
 GPIO.groupedBy=Group By Peripherals
 KeepUserPlacement=false
@@ -148,12 +188,16 @@ Mcu.UserConstants=
 Mcu.UserName=STM32F107VCTx
 MxCube.Version=6.15.0
 MxDb.Version=DB.6.0.150
-NVIC.ADC1_2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.ADC1_2_IRQn=true\:7\:0\:true\:false\:true\:true\:true\:true
 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
-NVIC.CAN1_RX0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.CAN1_RX0_IRQn=true\:3\:0\:true\:false\:true\:true\:true\:true
-NVIC.CAN2_RX1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.CAN2_RX1_IRQn=true\:3\:0\:true\:false\:true\:true\:true\:true
 NVIC.CAN2_TX_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
-NVIC.DMA1_Channel1_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true
+NVIC.DMA1_Channel1_IRQn=true\:1\:0\:true\:false\:true\:false\:true\:true
+NVIC.DMA1_Channel2_IRQn=true\:4\:0\:true\:false\:true\:false\:true\:true
+NVIC.DMA1_Channel3_IRQn=true\:1\:0\:true\:false\:true\:false\:true\:true
+NVIC.DMA1_Channel6_IRQn=true\:1\:0\:true\:false\:true\:false\:true\:true
+NVIC.DMA1_Channel7_IRQn=true\:4\:0\:true\:false\:true\:false\:true\:true
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.ForceEnableDMAVector=true
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
@@ -163,11 +207,11 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
-NVIC.TIM3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.TIM3_IRQn=true\:6\:0\:true\:false\:true\:true\:true\:true
-NVIC.UART5_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.UART5_IRQn=true\:5\:0\:true\:false\:true\:true\:true\:true
-NVIC.USART1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.USART1_IRQn=true\:5\:0\:true\:false\:true\:true\:true\:true
-NVIC.USART2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.USART2_IRQn=true\:2\:0\:true\:false\:true\:true\:true\:true
-NVIC.USART3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
+NVIC.USART3_IRQn=true\:2\:0\:true\:false\:true\:true\:true\:true
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
 OSC_IN.Mode=HSE-External-Oscillator
 OSC_IN.Signal=RCC_OSC_IN

Core/Inc/board.h

@@ -55,7 +55,8 @@ typedef struct __attribute__((packed)) {
 	uint8_t stationType;        // Байт 4: тип станции
 	uint8_t boardVersion;       // Байт 5: версия платы
 	uint8_t addrEdcan;          // Байт 6: адрес EDCAN
-	uint8_t reserved[57];       // Байты 7-63: зарезервированы
+	uint8_t maxPower;           // Байт 7: максимальная мощность станции (5кВт/bit)
+	uint8_t reserved[56];       // Байты 8-63: зарезервированы
 } InfoBlock_t;
 
 extern InfoBlock_t *InfoBlock;

Core/Inc/charger_control.h

@@ -55,6 +55,7 @@ typedef enum __attribute__((packed)){
 	CONN_ERR_HOTPLUG = 8, // Коннектор неожиданно отключился
 	CONN_ERR_EV_COMM = 9, // Ошибка протокола связи с электромобилем
 	CONN_ERR_PSU_FAULT = 10, // Ошибка PSU
+	CONN_ERR_FIRE_ALARM = 11, // Пожарная тревога (до перезагрузки)
 
 }CONN_Error_t;
 

Core/Inc/cp.h

@@ -16,11 +16,15 @@ typedef enum {
     EV_STATE_ACQUIRING = 6,
 } CP_State_t;
 
+extern CP_State_t cp_state_buffer;
+
 void CP_Init(void);
 void CP_SetDuty(uint8_t percentage);
 uint8_t CP_GetDuty(void);
 int32_t CP_GetVoltage(void);
 CP_State_t CP_GetState(void);
+CP_State_t CP_GetFilteredState(void);
+void CP_FilterState(void);
 void CP_Loop(void);
 
 #endif

Core/Inc/fire_alarm.h

@@ -0,0 +1,11 @@
+#ifndef INC_FIRE_ALARM_H_
+#define INC_FIRE_ALARM_H_
+
+#include <stdint.h>
+
+uint8_t FireAlarm_IsLatched(void);
+uint8_t FireAlarm_IsBlockingCommand(uint8_t command_code);
+void FireAlarm_Activate(void);
+void FireAlarm_Maintain(void);
+
+#endif /* INC_FIRE_ALARM_H_ */

Core/Inc/main.h

@@ -43,7 +43,7 @@ extern "C" {
 /* USER CODE BEGIN EC */
 #define FW_VERSION_MAJOR 1
 #define FW_VERSION_MINOR 0
-#define FW_VERSION_PATCH 15
+#define FW_VERSION_PATCH 18
 /* USER CODE END EC */
 
 /* Exported macro ------------------------------------------------------------*/

Core/Inc/psu_control.h

@@ -88,6 +88,7 @@ typedef struct {
 	// Дополнительные параметры для одного модуля DC30
 	uint32_t power_limit;    // лимит мощности [кВт]
 	uint8_t  hv_mode;        // HV-режим (ограничение напряжения)
+	uint32_t hv_tick;        // таймер для задержки входа в HV-режим
 
 	uint32_t tempAmbient;    // температура окружающего воздуха (из PSU_04)
 	union { uint8_t raw; PSU_Status0_t bits; } status0;  // modularForm0

Core/Inc/serial.h

@@ -11,14 +11,16 @@ void CCS_Init(void);
 void CCS_SendEmergencyStop(void);
 void CCS_SendStart(void);
 void CCS_RxEventCallback(UART_HandleTypeDef *huart, uint16_t size);
+void CCS_TxCpltCallback(UART_HandleTypeDef *huart);
 void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart);
 
 typedef enum {
-    CCS_DISABLED = 0,
+    CCS_UNKNOWN = 0,
-    CCS_UNPLUGGED = 1,
+    CCS_DISABLED = 1,
-    CCS_AUTH_REQUIRED = 2,
+    CCS_UNPLUGGED = 2,
-    CCS_CONNECTED = 3,
+    CCS_AUTH_REQUIRED = 3,
-    CCS_REPLUGGING = 4,
+    CCS_CONNECTED = 4,
+    CCS_REPLUGGING = 5,
 } CCS_ConnectorState_t;
 
 typedef enum {

Core/Inc/serial_control.h

@@ -28,6 +28,8 @@
 
 // Перезагрузка для входа в бутлоадер
 #define CMD_DEVICE_RESET		0xB5
+// Пожарная тревога (внешний триггер)
+#define CMD_FIRE_ALARM			0xB7
 
 // Коды ответов
 #define RESP_SUCCESS    		0x12
@@ -170,6 +172,7 @@ struct SerialControl_t {
 void SC_Init();
 void SC_Task();
 ISR_FAST void SC_SendPacket(const uint8_t* payload, uint16_t payload_len, uint8_t response_code);
+void SC_RecoverUartDma(UART_HandleTypeDef *huart);
 
 // Внешняя функция обработки команд (определена в serial_handler.c)
 extern void SC_CommandHandler(ReceivedCommand_t* cmd);

Core/Inc/stm32f1xx_it.h

@@ -56,6 +56,10 @@ void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
 void DMA1_Channel1_IRQHandler(void);
+void DMA1_Channel2_IRQHandler(void);
+void DMA1_Channel3_IRQHandler(void);
+void DMA1_Channel6_IRQHandler(void);
+void DMA1_Channel7_IRQHandler(void);
 void ADC1_2_IRQHandler(void);
 void CAN1_RX0_IRQHandler(void);
 void TIM3_IRQHandler(void);

Core/Src/adc.c

@@ -180,7 +180,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
     hdma_adc1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD;
     hdma_adc1.Init.MemDataAlignment = DMA_MDATAALIGN_HALFWORD;
     hdma_adc1.Init.Mode = DMA_CIRCULAR;
-    hdma_adc1.Init.Priority = DMA_PRIORITY_HIGH;
+    hdma_adc1.Init.Priority = DMA_PRIORITY_MEDIUM;
     if (HAL_DMA_Init(&hdma_adc1) != HAL_OK)
     {
       Error_Handler();
@@ -189,7 +189,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
     __HAL_LINKDMA(adcHandle,DMA_Handle,hdma_adc1);
 
     /* ADC1 interrupt Init */
-    HAL_NVIC_SetPriority(ADC1_2_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(ADC1_2_IRQn, 7, 0);
     HAL_NVIC_EnableIRQ(ADC1_2_IRQn);
   /* USER CODE BEGIN ADC1_MspInit 1 */
 

Core/Src/board.c

@@ -95,8 +95,8 @@ void Init_Peripheral(){
     RELAY_Write(RELAY3, 0);
     RELAY_Write(RELAY_DC, 0);
     RELAY_Write(RELAY_AC, 0);
-    RELAY_Write(RELAY_CP, 1);
+    RELAY_Write(RELAY_CP, 0);
-    RELAY_Write(RELAY_CC, 1);
+    RELAY_Write(RELAY_CC, 0);
     RELAY_Write(RELAY_DC1, 0);
 
     SMAFilter_Init(&conn_temp_adc_filter[0]);

Core/Src/can.c

@@ -127,7 +127,7 @@ void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle)
     __HAL_AFIO_REMAP_CAN1_3();
 
     /* CAN1 interrupt Init */
-    HAL_NVIC_SetPriority(CAN1_RX0_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(CAN1_RX0_IRQn, 3, 0);
     HAL_NVIC_EnableIRQ(CAN1_RX0_IRQn);
   /* USER CODE BEGIN CAN1_MspInit 1 */
 
@@ -165,7 +165,7 @@ void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle)
     /* CAN2 interrupt Init */
     HAL_NVIC_SetPriority(CAN2_TX_IRQn, 0, 0);
     HAL_NVIC_EnableIRQ(CAN2_TX_IRQn);
-    HAL_NVIC_SetPriority(CAN2_RX1_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(CAN2_RX1_IRQn, 3, 0);
     HAL_NVIC_EnableIRQ(CAN2_RX1_IRQn);
   /* USER CODE BEGIN CAN2_MspInit 1 */
 

Core/Src/charger_control.c

@@ -4,6 +4,7 @@
 #include "psu_control.h"
 #include "connector.h"
 #include "debug.h"
+#include "fire_alarm.h"
 
 ChargingConnector_t CONN;
 CONN_State_t connectorState;
@@ -19,6 +20,13 @@ void CONN_Init(){
 
 void CONN_Loop(){
     static CONN_State_t last_connState = Unknown;
+
+    if (FireAlarm_IsLatched()) {
+        CONN.chargingError = CONN_ERR_FIRE_ALARM;
+        CONN.EnableOutput = 0;
+        return;
+    }
+
 	if(last_connState != CONN.connState){
 		last_connState = CONN.connState;
 		CONN.connControl = CMD_NONE;
@@ -43,18 +51,9 @@ void CONN_Task(){
     /* CCS state machine is handled in serial.c.
      * Keep this task lightweight for scheduler compatibility.
      */
-    if (CONN.chargingError != CONN_NO_ERROR) {
-        CONN_SetState(Disabled);
     return;
 }
 
-    if (connectorState == Unknown && config_initialized) {
-        CONN_SetState(Unplugged);
-    } else if (connectorState == Disabled && CONN.chargingError == CONN_NO_ERROR) {
-        CONN_SetState(Unplugged);
-    }
-}
-
 void CONN_SetState(CONN_State_t state){
     if (connectorState == state) {
         CONN.connState = state;

Core/Src/cp.c

@@ -1,15 +1,18 @@
 #include "cp.h"
 #include "adc.h"
 #include "board.h"
+#include "debug.h"
 #include "tim.h"
 #include <stdint.h>
 #include <stdlib.h>
 
 #define MAX_DUTY 450
+#define FILTER_ORDER 100
 
 static int32_t cp_voltage_mv = 0;
 static uint8_t cp_duty = 0;
 CP_State_t fake_cp_state = EV_STATE_ACQUIRING;
+CP_State_t cp_state_buffer = EV_STATE_ACQUIRING;
 
 #define VREFINT_CAL_ADDR ((uint16_t*)0x1FFFF7BA) // для STM32F1!
 
@@ -93,7 +96,66 @@ CP_State_t CP_GetState(void) {
     }
 }
 
-void CP_Loop(void) {
+CP_State_t CP_GetFilteredState(void) {
-    (void)CP_GetState();
+    return cp_state_buffer;
+}
+
+void CP_FilterState(void) {
+
+    static CP_State_t pending_state = EV_STATE_ACQUIRING;
+    static uint8_t stable_count = 0u;
+    CP_State_t current_state = CP_GetState();
+
+    /* Keep last accepted state while CP is still acquiring. */
+    if (current_state == EV_STATE_ACQUIRING) {
+        pending_state = EV_STATE_ACQUIRING;
+        stable_count = 0u;
+        return;
+    }
+
+    if (current_state != pending_state) {
+        pending_state = current_state;
+        stable_count = 1u;
+        return;
+    }
+
+    if (stable_count < FILTER_ORDER) {
+        stable_count++;
+    }
+
+    if (stable_count >= FILTER_ORDER) {
+        cp_state_buffer = pending_state;
+    }
+}
+
+void CP_Loop(void) {
+    static uint32_t tick;
+    if ((int32_t)(HAL_GetTick() - tick) < 1) return;
+    tick = HAL_GetTick();
+    static uint8_t initialized = 0;
+    static CP_State_t prev_state = EV_STATE_ACQUIRING;
+    static uint8_t prev_duty = 0;
+
+    CP_FilterState();
+
+    CP_State_t current_state = CP_GetFilteredState();
+    uint8_t current_duty = cp_duty;
+
+    if (!initialized) {
+        prev_state = current_state;
+        prev_duty = current_duty;
+        initialized = 1;
+        return;
+    }
+
+    if (current_state != prev_state) {
+        log_printf(LOG_INFO, "CP state changed: %d -> %d\n", prev_state, current_state);
+        prev_state = current_state;
+    }
+
+    if (current_duty != prev_duty) {
+        log_printf(LOG_INFO, "CP duty changed: %u -> %u\n", prev_duty, current_duty);
+        prev_duty = current_duty;
+    }
 }
 

Core/Src/debug.c

@@ -148,220 +148,3 @@ int log_printf(LogLevel_t level, const char *format, ...)
 	return result;
 }
 
-#ifndef USE_WEB_INTERFACE
-
-#include "isr_opt.h"
-
-extern UART_HandleTypeDef huart2;
-
-
-uint8_t  debug_rx_buffer[256];
-uint8_t debug_cmd_received;
-uint8_t debug_rx_buffer_size = 0;
-
-
-ISR_FAST void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size){
-
-//	if(huart->Instance == USART1){
-//		mm_rx_interrupt(huart, Size);
-//	}
-	if(huart->Instance == USART2){
-		debug_rx_interrupt(huart, Size);
-	}
-}
-
-ISR_FAST void debug_rx_interrupt(UART_HandleTypeDef *huart, uint16_t Size){
-	debug_rx_buffer[Size] = '\0';
-	debug_rx_buffer_size = Size;
-	debug_cmd_received = 1;
-}
-
-void debug_init(){
-	HAL_UARTEx_ReceiveToIdle_IT(&huart2,debug_rx_buffer,255);
-}
-
-void parse_command(uint8_t* buffer, size_t length) {
-	// ignore \r \n symbols
-    size_t i = 0;
-    for (i = 0; i < length; i++) {
-        if (buffer[i] == '\r' || buffer[i] == '\n') {
-            buffer[i] = '\0';
-            length = i;
-            break;
-        }
-    }
-    if (buffer[0] == 0) return;
-    if (strncmp((const char*)buffer, "reset", length) == 0) {
-        log_printf(LOG_INFO, "Resetting...\n");
-        NVIC_SystemReset();
-
-    } else if (strncmp((const char*)buffer, "relayaux", length) == 0) {
-        log_printf(LOG_INFO, "Relaying...\n");
-        RELAY_Write(RELAY_AUX, 1);
-        HAL_Delay(2000);
-        RELAY_Write(RELAY_AUX, 0);
-    } else if (strncmp((const char*)buffer, "relaycc", length) == 0) {
-        log_printf(LOG_INFO, "Relaying...\n");
-        RELAY_Write(RELAY_CC, 1);
-        HAL_Delay(200);
-        RELAY_Write(RELAY_CC, 0);
-    } else if (strncmp((const char*)buffer, "relaydc", length) == 0) {
-        log_printf(LOG_INFO, "Relaying...\n");
-        RELAY_Write(RELAY_DC, 1);
-        HAL_Delay(200);
-        RELAY_Write(RELAY_DC, 0);
-    } else if (strncmp((const char*)buffer, "relayac", length) == 0) {
-        log_printf(LOG_INFO, "Relaying...\n");
-        RELAY_Write(RELAY_AC, 1);
-        HAL_Delay(200);
-        RELAY_Write(RELAY_AC, 0);
-
-    } else if (strncmp((const char*)buffer, "adc", length) == 0) {
-        log_printf(LOG_INFO, "CC1=%.2f\n", CONN_CC_GetAdc());
-
-    } else if (strncmp((const char*)buffer, "lock_state", length) == 0) {
-        log_printf(LOG_INFO, "Lock state=%d\n", GBT_LockGetState());
-
-    } else if (strncmp((const char*)buffer, "lock_lock", length) == 0) {
-        log_printf(LOG_INFO, "Locked\n");
-        GBT_Lock(1);
-
-    } else if (strncmp((const char*)buffer, "lock_unlock", length) == 0) {
-        log_printf(LOG_INFO, "Unlocked\n");
-        GBT_Lock(0);
-
-    } else if (strncmp((const char*)buffer, "complete", length) == 0) {
-    	CONN_SetState(Finished);
-
-    } else if (strncmp((const char*)buffer, "start", length) == 0) {
-        log_printf(LOG_INFO, "Started\n");
-        GBT_Start();
-
-    } else if (strncmp((const char*)buffer, "stop", length) == 0) {
-        log_printf(LOG_INFO, "Stopped\n");
-        GBT_StopEVSE(GBT_CST_SUSPENDS_ARTIFICIALLY);
-
-    } else if (strncmp((const char*)buffer, "stop1", length) == 0) {
-        log_printf(LOG_INFO, "Stopped\n");
-        GBT_ForceStop();
-
-//    } else if (strncmp((const char*)buffer, "force", length) == 0) {
-//        log_printf(LOG_INFO, "Stopped\n");
-//		GBT_Lock(1);
-//		GBT_SwitchState(GBT_S2_LOCKED);
-//		GBT_Delay(500);
-
-    } else if (strncmp((const char*)buffer, "cc_state", length) == 0) {
-    	switch(CONN_CC_GetState()){
-    	case GBT_CC_UNKNOWN:
-    		log_printf(LOG_INFO, "GBT_CC_UNKNOWN\n");
-    		break;
-    	case GBT_CC_12V:
-    		log_printf(LOG_INFO, "GBT_CC_12V\n");
-    		break;
-    	case GBT_CC_6V:
-    		log_printf(LOG_INFO, "GBT_CC_6V\n");
-    		break;
-    	case GBT_CC_4V:
-    		log_printf(LOG_INFO, "GBT_CC_4V\n");
-    		break;
-    	case GBT_CC_2V:
-    		log_printf(LOG_INFO, "GBT_CC_2V\n");
-    		break;
-
-    	}
-    } else if (strncmp((const char*)buffer, "temp", length) == 0) {
-    	log_printf(LOG_INFO, "temp1 %d\n",GBT_ReadTemp(0));
-    	log_printf(LOG_INFO, "temp2 %d\n",GBT_ReadTemp(1));
-    } else if (strncmp((const char*)buffer, "info1", length) == 0) {
-        log_printf(LOG_INFO, "Battery info:\n");
-        log_printf(LOG_INFO, "maxCV %dV\n",GBT_BATStat.maxCellVoltage/100); 		// 0.01v/bit
-        log_printf(LOG_INFO, "maxCC %dA\n",GBT_BATStat.maxChargingCurrent/10); 	// 0.1A/bit
-        log_printf(LOG_INFO, "totE %dkWh\n",GBT_BATStat.totalEnergy/10); 			// 0.1kWh
-        log_printf(LOG_INFO, "maxCV %dV\n",GBT_BATStat.maxChargingVoltage/10); 	// 0.1V/ bit
-        log_printf(LOG_INFO, "maxT %dC\n",(int16_t)GBT_BATStat.maxTemp-50); 		// 1C/bit, -50C offset
-        log_printf(LOG_INFO, "SOC %dp\n",GBT_BATStat.SOC/10); 					// 0.1%/bit , 0..100%
-        log_printf(LOG_INFO, "Volt. %dV\n",GBT_BATStat.measVoltage/10); 			// 0.1V/bit
-
-    } else if (strncmp((const char*)buffer, "info2", length) == 0) {
-        log_printf(LOG_INFO, "EV info:\n");
-        log_printf(LOG_INFO, "GBT_ver V%d.%d%d\n",GBT_EVInfo.version[0],GBT_EVInfo.version[1],GBT_EVInfo.version[2]);
-        log_printf(LOG_INFO, "Battery type: %d\n",GBT_EVInfo.batteryType);
-        log_printf(LOG_INFO, "Battery capacity: %d\n", GBT_EVInfo.batteryCapacity);	// 0.1Ah/bit
-    	log_printf(LOG_INFO, "Battery voltage: %d\n", GBT_EVInfo.batteryVoltage);  	// 0.1V/bit
-    	log_printf(LOG_INFO, "Battery vendor: %.4s\n", GBT_EVInfo.batteryVendor); 	// Battery vendor (ASCII string)
-    	log_printf(LOG_INFO, "Battery SN: %lu\n", GBT_EVInfo.batterySN);			// int
-    	log_printf(LOG_INFO, "Battery manufacture date: %02d.%02d.%04d\n", GBT_EVInfo.batteryManuD, GBT_EVInfo.batteryManuM ,GBT_EVInfo.batteryManuY+1985);		// year (offset 1985)
-    	log_printf(LOG_INFO, "Battery cycles: %d\n", GBT_EVInfo.batteryCycleCount); //uint24_t
-    	log_printf(LOG_INFO, "Own auto: %d\n", GBT_EVInfo.ownAuto);			// 0 = lizing, 1 = own auto
-    	log_printf(LOG_INFO, "EVIN: %.17s\n", GBT_EVInfo.EVIN);			//EVIN
-    	log_printf(LOG_INFO, "EV_SW_VER: %.8s\n", GBT_EVInfo.EV_SW_VER);
-
-    } else if (strncmp((const char*)buffer, "info3", length) == 0) {
-        log_printf(LOG_INFO, "GBT_MaxLoad info:\n");
-        log_printf(LOG_INFO, "Output max current: %d\n",GBT_MaxLoad.maxOutputCurrent);
-        log_printf(LOG_INFO, "Output min current: %d\n",GBT_MaxLoad.minOutputCurrent);
-        log_printf(LOG_INFO, "Output max voltage: %d\n",GBT_MaxLoad.maxOutputVoltage);
-        log_printf(LOG_INFO, "Output min voltage: %d\n",GBT_MaxLoad.minOutputVoltage);
-        log_printf(LOG_INFO, "\nGBT_ChargerInfo info:\n");
-        log_printf(LOG_INFO, "BMS Recognized: %d\n",GBT_ChargerInfo.bmsIdentified);
-        log_printf(LOG_INFO, "Charger location: %.3s\n",GBT_ChargerInfo.chargerLocation);
-        log_printf(LOG_INFO, "Charger number: %lu\n",GBT_ChargerInfo.chargerNumber);
-
-
-    } else if (strncmp((const char*)buffer, "help", length) == 0) {
-        log_printf(LOG_INFO, "Command list:\n");
-        log_printf(LOG_INFO, "reset\n");
-        log_printf(LOG_INFO, "help\n");
-        log_printf(LOG_INFO, "cc_state\n");
-        log_printf(LOG_INFO, "lock_lock\n");
-        log_printf(LOG_INFO, "lock_unlock\n");
-        log_printf(LOG_INFO, "lock_state\n");
-        log_printf(LOG_INFO, "adc\n");
-        log_printf(LOG_INFO, "relay(cc,aux,ac,dc)\n");
-        log_printf(LOG_INFO, "start\n");
-        log_printf(LOG_INFO, "stop\n");
-        log_printf(LOG_INFO, "stop1\n");
-//        log_printf(LOG_INFO, "force\n");
-        log_printf(LOG_INFO, "temp\n");
-        log_printf(LOG_INFO, "info1\n");
-        log_printf(LOG_INFO, "info2\n");
-        log_printf(LOG_INFO, "info3\n");
-        log_printf(LOG_INFO, "time\n");
-        log_printf(LOG_INFO, "cantest\n");
-
-        //TODO: info commands
-
-    } else if (strncmp((const char*)buffer, "time", length) == 0) {
-
-		time_t unix_time = (time_t)get_Current_Time();
-		struct tm *parts = localtime(&unix_time);
-
-		log_printf(LOG_INFO, "Year: %d\n", parts->tm_year + 1900);
-		log_printf(LOG_INFO, "Month: %d\n", parts->tm_mon + 1);
-		log_printf(LOG_INFO, "Day: %d\n", parts->tm_mday);
-		log_printf(LOG_INFO, "Hour: %d\n", parts->tm_hour);
-		log_printf(LOG_INFO, "Minute: %d\n", parts->tm_min);
-		log_printf(LOG_INFO, "Second: %d\n", parts->tm_sec);
-
-    } else if (strncmp((const char*)buffer, "cantest", length) == 0) {
-    	//GBT_SendCHM();
-    	GBT_Error(0xFDF0C0FC); //BRM Timeout
-        log_printf(LOG_INFO, "can test\n");
-
-    } else {
-        log_printf(LOG_INFO, "Unknown command\n");
-    }
-}
-
-void debug_task(){
-	if(debug_cmd_received){
-		parse_command(debug_rx_buffer, debug_rx_buffer_size);
-		HAL_UARTEx_ReceiveToIdle_IT(&huart2,debug_rx_buffer,255);
-		debug_cmd_received = 0;
-	}
-}
-
-#else
-
-#endif // USE_WEB_INTERFACE

Core/Src/dma.c

@@ -44,8 +44,20 @@ void MX_DMA_Init(void)
 
   /* DMA interrupt init */
   /* DMA1_Channel1_IRQn interrupt configuration */
-  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0);
+  HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 1, 0);
   HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn);
+  /* DMA1_Channel2_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel2_IRQn, 4, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel2_IRQn);
+  /* DMA1_Channel3_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel3_IRQn, 1, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel3_IRQn);
+  /* DMA1_Channel6_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel6_IRQn, 1, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel6_IRQn);
+  /* DMA1_Channel7_IRQn interrupt configuration */
+  HAL_NVIC_SetPriority(DMA1_Channel7_IRQn, 4, 0);
+  HAL_NVIC_EnableIRQ(DMA1_Channel7_IRQn);
 
 }
 

Core/Src/fire_alarm.c

@@ -0,0 +1,74 @@
+#include "fire_alarm.h"
+#include "serial_control.h"
+#include "charger_control.h"
+#include "connector.h"
+#include "serial.h"
+#include "cp.h"
+#include "debug.h"
+
+static uint8_t fire_alarm_latched = 0;
+static uint32_t fire_alarm_last_estop_tick = 0;
+
+extern CCS_ConnectorState_t CCS_ConnectorState;
+
+uint8_t FireAlarm_IsLatched(void) {
+    return fire_alarm_latched;
+}
+
+uint8_t FireAlarm_IsBlockingCommand(uint8_t command_code) {
+    if (!fire_alarm_latched) {
+        return 0;
+    }
+
+    switch (command_code) {
+        case CMD_GET_STATUS:
+        case CMD_GET_INFO:
+        case CMD_GET_LOG:
+        case CMD_DEVICE_RESET:
+            return 0;
+        default:
+            return 1;
+    }
+}
+
+void FireAlarm_Activate(void) {
+    if (fire_alarm_latched) {
+        return;
+    }
+
+    fire_alarm_latched = 1;
+    CONN.chargingError = CONN_ERR_FIRE_ALARM;
+    CONN.connControl = CMD_STOP;
+    CONN.EnableOutput = 0;
+
+    log_printf(LOG_ERR, "FIRE ALARM activated\n");
+
+    CCS_SendEmergencyStop();
+    fire_alarm_last_estop_tick = HAL_GetTick();
+    CP_SetDuty(100);
+    CCS_ConnectorState = CCS_DISABLED;
+    CONN_SetState(Disabled);
+}
+
+void FireAlarm_Maintain(void) {
+    if (!fire_alarm_latched) {
+        return;
+    }
+
+    CONN.chargingError = CONN_ERR_FIRE_ALARM;
+    CONN.EnableOutput = 0;
+    CP_SetDuty(100);
+
+    if ((int32_t)(HAL_GetTick() - fire_alarm_last_estop_tick) >= 1000) {
+        CCS_SendEmergencyStop();
+        fire_alarm_last_estop_tick = HAL_GetTick();
+    }
+
+    if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) {
+        CCS_ConnectorState = CCS_DISABLED;
+    }
+
+    if (CONN.connState != Disabled) {
+        CONN_SetState(Disabled);
+    }
+}

Core/Src/main.c

@@ -97,7 +97,8 @@ void ED_Delay(uint32_t Delay)
 
   while ((HAL_GetTick() - tickstart) < wait){
     CCS_SerialLoop();
-//    CP_Loop();
+    StopButtonControl();
+    CP_Loop();
     CONN_Task();
     LED_Task();
     SC_Task();
@@ -105,12 +106,44 @@ void ED_Delay(uint32_t Delay)
 }
 
 void StopButtonControl(){
+	static uint32_t tick;
+	static uint32_t hold_time;
+	static uint8_t stop_btn_fault = 1;
+	uint32_t now = HAL_GetTick();
 
-	//Charging do nothing
+	/* Run no faster than once per 10 ms. */
-	if(!IN_ReadInput(IN_ESTOP)){
+	if((now - tick) < 10){
-		CONN.connControl = CMD_STOP;
+		return;
+	}
+	tick = now;
+
+	uint8_t pressed = !IN_ReadInput(IN_ESTOP);
+	if(!pressed){
+		stop_btn_fault = 0;
 	}
 
+	if(stop_btn_fault){
+		return;
+	}
+
+	if(pressed){
+		if(hold_time == 0){
+			CONN.connControl = CMD_STOP;
+		}
+		hold_time += 10;
+		if(hold_time == 5000){
+			CONN.connControl = CMD_FORCE_UNLOCK;
+		}
+		if(hold_time > 40000){
+			SC_SendPacket(NULL, 0, RESP_SUCCESS);
+			while(huart2.gState == HAL_UART_STATE_BUSY_TX);
+			HAL_Delay(10);
+			NVIC_SystemReset();
+		}
+	}
+	else{
+		hold_time = 0;
+	}
 }
 
 uint8_t temp0, temp1;
@@ -205,8 +238,6 @@ int main(void)
     CONN_Loop();
     LED_Write();
     ED_Delay(10);
-    StopButtonControl();
-    ED_Delay(50);
 
   }
   /* USER CODE END 3 */

Core/Src/psu_control.c

@@ -150,6 +150,7 @@ void PSU_Init(){
 
 	PSU0.power_limit = PSU_MAX_POWER; // kW
 	PSU0.hv_mode     = 0;
+	PSU0.hv_tick     = 0;
 
 	PSU_Enable(0, 0);
 }
@@ -269,7 +270,15 @@ void PSU_ReadWrite(){
 			PSU_SetVoltageCurrent(0, CONN.RequestedVoltage, CONN.RequestedCurrent); // Normal mode
 		}
 		ED_Delay(CAN_DELAY);
-		if(CONN.MeasuredVoltage>490) PSU0.hv_mode = 1;
+		if(CONN.MeasuredVoltage > 490){
+			if(PSU0.hv_tick == 0){
+				PSU0.hv_tick = HAL_GetTick();
+			}else if((HAL_GetTick() - PSU0.hv_tick) >= 10000){
+				PSU0.hv_mode = 1;
+			}
+		}else{
+			PSU0.hv_tick = 0;
+		}
 	}
 
 	// PSU_SetHVMode(0, PSU0.hv_mode); // auto set, no need
@@ -343,6 +352,7 @@ void PSU_Task(void){
 	case PSU_READY:
 		// модуль готов, но выключен
 		PSU0.hv_mode = 0;
+		PSU0.hv_tick = 0;
 
 		RELAY_Write(RELAY_DC, 0);
 		if(!PSU0.ready){

Core/Src/rgb_controller.c

@@ -1,7 +1,9 @@
 #include "rgb_controller.h"
+#include "fire_alarm.h"
 #include "main.h"
 #include "string.h"
 #include "charger_control.h"
+#include "board.h"
 
 #include "tim.h"
 
@@ -10,11 +12,20 @@ RGB_Cycle_t LED_Cycle;
 
 RGB_Cycle_t color_estop = {
 	.Color1 = { .R = 250, .G = 0, .B = 0 },
-	.Color2 = { .R = 250, .G = 0, .B = 0 },
+	.Color2 = { .R = 0, .G = 0, .B = 0 },
-	.Tr = 50,
+	.Tr = 10,
-	.Th = 50,
+	.Th = 5,
-	.Tf = 50,
+	.Tf = 10,
-	.Tl = 50,
+	.Tl = 5,
+ };
+
+RGB_Cycle_t color_unlock = {
+	.Color1 = { .R = 255, .G = 0, .B = 0 },
+	.Color2 = { .R = 0, .G = 0, .B = 0 },
+	.Tr = 10,
+	.Th = 10,
+	.Tf = 10,
+	.Tl = 10,
  };
 
 RGB_Cycle_t color_unknown = {
@@ -54,12 +65,12 @@ RGB_Cycle_t color_unplugged = {
 };
 
 RGB_Cycle_t color_preparing = {
-	.Color1 = { .R = 0, .G = 0, .B = 250 },
+	.Color1 = { .R = 0, .G = 0, .B = 255 },
-	.Color2 = { .R = 0, .G = 0, .B = 250 },
+	.Color2 = { .R = 0, .G = 0, .B = 0 },
-	.Tr = 50,
+	.Tr = 10,
 	.Th = 10,
-	.Tf = 50,
+	.Tf = 10,
-	.Tl = 0,
+	.Tl = 10,
 };
 
 RGB_Cycle_t color_charging = {
@@ -90,10 +101,22 @@ RGB_Cycle_t color_error = {
 };
 
 void LED_Write(){
+    if(FireAlarm_IsLatched() || CONN.chargingError == CONN_ERR_FIRE_ALARM){
+      LED_SetColor(&color_error);
+      return;
+    }
     if(CONN.chargingError != CONN_NO_ERROR){
       LED_SetColor(&color_error);
       return;
     }
+    if(CONN.connControl == CMD_FORCE_UNLOCK){
+      LED_SetColor(&color_unlock);
+      return;
+    }
+    if(CONN.connControl == CMD_STOP){
+      LED_SetColor(&color_estop);
+      return;
+    }
     switch(CONN.connState){
     case Unknown:
       LED_SetColor(&color_unknown);

Core/Src/serial.c

@@ -8,6 +8,8 @@
 #include <string.h>
 #include "charger_config.h"
 #include "psu_control.h"
+#include "serial_control.h"
+#include "fire_alarm.h"
 
 extern UART_HandleTypeDef huart3;
 extern uint8_t config_initialized;
@@ -29,11 +31,19 @@ uint8_t ev_enable_output = 0;
 #define CMD_INTERVAL 10
 #define MAX_TX_BUFFER_SIZE 256
 #define MAX_RX_BUFFER_SIZE 256
-#define EVEREST_TIMEOUT_MS 5000u
+#define EVEREST_TIMEOUT_WARN_MS 5000u
+#define EVEREST_TIMEOUT_STOP_MS 10000u
 #define UART3_REINIT_TIMEOUT_MS 1500u
+/* Everest requests 500 V -> PSU really gets 300 V / 1 A, state still reports 500 V. */
+#define FAKE_EVREQ_VOLTAGE_V   500u
+#define FAKE_PSU_VOLTAGE_V     300u
+#define FAKE_PSU_CURRENT_0P1A   10u
 
 static uint8_t rx_buffer[MAX_RX_BUFFER_SIZE];
 static uint8_t tx_buffer[MAX_TX_BUFFER_SIZE];
+static uint8_t tx_pending_buffer[MAX_TX_BUFFER_SIZE];
+static uint16_t tx_pending_len = 0;
+static uint8_t uart3_tx_busy = 0;
 
 uint8_t ESTOP = 0;
 uint8_t REPLUG = 0;
@@ -42,19 +52,21 @@ static uint8_t enabled = 0;
 static uint8_t pwm_duty_percent = 100;
 uint8_t isolation_enable = 0;
 static uint32_t last_host_seen = 0;
+static uint8_t fake_500_voltage_mode = 0;
 static uint8_t everest_timed_out = 0;
-static uint32_t last_everest_timeout_log_tick = 0;
+static uint8_t everest_timeout_warn_latched = 0;
+static uint8_t everest_timeout_stop_latched = 0;
 static uint32_t uart3_last_packet_tick = 0;
 static uint32_t uart3_last_reinit_tick = 0;
-static CP_State_t cp_state_buffer = EV_STATE_ACQUIRING;
 
 CCS_State_t CCS_State;
 CCS_EvInfo_t CCS_EvInfo;
 CONN_State_t CCS_EvseState;
-CCS_ConnectorState_t CCS_ConnectorState = CCS_UNPLUGGED;
+CCS_ConnectorState_t CCS_ConnectorState = CCS_UNKNOWN;
 
 ISR_FAST static uint8_t process_received_packet(const uint8_t* packet, uint16_t packet_len);
 static void CCS_UART3_Watchdog(void);
+static void CCS_LogUart3Error(const char *tag);
 
 ISR_FAST static void uart3_log_hal_error(uint8_t uart_num, uint32_t err) {
     if (err == HAL_UART_ERROR_NONE) {
@@ -77,7 +89,7 @@ ISR_FAST static void uart3_log_hal_error(uint8_t uart_num, uint32_t err) {
 }
 
 ISR_FAST static void uart3_arm_rx_or_log(const char *where) {
-    HAL_StatusTypeDef st = HAL_UARTEx_ReceiveToIdle_IT(&huart3, rx_buffer, sizeof(rx_buffer));
+    HAL_StatusTypeDef st = HAL_UARTEx_ReceiveToIdle_DMA(&huart3, rx_buffer, sizeof(rx_buffer));
     if (st == HAL_OK) {
         return;
     }
@@ -86,8 +98,9 @@ ISR_FAST static void uart3_arm_rx_or_log(const char *where) {
                "UART3 RX arm failed (%s): HAL_Status=%d err_after=0x%08lx\n",
                where, (int)st, (unsigned long)err_after);
     uart3_log_hal_error(3u, err_after);
+    CCS_LogUart3Error("UART3 RX arm failed details");
     if (err_after != HAL_UART_ERROR_NONE) {
-        (void)HAL_UART_Abort_IT(&huart3);
+        (void)HAL_UART_AbortReceive(&huart3);
     }
 }
 
@@ -124,35 +137,75 @@ ISR_FAST void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart) {
                "UART%u HAL error (ISR): raw=0x%08lx — RX may be corrupted until re-arm\n",
                uart_num, (unsigned long)error);
     uart3_log_hal_error(uart_num, error);
-    (void)HAL_UART_Abort_IT(huart);
+    (void)HAL_UART_AbortReceive(huart);
+    (void)HAL_UART_AbortTransmit(huart);
     if (huart == &huart3) {
+        uart3_tx_busy = 0;
         uart3_arm_rx_or_log("ErrorCallback");
+    } else {
+        SC_RecoverUartDma(huart);
     }
 }
 
-
+void CCS_TxCpltCallback(UART_HandleTypeDef *huart) {
+    if (huart != &huart3) {
+        return;
+    }
+    uart3_tx_busy = 0;
+    if (tx_pending_len > 0) {
+        memcpy(tx_buffer, tx_pending_buffer, tx_pending_len);
+        uart3_tx_busy = 1;
+        if (HAL_UART_Transmit_DMA(&huart3, tx_buffer, tx_pending_len) != HAL_OK) {
+            uart3_tx_busy = 0;
+            CCS_LogUart3Error("UART3 TX DMA resend failed");
+        }
+        tx_pending_len = 0;
+    }
+}
 
 void CCS_SerialLoop(void) {
+    static uint32_t tick;
+    if ((int32_t)(HAL_GetTick() - tick) < 1) return;
+    tick = HAL_GetTick();
+    
     static uint32_t replug_tick = 0;
     static uint32_t replug_watchdog_tick = 0;
     static uint32_t replug_watchdog1_tick = 0;
     static uint32_t last_state_sent = 0;
-
+    static uint32_t force_unlock_tick = 0;
-    if ((&huart3)->RxState == HAL_UART_STATE_READY) {
+    static uint32_t stop_tick = 0;
-        uart3_arm_rx_or_log("SerialLoop");
-    }
 
     CCS_UART3_Watchdog();
-
+    FireAlarm_Maintain();
-    /* Read CP once per loop and use buffered value below. */
-    cp_state_buffer = CP_GetState();
 
     if (CONN.connControl != CMD_NONE) {
         last_cmd = CONN.connControl;
     }
 
-    if((HAL_GetTick() - last_cmd_sent) > CMD_INTERVAL){
+    if (CONN.connControl == CMD_FORCE_UNLOCK) {
-        if ((HAL_GetTick() - last_state_sent) >= 200) {
+        if (force_unlock_tick == 0) {
+            force_unlock_tick = HAL_GetTick();
+        } else if ((int32_t)(HAL_GetTick() - force_unlock_tick) >= 10000) {
+            CONN.connControl = CMD_NONE;
+            force_unlock_tick = 0;
+        }
+    } else {
+        force_unlock_tick = 0;
+    }
+
+    if (CONN.connControl == CMD_STOP) {
+        if (stop_tick == 0) {
+            stop_tick = HAL_GetTick();
+        } else if ((int32_t)(HAL_GetTick() - stop_tick) >= 1000) {
+            CONN.connControl = CMD_NONE;
+            stop_tick = 0;
+        }
+    } else {
+        stop_tick = 0;
+    }
+
+    if((int32_t)(HAL_GetTick() - last_cmd_sent) > (int32_t)CMD_INTERVAL){
+        if ((int32_t)(HAL_GetTick() - last_state_sent) >= 200) {
             send_state();
             last_state_sent = HAL_GetTick();
         }
@@ -164,15 +217,20 @@ void CCS_SerialLoop(void) {
         }
 
         if (((CONN.connControl == CMD_STOP) ||
-             (CONN.chargingError != CONN_NO_ERROR)) &&
+             (CONN.connControl == CMD_FORCE_UNLOCK) ||
-            ((HAL_GetTick() - last_stop_sent) > 1000)) {
+             (CONN.chargingError != CONN_NO_ERROR) ||
+             FireAlarm_IsLatched()) &&
+            ((int32_t)(HAL_GetTick() - last_stop_sent) > 1000)) {
             last_stop_sent = HAL_GetTick();
             log_printf(LOG_WARN, "Stopping charging...\n");
+            if (CONN.connControl == CMD_FORCE_UNLOCK) {
+                CP_SetDuty(100);
+            }
             CCS_SendEmergencyStop();
         }
 
         if (((CCS_EvseState == FinishedEV) || (CCS_EvseState == FinishedEVSE)) &&
-            ((HAL_GetTick() - last_stop_sent) > 1000)) {
+            ((int32_t)(HAL_GetTick() - last_stop_sent) > 1000)) {
             last_stop_sent = HAL_GetTick();
             log_printf(LOG_WARN, "FinishedEV, stopping...\n");
             CCS_SendEmergencyStop();
@@ -182,20 +240,50 @@ void CCS_SerialLoop(void) {
     (void)replug_watchdog_tick;
     (void)replug_watchdog1_tick;
 
-    if (!config_initialized) {
+    uint8_t host_timeout_warn = (last_host_seen > 0u) && ((int32_t)(HAL_GetTick() - last_host_seen) > (int32_t)EVEREST_TIMEOUT_WARN_MS);
-        // Keep connector in Unknown until host sends valid SET_CONFIG.
+    uint8_t host_timeout_stop = (last_host_seen > 0u) && ((int32_t)(HAL_GetTick() - last_host_seen) > (int32_t)EVEREST_TIMEOUT_STOP_MS);
-        RELAY_Write(RELAY_CP, 1);
+    uint8_t host_timed_out = host_timeout_stop;
-        CONN_SetState(Unknown);
+
-    } else {
+    if (host_timeout_warn && !everest_timeout_warn_latched) {
+        log_printf(LOG_ERR, "Everest timeout\n");
+        everest_timeout_warn_latched = 1;
+    }
+
+    if (host_timeout_stop && !everest_timeout_stop_latched) {
+        log_printf(LOG_ERR, "Everest timeout, stopping charging...\n");
+        everest_timeout_stop_latched = 1;
+    }
+
+    if (!host_timeout_warn) {
+        everest_timeout_warn_latched = 0;
+        everest_timeout_stop_latched = 0;
+    }
+
+    everest_timed_out = host_timeout_stop;
     switch(CCS_ConnectorState){
+            case CCS_UNKNOWN:
+                if (FireAlarm_IsLatched()) {
+                    CCS_ConnectorState = CCS_DISABLED;
+                    break;
+                }
+                RELAY_Write(RELAY_CP, 0);
+                CONN_SetState(Unknown);
+                if (config_initialized && !host_timed_out) {
+                    CCS_ConnectorState = CCS_UNPLUGGED;
+                }
+                break;
             case CCS_DISABLED:
                 RELAY_Write(RELAY_CP, 0);
                 CONN_SetState(Disabled);
-                if (CONN.chargingError == CONN_NO_ERROR){
+                if (!FireAlarm_IsLatched() && (CONN.chargingError == CONN_NO_ERROR) && !host_timed_out){
                     CCS_ConnectorState = CCS_UNPLUGGED;
                 }
                 break;
             case CCS_UNPLUGGED:
+                if (FireAlarm_IsLatched()) {
+                    CCS_ConnectorState = CCS_DISABLED;
+                    break;
+                }
                 RELAY_Write(RELAY_CP, 1);
                 CONN_SetState(Unplugged);
                 if ((cp_state_buffer == EV_STATE_B_CONN_PREP) || (cp_state_buffer == EV_STATE_C_CONN_ACTIVE)){
@@ -208,6 +296,10 @@ void CCS_SerialLoop(void) {
 
                 break;
             case CCS_AUTH_REQUIRED:
+                if (FireAlarm_IsLatched()) {
+                    CCS_ConnectorState = CCS_DISABLED;
+                    break;
+                }
                 RELAY_Write(RELAY_CP, 1);
                 CONN_SetState(AuthRequired);
                 if(CONN.connControl == CMD_START){
@@ -220,8 +312,12 @@ void CCS_SerialLoop(void) {
                 }
                 break;
             case CCS_CONNECTED:
+                if (FireAlarm_IsLatched()) {
+                    CCS_ConnectorState = CCS_DISABLED;
+                    break;
+                }
                 RELAY_Write(RELAY_CP, 1);
-                if(CCS_EvseState < Preparing) {
+                if((CCS_EvseState < Preparing) || (CCS_EvseState == AuthRequired)) {
                     CONN_SetState(Preparing);
                 } else {
                     CONN_SetState(CCS_EvseState);
@@ -236,9 +332,13 @@ void CCS_SerialLoop(void) {
                 }
                 break;
             case CCS_REPLUGGING:
+                if (FireAlarm_IsLatched()) {
+                    CCS_ConnectorState = CCS_DISABLED;
+                    break;
+                }
                 RELAY_Write(RELAY_CP, 0);
                 CONN_SetState(Replugging);
-                if((HAL_GetTick() - replug_tick) > 1000){
+                if((int32_t)(HAL_GetTick() - replug_tick) > 1000){
                     replug_tick = HAL_GetTick();
                     if(REPLUG > 0){
                         if (REPLUG != 0xFF) REPLUG--;
@@ -256,28 +356,21 @@ void CCS_SerialLoop(void) {
                 }
                 break;
     }
-    }
 
-    // If Everest timeout happened, keep safe-state and limit log frequency.
+    // 10s timeout: enforce safe-state until host communication recovers.
-    // The safe-state must remain until we receive a valid packet from the host.
+    if (FireAlarm_IsLatched()) {
-    if (everest_timed_out) {
+        CONN.EnableOutput = 0;
-        if (last_everest_timeout_log_tick == 0 ||
+        CP_SetDuty(100);
-            (HAL_GetTick() - last_everest_timeout_log_tick) >= EVEREST_TIMEOUT_MS) {
+        if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) {
-            log_printf(LOG_ERR, "Everest timeout\n");
+            CCS_ConnectorState = CCS_DISABLED;
-            last_everest_timeout_log_tick = HAL_GetTick();
         }
+    } else if (host_timeout_stop) {
         CONN.EnableOutput = 0;
         CCS_EvseState = Unknown;
         CP_SetDuty(100);
-    } else if (last_host_seen > 0 && (HAL_GetTick() - last_host_seen) > EVEREST_TIMEOUT_MS) {
+        if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) {
-        log_printf(LOG_ERR, "Everest timeout\n");
+            CCS_ConnectorState = CCS_DISABLED;
-        everest_timed_out = 1;
+        }
-        last_host_seen = HAL_GetTick(); // reset after the first timeout
-        last_everest_timeout_log_tick = HAL_GetTick();
-
-        CONN.EnableOutput = 0;
-        CCS_EvseState = Unknown;
-        CP_SetDuty(100);
     } else {
         if (last_cmd == CMD_STOP) {
             CONN.EnableOutput = 0;
@@ -308,6 +401,7 @@ void CCS_Init(void){
 	CCS_MaxLoad.maxPower = PSU_MAX_POWER; //30000W
     uart3_last_packet_tick = HAL_GetTick();
     uart3_last_reinit_tick = uart3_last_packet_tick;
+    uart3_arm_rx_or_log("Init");
     CCS_SendResetReason();
     log_printf(LOG_INFO, "CCS init\n");
 }
@@ -346,7 +440,16 @@ static uint16_t CCS_BuildPacket(uint8_t cmd, const void* payload, uint16_t paylo
 static void CCS_SendPacket(uint8_t cmd, const void* payload, uint16_t payload_len) {
     uint16_t len = CCS_BuildPacket(cmd, payload, payload_len, tx_buffer, sizeof(tx_buffer));
     if (len > 0) {
-        HAL_UART_Transmit_IT(&huart3, tx_buffer, len);
+        if (uart3_tx_busy) {
+            memcpy(tx_pending_buffer, tx_buffer, len);
+            tx_pending_len = len;
+        } else {
+            uart3_tx_busy = 1;
+            if (HAL_UART_Transmit_DMA(&huart3, tx_buffer, len) != HAL_OK) {
+                uart3_tx_busy = 0;
+                CCS_LogUart3Error("UART3 TX DMA start failed");
+            }
+        }
     }
     last_cmd_sent = HAL_GetTick();
 }
@@ -384,7 +487,9 @@ static void send_state(void) {
     CCS_State.DutyCycle = CP_GetDuty();
     CCS_State.OutputEnabled = PSU0.CONT_enabled;
     CCS_State.MeasuredVoltage = (uint16_t)CONN.MeasuredVoltage;
-    if (CONN.RequestedVoltage == 500) CCS_State.MeasuredVoltage = 500; // fake
+    if (fake_500_voltage_mode) {
+        CCS_State.MeasuredVoltage = FAKE_EVREQ_VOLTAGE_V;
+    }
     CCS_State.MeasuredCurrent = (uint16_t)CONN.MeasuredCurrent;
     CCS_State.Power = CCS_Power;
     CCS_State.Energy = CCS_Energy;
@@ -426,14 +531,17 @@ ISR_FAST static void apply_command(uint8_t cmd, const uint8_t* payload, uint16_t
     (void)payload_len;
     last_host_seen = HAL_GetTick();
     everest_timed_out = 0;
-    last_everest_timeout_log_tick = 0;
+    everest_timeout_warn_latched = 0;
+    everest_timeout_stop_latched = 0;
     switch (cmd) {
         case CMD_E2M_PWM_DUTY: {
             const e2m_pwm_duty_t* p = (const e2m_pwm_duty_t*)payload;
             uint8_t duty = p->pwm_duty_percent;
             if (duty > 100) duty = 100;
             pwm_duty_percent = duty;
+            if (CONN.connControl != CMD_FORCE_UNLOCK) {
                 CP_SetDuty(duty);
+            }
             break;
         }
         case CMD_E2M_ENABLE_OUTPUT: {
@@ -459,8 +567,15 @@ ISR_FAST static void apply_command(uint8_t cmd, const uint8_t* payload, uint16_t
         }
         case CMD_E2M_SET_OUTPUT_VOLTAGE: {
             const e2m_set_output_t* p = (const e2m_set_output_t*)payload;
+            if (p->voltage_V == FAKE_EVREQ_VOLTAGE_V) {
+                fake_500_voltage_mode = 1u;
+                CONN.RequestedVoltage = FAKE_PSU_VOLTAGE_V;
+                CONN.WantedCurrent = FAKE_PSU_CURRENT_0P1A;
+            } else {
+                fake_500_voltage_mode = 0u;
                 CONN.RequestedVoltage = p->voltage_V;
                 CONN.WantedCurrent = p->current_0p1A;
+            }
             break;
         }
         case CMD_E2M_ISOLATION_CONTROL: {
@@ -548,19 +663,24 @@ ISR_FAST static uint8_t process_received_packet(const uint8_t* packet, uint16_t
 }
 
 static void CCS_UART3_Watchdog(void) {
-    const uint32_t now = HAL_GetTick();
+    const int32_t since_last_packet = (int32_t)(HAL_GetTick() - uart3_last_packet_tick);
-    const uint32_t since_last_packet = now - uart3_last_packet_tick;
+    const int32_t since_last_reinit = (int32_t)(HAL_GetTick() - uart3_last_reinit_tick);
 
-    if ((since_last_packet >= UART3_REINIT_TIMEOUT_MS) &&
+    if ((since_last_packet >= (int32_t)UART3_REINIT_TIMEOUT_MS) &&
-        ((now - uart3_last_reinit_tick) >= UART3_REINIT_TIMEOUT_MS)) {
+        (since_last_reinit >= (int32_t)UART3_REINIT_TIMEOUT_MS) &&
-        (void)HAL_UART_Abort_IT(&huart3);
+        (huart3.RxState == HAL_UART_STATE_READY)) {
-        (void)HAL_UART_DeInit(&huart3);
+        uart3_arm_rx_or_log("Watchdog");
-        (void)HAL_UART_Init(&huart3);
+        CCS_LogUart3Error("UART3 watchdog rearm");
-        (void)HAL_UARTEx_ReceiveToIdle_IT(&huart3, rx_buffer, sizeof(rx_buffer));
+        uart3_last_reinit_tick = HAL_GetTick();
-        log_printf(LOG_ERR,
-                   "UART3 RX recover: stalled (no RxEvent data for %ums), hard reinit\n",
-                   (unsigned)UART3_REINIT_TIMEOUT_MS);
-        uart3_last_reinit_tick = now;
     }
 }
 
+static void CCS_LogUart3Error(const char *tag) {
+    log_printf(LOG_ERR, "%s: err=0x%08lx g=%lu rx=%lu tx_busy=%u\n",
+               tag,
+               (unsigned long)HAL_UART_GetError(&huart3),
+               (unsigned long)huart3.gState,
+               (unsigned long)huart3.RxState,
+               (unsigned)uart3_tx_busy);
+}
+

Core/Src/serial_control.c

@@ -11,6 +11,9 @@ ISR_FAST static uint16_t encode_packet(const uint8_t* payload, uint16_t payload_
 ISR_FAST static uint8_t parse_packet(const uint8_t* packet_data, uint16_t packet_len, ReceivedCommand_t* out_cmd);
 ISR_FAST static uint8_t process_received_packet(SerialControl_t *ctx, const uint8_t* packet_data, uint16_t packet_len);
 static void SC_UART2_Watchdog(void);
+static void SC_ArmUart2RxDma(void);
+static void SC_ArmUart5RxDma(void);
+static void SC_LogUartError(const char *tag, UART_HandleTypeDef *huart);
 
 uint8_t test_crc_invalid = 0;
 
@@ -20,11 +23,9 @@ static SerialControl_t serial_iso;
 volatile SC_Source_t g_sc_command_source = SC_SOURCE_UART2;
 static volatile uint8_t sc_uart2_timed_out = 0;
 static uint32_t sc_uart2_last_packet_tick = 0;
-static uint32_t sc_uart2_last_reinit_tick = 0;
+static uint32_t sc_uart2_last_recover_tick = 0;
-/** Событие приёма по UART2 при активной передаче (см. HAL_UARTEx_RxEventCallback / SC_UART2_Watchdog). */
-static volatile uint8_t sc_uart2_rx_during_tx = 0;
 
-#define SC_UART2_REINIT_TIMEOUT_MS      500u
+#define SC_UART2_RECOVER_GUARD_MS       200u
 #define SC_UART2_PACKET_TIMEOUT_MS     5000u
 
 StatusPacket_t statusPacket = {
@@ -85,34 +86,26 @@ void SC_Init() {
     memset(&serial_iso, 0, sizeof(serial_iso));
     sc_uart2_timed_out = 0;
     sc_uart2_last_packet_tick = HAL_GetTick();
-    sc_uart2_last_reinit_tick = sc_uart2_last_packet_tick;
+    sc_uart2_last_recover_tick = sc_uart2_last_packet_tick;
-    sc_uart2_rx_during_tx = 0;
+    SC_ArmUart2RxDma();
+    SC_ArmUart5RxDma();
 }
 
 void SC_Task() {
+    static uint32_t tick;
+    if ((int32_t)(HAL_GetTick() - tick) < 1) return;
+    tick = HAL_GetTick();
     SC_UART2_Watchdog();
 
-	// Запуск приема в режиме прерывания с ожиданием idle
+	// Запуск приема в режиме DMA + idle
-    if ((huart2.RxState == HAL_UART_STATE_READY) && (serial_control.command_ready == 0)) {
+    SC_ArmUart2RxDma();
-        if ((HAL_UARTEx_ReceiveToIdle_IT(&huart2, serial_control.rx_buffer, MAX_RX_BUFFER_SIZE - 1) != HAL_OK) &&
+    SC_ArmUart5RxDma();
-            (HAL_UART_GetError(&huart2) != HAL_UART_ERROR_NONE)) {
-            (void)HAL_UART_Abort_IT(&huart2);
-        }
-    }
-    if (huart5.RxState == HAL_UART_STATE_READY) {
-        if ((HAL_UARTEx_ReceiveToIdle_IT(&huart5, serial_iso.rx_buffer, MAX_RX_BUFFER_SIZE - 1) != HAL_OK) &&
-            (HAL_UART_GetError(&huart5) != HAL_UART_ERROR_NONE)) {
-            (void)HAL_UART_Abort_IT(&huart5);
-        }
-    }
     
     // Проверка таймаута отправки пакета (больше 100 мс)
     if (huart2.gState == HAL_UART_STATE_BUSY_TX && serial_control.tx_tick != 0) {
-        if ((HAL_GetTick() - serial_control.tx_tick) > 100) {
+        if ((int32_t)(HAL_GetTick() - serial_control.tx_tick) > 100) {
             // Таймаут: принудительно сбрасываем передачу
-            HAL_UART_Abort_IT(&huart2);
+            (void)HAL_UART_AbortTransmit(&huart2);
-            // Выключаем DIR при сбросе передачи
-            HAL_GPIO_WritePin(USART2_DIR_GPIO_Port, USART2_DIR_Pin, GPIO_PIN_RESET);
             serial_control.tx_tick = 0; // Сбрасываем tick
         }
     }
@@ -120,34 +113,37 @@ void SC_Task() {
     // Проверка наличия принятой команды для обработки
     if (serial_control.command_ready && (huart2.gState != HAL_UART_STATE_BUSY_TX)) {
 //        HAL_Delay(2);
-        SC_CommandHandler(&serial_control.received_command);
+        SC_CommandHandler((ReceivedCommand_t*)&serial_control.received_command);
-        if ((HAL_UARTEx_ReceiveToIdle_IT(&huart2, serial_control.rx_buffer, MAX_RX_BUFFER_SIZE - 1) != HAL_OK) &&
-            (HAL_UART_GetError(&huart2) != HAL_UART_ERROR_NONE)) {
-            (void)HAL_UART_Abort_IT(&huart2);
-        }
         serial_control.command_ready = 0; // Сбрасываем флаг
+        SC_ArmUart2RxDma();
     }
 }
 
 ISR_FAST void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Size) {
     if (huart->Instance == huart2.Instance) {
-        if (huart2.gState == HAL_UART_STATE_BUSY_TX) {
+        if (Size == 0u) {
-            sc_uart2_rx_during_tx = 1u;
+            log_printf(LOG_WARN, "UART2 RX idle event with zero size\n");
         }
         sc_uart2_last_packet_tick = HAL_GetTick();
-        sc_uart2_last_reinit_tick = sc_uart2_last_packet_tick;
+        sc_uart2_last_recover_tick = sc_uart2_last_packet_tick;
         sc_uart2_timed_out = 0;
         if(!process_received_packet(&serial_control, serial_control.rx_buffer, Size)){
+            log_printf(LOG_WARN, "UART2 RX invalid packet len=%u\n", (unsigned)Size);
             SC_SendPacket(NULL, 0, RESP_INVALID);
         }
         g_sc_command_source = SC_SOURCE_UART2;
-        HAL_UARTEx_ReceiveToIdle_IT(&huart2, serial_control.rx_buffer, MAX_RX_BUFFER_SIZE - 1);
+        SC_ArmUart2RxDma();
     } else if (huart->Instance == huart5.Instance) {
+        if (Size == 0u) {
+            log_printf(LOG_WARN, "UART5 RX idle event with zero size\n");
+        }
         if (process_received_packet(&serial_iso, serial_iso.rx_buffer, Size)) {
             g_sc_command_source = SC_SOURCE_UART5;
             SC_CommandHandler((ReceivedCommand_t*)&serial_iso.received_command);
+        } else {
+            log_printf(LOG_WARN, "UART5 RX invalid packet len=%u\n", (unsigned)Size);
         }
-        HAL_UARTEx_ReceiveToIdle_IT(&huart5, serial_iso.rx_buffer, MAX_RX_BUFFER_SIZE - 1);
+        SC_ArmUart5RxDma();
     } else if (huart->Instance == huart3.Instance) {
         CCS_RxEventCallback(huart, Size);
     }
@@ -155,8 +151,9 @@ ISR_FAST void HAL_UARTEx_RxEventCallback(UART_HandleTypeDef *huart, uint16_t Siz
 
 ISR_FAST void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
     if (huart->Instance == huart2.Instance) {
-        HAL_GPIO_WritePin(USART2_DIR_GPIO_Port, USART2_DIR_Pin, GPIO_PIN_RESET);
         serial_control.tx_tick = 0;
+    } else if (huart->Instance == huart3.Instance) {
+        CCS_TxCpltCallback(huart);
     }
 }
 
@@ -217,16 +214,14 @@ ISR_FAST void SC_SendPacket(const uint8_t* payload, uint16_t payload_len, uint8_
     uint16_t packet_len = encode_packet(payload, payload_len, serial_control.tx_buffer, response_code);
 
     if (packet_len > 0) {
-        if (huart2.gState == HAL_UART_STATE_BUSY_TX) {
+        if (huart2.gState != HAL_UART_STATE_READY) {
-            HAL_UART_Abort_IT(&huart2);
+            (void)HAL_UART_AbortTransmit(&huart2);
-            HAL_GPIO_WritePin(USART2_DIR_GPIO_Port, USART2_DIR_Pin, GPIO_PIN_RESET);
+            log_printf(LOG_WARN, "UART2 TX busy, abort transmit before resend\n");
+        }
+        if (HAL_UART_Transmit_DMA(&huart2, serial_control.tx_buffer, packet_len) != HAL_OK) {
+            SC_LogUartError("UART2 TX DMA start failed", &huart2);
+            return;
         }
-
-        HAL_GPIO_WritePin(USART2_DIR_GPIO_Port, USART2_DIR_Pin, GPIO_PIN_SET);
-
-        sc_uart2_rx_during_tx = 0u;
-
-        HAL_UART_Transmit_IT(&huart2, serial_control.tx_buffer, packet_len);
 
         serial_control.tx_tick = HAL_GetTick();
     }
@@ -276,39 +271,66 @@ ISR_FAST static uint8_t process_received_packet(SerialControl_t *ctx, const uint
 
 static void SC_UART2_Watchdog(void) {
     const uint32_t now = HAL_GetTick();
-    const uint32_t since_last_packet = now - sc_uart2_last_packet_tick;
+    const int32_t since_last_packet = (int32_t)(now - sc_uart2_last_packet_tick);
 
-    if ((huart2.gState == HAL_UART_STATE_BUSY_TX) && (sc_uart2_rx_during_tx != 0u)) {
+    if (since_last_packet >= (int32_t)SC_UART2_PACKET_TIMEOUT_MS) {
-        HAL_GPIO_WritePin(USART2_DIR_GPIO_Port, USART2_DIR_Pin, GPIO_PIN_RESET);
-        (void)HAL_UART_Abort_IT(&huart2);
-        (void)HAL_UART_DeInit(&huart2);
-        (void)HAL_UART_Init(&huart2);
-        (void)HAL_UARTEx_ReceiveToIdle_IT(&huart2, serial_control.rx_buffer, MAX_RX_BUFFER_SIZE - 1);
-        serial_control.tx_tick = 0;
-        sc_uart2_rx_during_tx = 0u;
-        sc_uart2_last_reinit_tick = now;
-        log_printf(LOG_ERR, "USART2 BUSY_TX: hard reinit\n");
-        return;
-    }
-
-    if (since_last_packet >= SC_UART2_PACKET_TIMEOUT_MS) {
         if (sc_uart2_timed_out == 0u) {
             serial_control.command_ready = 0;
+            log_printf(LOG_WARN, "UART2 RX packet timeout (%u ms)\n", (unsigned)SC_UART2_PACKET_TIMEOUT_MS);
         }
         sc_uart2_timed_out = 1;
     } else {
         sc_uart2_timed_out = 0;
     }
 
-    if ((since_last_packet >= SC_UART2_REINIT_TIMEOUT_MS) &&
+    if ((huart2.RxState == HAL_UART_STATE_READY) &&
-        ((now - sc_uart2_last_reinit_tick) >= SC_UART2_REINIT_TIMEOUT_MS)) {
+        ((int32_t)(now - sc_uart2_last_recover_tick) >= (int32_t)SC_UART2_RECOVER_GUARD_MS)) {
-        HAL_GPIO_WritePin(USART2_DIR_GPIO_Port, USART2_DIR_Pin, GPIO_PIN_RESET);
+        SC_ArmUart2RxDma();
-        (void)HAL_UART_Abort_IT(&huart2);
+        sc_uart2_last_recover_tick = now;
-        (void)HAL_UART_DeInit(&huart2);
-        (void)HAL_UART_Init(&huart2);
-        (void)HAL_UARTEx_ReceiveToIdle_IT(&huart2, serial_control.rx_buffer, MAX_RX_BUFFER_SIZE - 1);
-        sc_uart2_last_reinit_tick = now;
-        log_printf(LOG_ERR, "USART2 stalled: hard reinit\n");
     }
 }
 
+static void SC_ArmUart2RxDma(void) {
+    if ((huart2.RxState == HAL_UART_STATE_READY) && (serial_control.command_ready == 0)) {
+        if (HAL_UARTEx_ReceiveToIdle_DMA(&huart2, serial_control.rx_buffer, MAX_RX_BUFFER_SIZE - 1) != HAL_OK) {
+            SC_LogUartError("UART2 RX DMA arm failed", &huart2);
+        }
+    }
+}
+
+static void SC_ArmUart5RxDma(void) {
+    if (huart5.RxState == HAL_UART_STATE_READY) {
+        if (HAL_UARTEx_ReceiveToIdle_IT(&huart5, serial_iso.rx_buffer, MAX_RX_BUFFER_SIZE - 1) == HAL_OK) {
+            return;
+        }
+        SC_LogUartError("UART5 RX IT arm failed", &huart5);
+    }
+}
+
+void SC_RecoverUartDma(UART_HandleTypeDef *huart) {
+    if (huart == &huart2) {
+        SC_LogUartError("UART2 recover start", &huart2);
+        (void)HAL_UART_AbortReceive(&huart2);
+        (void)HAL_UART_AbortTransmit(&huart2);
+        serial_control.tx_tick = 0;
+        SC_ArmUart2RxDma();
+        sc_uart2_last_recover_tick = HAL_GetTick();
+    } else if (huart == &huart5) {
+        SC_LogUartError("UART5 recover start", &huart5);
+        (void)HAL_UART_AbortReceive(&huart5);
+        SC_ArmUart5RxDma();
+    }
+}
+
+static void SC_LogUartError(const char *tag, UART_HandleTypeDef *huart) {
+    if (tag == NULL || huart == NULL) {
+        return;
+    }
+    log_printf(LOG_ERR, "%s: instance=0x%08lx err=0x%08lx g=%lu rx=%lu\n",
+               tag,
+               (unsigned long)huart->Instance,
+               (unsigned long)HAL_UART_GetError(huart),
+               (unsigned long)huart->gState,
+               (unsigned long)huart->RxState);
+}
+

Core/Src/serial_handler.c

@@ -4,6 +4,7 @@
 #include "board.h"
 #include "psu_control.h"
 #include "debug.h"
+#include "fire_alarm.h"
 #include <string.h>
 
 #ifdef USE_WEB_INTERFACE
@@ -27,6 +28,11 @@ void SC_CommandHandler(ReceivedCommand_t* cmd) {
     
     uint8_t response_code = RESP_FAILED;
 
+    if (FireAlarm_IsBlockingCommand(cmd->command)) {
+        SC_SendPacket(NULL, 0, RESP_FAILED);
+        return;
+    }
+
     switch (cmd->command) {
         // Команды БЕЗ аргументов
         case CMD_GET_STATUS:
@@ -86,6 +92,11 @@ void SC_CommandHandler(ReceivedCommand_t* cmd) {
             // }
             response_code = RESP_FAILED;
             break;
+        case CMD_FIRE_ALARM:
+            FireAlarm_Activate();
+            response_code = RESP_SUCCESS;
+            break;
+
         case CMD_DEVICE_RESET:
             // 2. Отправляем SUCCESS (хост может успеть получить его перед ребутом)
             SC_SendPacket(NULL, 0, RESP_SUCCESS);

Core/Src/stm32f1xx_it.c

@@ -63,6 +63,10 @@ extern ADC_HandleTypeDef hadc1;
 extern CAN_HandleTypeDef hcan1;
 extern CAN_HandleTypeDef hcan2;
 extern TIM_HandleTypeDef htim3;
+extern DMA_HandleTypeDef hdma_usart2_rx;
+extern DMA_HandleTypeDef hdma_usart2_tx;
+extern DMA_HandleTypeDef hdma_usart3_rx;
+extern DMA_HandleTypeDef hdma_usart3_tx;
 extern UART_HandleTypeDef huart5;
 extern UART_HandleTypeDef huart1;
 extern UART_HandleTypeDef huart2;
@@ -223,6 +227,62 @@ HAL_GPIO_WritePin(DBG4_GPIO_Port, DBG4_Pin, GPIO_PIN_RESET);
   /* USER CODE END DMA1_Channel1_IRQn 1 */
 }
 
+/**
+  * @brief This function handles DMA1 channel2 global interrupt.
+  */
+void DMA1_Channel2_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel2_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel2_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart3_tx);
+  /* USER CODE BEGIN DMA1_Channel2_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel2_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 channel3 global interrupt.
+  */
+void DMA1_Channel3_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel3_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel3_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart3_rx);
+  /* USER CODE BEGIN DMA1_Channel3_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel3_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 channel6 global interrupt.
+  */
+void DMA1_Channel6_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel6_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel6_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_rx);
+  /* USER CODE BEGIN DMA1_Channel6_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel6_IRQn 1 */
+}
+
+/**
+  * @brief This function handles DMA1 channel7 global interrupt.
+  */
+void DMA1_Channel7_IRQHandler(void)
+{
+  /* USER CODE BEGIN DMA1_Channel7_IRQn 0 */
+
+  /* USER CODE END DMA1_Channel7_IRQn 0 */
+  HAL_DMA_IRQHandler(&hdma_usart2_tx);
+  /* USER CODE BEGIN DMA1_Channel7_IRQn 1 */
+
+  /* USER CODE END DMA1_Channel7_IRQn 1 */
+}
+
 /**
   * @brief This function handles ADC1 and ADC2 global interrupts.
   */

Core/Src/tim.c

@@ -166,7 +166,7 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle)
     __HAL_RCC_TIM3_CLK_ENABLE();
 
     /* TIM3 interrupt Init */
-    HAL_NVIC_SetPriority(TIM3_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(TIM3_IRQn, 6, 0);
     HAL_NVIC_EnableIRQ(TIM3_IRQn);
   /* USER CODE BEGIN TIM3_MspInit 1 */
 

Core/Src/usart.c

@@ -28,6 +28,10 @@ UART_HandleTypeDef huart5;
 UART_HandleTypeDef huart1;
 UART_HandleTypeDef huart2;
 UART_HandleTypeDef huart3;
+DMA_HandleTypeDef hdma_usart2_rx;
+DMA_HandleTypeDef hdma_usart2_tx;
+DMA_HandleTypeDef hdma_usart3_rx;
+DMA_HandleTypeDef hdma_usart3_tx;
 
 /* UART5 init function */
 void MX_UART5_Init(void)
@@ -174,7 +178,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
     /* UART5 interrupt Init */
-    HAL_NVIC_SetPriority(UART5_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(UART5_IRQn, 5, 0);
     HAL_NVIC_EnableIRQ(UART5_IRQn);
   /* USER CODE BEGIN UART5_MspInit 1 */
 
@@ -204,7 +208,7 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
     /* USART1 interrupt Init */
-    HAL_NVIC_SetPriority(USART1_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(USART1_IRQn, 5, 0);
     HAL_NVIC_EnableIRQ(USART1_IRQn);
   /* USER CODE BEGIN USART1_MspInit 1 */
 
@@ -235,8 +239,41 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
 
     __HAL_AFIO_REMAP_USART2_ENABLE();
 
+    /* USART2 DMA Init */
+    /* USART2_RX Init */
+    hdma_usart2_rx.Instance = DMA1_Channel6;
+    hdma_usart2_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_usart2_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_rx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_rx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_rx.Init.Priority = DMA_PRIORITY_VERY_HIGH;
+    if (HAL_DMA_Init(&hdma_usart2_rx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmarx,hdma_usart2_rx);
+
+    /* USART2_TX Init */
+    hdma_usart2_tx.Instance = DMA1_Channel7;
+    hdma_usart2_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart2_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart2_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart2_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart2_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart2_tx.Init.Priority = DMA_PRIORITY_HIGH;
+    if (HAL_DMA_Init(&hdma_usart2_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart2_tx);
+
     /* USART2 interrupt Init */
-    HAL_NVIC_SetPriority(USART2_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(USART2_IRQn, 2, 0);
     HAL_NVIC_EnableIRQ(USART2_IRQn);
   /* USER CODE BEGIN USART2_MspInit 1 */
 
@@ -267,8 +304,41 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle)
 
     __HAL_AFIO_REMAP_USART3_PARTIAL();
 
+    /* USART3 DMA Init */
+    /* USART3_RX Init */
+    hdma_usart3_rx.Instance = DMA1_Channel3;
+    hdma_usart3_rx.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_usart3_rx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart3_rx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart3_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart3_rx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart3_rx.Init.Mode = DMA_NORMAL;
+    hdma_usart3_rx.Init.Priority = DMA_PRIORITY_VERY_HIGH;
+    if (HAL_DMA_Init(&hdma_usart3_rx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmarx,hdma_usart3_rx);
+
+    /* USART3_TX Init */
+    hdma_usart3_tx.Instance = DMA1_Channel2;
+    hdma_usart3_tx.Init.Direction = DMA_MEMORY_TO_PERIPH;
+    hdma_usart3_tx.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_usart3_tx.Init.MemInc = DMA_MINC_ENABLE;
+    hdma_usart3_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_BYTE;
+    hdma_usart3_tx.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE;
+    hdma_usart3_tx.Init.Mode = DMA_NORMAL;
+    hdma_usart3_tx.Init.Priority = DMA_PRIORITY_HIGH;
+    if (HAL_DMA_Init(&hdma_usart3_tx) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(uartHandle,hdmatx,hdma_usart3_tx);
+
     /* USART3 interrupt Init */
-    HAL_NVIC_SetPriority(USART3_IRQn, 0, 0);
+    HAL_NVIC_SetPriority(USART3_IRQn, 2, 0);
     HAL_NVIC_EnableIRQ(USART3_IRQn);
   /* USER CODE BEGIN USART3_MspInit 1 */
 
@@ -335,6 +405,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     */
     HAL_GPIO_DeInit(GPIOD, GPIO_PIN_5|GPIO_PIN_6);
 
+    /* USART2 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmarx);
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
     /* USART2 interrupt Deinit */
     HAL_NVIC_DisableIRQ(USART2_IRQn);
   /* USER CODE BEGIN USART2_MspDeInit 1 */
@@ -355,6 +429,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle)
     */
     HAL_GPIO_DeInit(GPIOC, GPIO_PIN_10|GPIO_PIN_11);
 
+    /* USART3 DMA DeInit */
+    HAL_DMA_DeInit(uartHandle->hdmarx);
+    HAL_DMA_DeInit(uartHandle->hdmatx);
+
     /* USART3 interrupt Deinit */
     HAL_NVIC_DisableIRQ(USART3_IRQn);
   /* USER CODE BEGIN USART3_MspDeInit 1 */

Debug/Core/Src/charger_control.cyclo

@@ -1,5 +1,5 @@
-../Core/Src/charger_control.c:12:6:CONN_Init	1
+../Core/Src/charger_control.c:13:6:CONN_Init	1
-../Core/Src/charger_control.c:20:6:CONN_Loop	6
+../Core/Src/charger_control.c:21:6:CONN_Loop	7
-../Core/Src/charger_control.c:42:6:CONN_Task	6
+../Core/Src/charger_control.c:50:6:CONN_Task	1
-../Core/Src/charger_control.c:58:6:CONN_SetState	16
+../Core/Src/charger_control.c:57:6:CONN_SetState	16
-../Core/Src/charger_control.c:84:6:CONN_PrintChargingTotal	1
+../Core/Src/charger_control.c:83:6:CONN_PrintChargingTotal	1

Debug/Core/Src/cp.cyclo

@@ -1,7 +1,9 @@
-../Core/Src/cp.c:16:16:CP_ReadVoltageMv	1
+../Core/Src/cp.c:19:16:CP_ReadVoltageMv	1
-../Core/Src/cp.c:33:6:CP_Init	1
+../Core/Src/cp.c:36:6:CP_Init	1
-../Core/Src/cp.c:50:6:CP_SetDuty	1
+../Core/Src/cp.c:53:6:CP_SetDuty	1
-../Core/Src/cp.c:63:9:CP_GetDuty	1
+../Core/Src/cp.c:66:9:CP_GetDuty	1
-../Core/Src/cp.c:67:9:CP_GetVoltage	1
+../Core/Src/cp.c:70:9:CP_GetVoltage	1
-../Core/Src/cp.c:72:12:CP_GetState	12
+../Core/Src/cp.c:75:12:CP_GetState	12
-../Core/Src/cp.c:96:6:CP_Loop	1
+../Core/Src/cp.c:99:12:CP_GetFilteredState	1
+../Core/Src/cp.c:103:6:CP_FilterState	5
+../Core/Src/cp.c:131:6:CP_Loop	5

Debug/Core/Src/fire_alarm.cyclo

@@ -0,0 +1,4 @@
+../Core/Src/fire_alarm.c:14:9:FireAlarm_IsLatched	1
+../Core/Src/fire_alarm.c:18:9:FireAlarm_IsBlockingCommand	8
+../Core/Src/fire_alarm.c:34:6:FireAlarm_Activate	2
+../Core/Src/fire_alarm.c:53:6:FireAlarm_Maintain	6

Debug/Core/Src/main.cyclo

@@ -1,8 +1,9 @@
+../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset	1
 ../Core/Src/main.c:65:13:VectorBase_Config	1
 ../Core/Src/main.c:76:9:ED_TraceWarning	3
 ../Core/Src/main.c:88:6:ED_Delay	3
-../Core/Src/main.c:107:6:StopButtonControl	2
+../Core/Src/main.c:108:6:StopButtonControl	8
-../Core/Src/main.c:118:13:CAN1_MinimalReInit	3
+../Core/Src/main.c:151:13:CAN1_MinimalReInit	3
-../Core/Src/main.c:136:5:main	1
+../Core/Src/main.c:169:5:main	1
-../Core/Src/main.c:219:6:SystemClock_Config	4
+../Core/Src/main.c:250:6:SystemClock_Config	4
-../Core/Src/main.c:279:6:Error_Handler	1
+../Core/Src/main.c:310:6:Error_Handler	1

Debug/Core/Src/psu_control.cyclo

@@ -3,10 +3,10 @@
 ../Core/Src/psu_control.c:43:15:HAL_CAN_RxFifo1MsgPendingCallback	9
 ../Core/Src/psu_control.c:117:6:PSU_CAN_FilterInit	2
 ../Core/Src/psu_control.c:140:6:PSU_Init	1
-../Core/Src/psu_control.c:157:6:PSU_Enable	3
+../Core/Src/psu_control.c:158:6:PSU_Enable	3
-../Core/Src/psu_control.c:169:6:PSU_SetHVMode	2
+../Core/Src/psu_control.c:170:6:PSU_SetHVMode	2
-../Core/Src/psu_control.c:176:6:PSU_SetVoltageCurrent	5
+../Core/Src/psu_control.c:177:6:PSU_SetVoltageCurrent	5
-../Core/Src/psu_control.c:203:6:PSU_SendCmd	4
+../Core/Src/psu_control.c:204:6:PSU_SendCmd	4
-../Core/Src/psu_control.c:239:10:max	2
+../Core/Src/psu_control.c:240:10:max	2
-../Core/Src/psu_control.c:244:6:PSU_ReadWrite	6
+../Core/Src/psu_control.c:245:6:PSU_ReadWrite	8
-../Core/Src/psu_control.c:280:6:PSU_Task	41
+../Core/Src/psu_control.c:289:6:PSU_Task	41

Debug/Core/Src/rgb_controller.cyclo

@@ -1,6 +1,6 @@
-../Core/Src/rgb_controller.c:92:6:LED_Write	16
+../Core/Src/rgb_controller.c:103:6:LED_Write	20
-../Core/Src/rgb_controller.c:146:6:interpolateColors	3
+../Core/Src/rgb_controller.c:169:6:interpolateColors	3
-../Core/Src/rgb_controller.c:164:6:RGB_SetColor	1
+../Core/Src/rgb_controller.c:187:6:RGB_SetColor	1
-../Core/Src/rgb_controller.c:170:6:LED_SetColor	1
+../Core/Src/rgb_controller.c:193:6:LED_SetColor	1
-../Core/Src/rgb_controller.c:175:6:LED_Init	1
+../Core/Src/rgb_controller.c:198:6:LED_Init	1
-../Core/Src/rgb_controller.c:207:6:LED_Task	10
+../Core/Src/rgb_controller.c:230:6:LED_Task	10

Debug/Core/Src/serial.cyclo

@@ -1,18 +1,20 @@
-../Core/Src/serial.c:59:22:uart3_log_hal_error	3
+../Core/Src/serial.c:71:22:uart3_log_hal_error	3
-../Core/Src/serial.c:79:22:uart3_arm_rx_or_log	3
+../Core/Src/serial.c:91:22:uart3_arm_rx_or_log	3
-../Core/Src/serial.c:94:15:CCS_RxEventCallback	4
+../Core/Src/serial.c:107:15:CCS_RxEventCallback	4
-../Core/Src/serial.c:117:15:HAL_UART_ErrorCallback	5
+../Core/Src/serial.c:130:15:HAL_UART_ErrorCallback	5
-../Core/Src/serial.c:135:6:CCS_SerialLoop	43
+../Core/Src/serial.c:150:6:CCS_TxCpltCallback	4
-../Core/Src/serial.c:301:6:CCS_Init	1
+../Core/Src/serial.c:166:6:CCS_SerialLoop	72
-../Core/Src/serial.c:315:26:crc16_ibm	3
+../Core/Src/serial.c:394:6:CCS_Init	1
-../Core/Src/serial.c:330:17:CCS_BuildPacket	4
+../Core/Src/serial.c:409:26:crc16_ibm	3
-../Core/Src/serial.c:346:13:CCS_SendPacket	2
+../Core/Src/serial.c:424:17:CCS_BuildPacket	4
-../Core/Src/serial.c:354:13:CCS_SendResetReason	1
+../Core/Src/serial.c:440:13:CCS_SendPacket	4
-../Core/Src/serial.c:358:6:CCS_SendEmergencyStop	1
+../Core/Src/serial.c:457:13:CCS_SendResetReason	1
-../Core/Src/serial.c:362:6:CCS_SendStart	1
+../Core/Src/serial.c:461:6:CCS_SendEmergencyStop	1
-../Core/Src/serial.c:366:13:CCS_CalculateEnergy	2
+../Core/Src/serial.c:465:6:CCS_SendStart	1
-../Core/Src/serial.c:381:13:send_state	3
+../Core/Src/serial.c:469:13:CCS_CalculateEnergy	2
-../Core/Src/serial.c:409:26:expected_payload_len	2
+../Core/Src/serial.c:484:13:send_state	3
-../Core/Src/serial.c:425:22:apply_command	13
+../Core/Src/serial.c:514:26:expected_payload_len	2
-../Core/Src/serial.c:497:25:process_received_packet	8
+../Core/Src/serial.c:530:22:apply_command	15
-../Core/Src/serial.c:550:13:CCS_UART3_Watchdog	3
+../Core/Src/serial.c:612:25:process_received_packet	8
+../Core/Src/serial.c:665:13:CCS_UART3_Watchdog	4
+../Core/Src/serial.c:678:13:CCS_LogUart3Error	1

Debug/Core/Src/serial_control.cyclo

@@ -1,11 +1,15 @@
-../Core/Src/serial_control.c:70:6:ReadVersion	1
+../Core/Src/serial_control.c:71:6:ReadVersion	1
-../Core/Src/serial_control.c:82:6:SC_Init	1
+../Core/Src/serial_control.c:83:6:SC_Init	1
-../Core/Src/serial_control.c:92:6:SC_Task	15
+../Core/Src/serial_control.c:94:6:SC_Task	7
-../Core/Src/serial_control.c:132:15:HAL_UARTEx_RxEventCallback	7
+../Core/Src/serial_control.c:122:15:HAL_UARTEx_RxEventCallback	8
-../Core/Src/serial_control.c:156:15:HAL_UART_TxCpltCallback	2
+../Core/Src/serial_control.c:152:15:HAL_UART_TxCpltCallback	3
-../Core/Src/serial_control.c:166:26:calculate_crc32	3
+../Core/Src/serial_control.c:163:26:calculate_crc32	3
-../Core/Src/serial_control.c:183:26:encode_packet	5
+../Core/Src/serial_control.c:180:26:encode_packet	5
-../Core/Src/serial_control.c:216:15:SC_SendPacket	3
+../Core/Src/serial_control.c:213:15:SC_SendPacket	4
-../Core/Src/serial_control.c:235:25:parse_packet	3
+../Core/Src/serial_control.c:230:25:parse_packet	3
-../Core/Src/serial_control.c:268:25:process_received_packet	2
+../Core/Src/serial_control.c:263:25:process_received_packet	2
-../Core/Src/serial_control.c:277:13:SC_UART2_Watchdog	7
+../Core/Src/serial_control.c:272:13:SC_UART2_Watchdog	5
+../Core/Src/serial_control.c:293:13:SC_ArmUart2RxDma	4
+../Core/Src/serial_control.c:301:13:SC_ArmUart5RxDma	3
+../Core/Src/serial_control.c:310:6:SC_RecoverUartDma	3
+../Core/Src/serial_control.c:325:13:SC_LogUartError	3

Debug/Core/Src/serial_handler.cyclo

@@ -1,3 +1,3 @@
 ../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset	1
-../Core/Src/serial_handler.c:26:6:SC_CommandHandler	19
+../Core/Src/serial_handler.c:27:6:SC_CommandHandler	21
-../Core/Src/serial_handler.c:125:6:monitoring_data_callback	1
+../Core/Src/serial_handler.c:136:6:monitoring_data_callback	1

Debug/Core/Src/stm32f1xx_it.cyclo

@@ -1,19 +1,23 @@
-../Core/Src/stm32f1xx_it.c:80:6:NMI_Handler	1
+../Core/Src/stm32f1xx_it.c:84:6:NMI_Handler	1
-../Core/Src/stm32f1xx_it.c:95:6:HardFault_Handler	1
+../Core/Src/stm32f1xx_it.c:99:6:HardFault_Handler	1
-../Core/Src/stm32f1xx_it.c:110:6:MemManage_Handler	1
+../Core/Src/stm32f1xx_it.c:114:6:MemManage_Handler	1
-../Core/Src/stm32f1xx_it.c:125:6:BusFault_Handler	1
+../Core/Src/stm32f1xx_it.c:129:6:BusFault_Handler	1
-../Core/Src/stm32f1xx_it.c:140:6:UsageFault_Handler	1
+../Core/Src/stm32f1xx_it.c:144:6:UsageFault_Handler	1
-../Core/Src/stm32f1xx_it.c:155:6:SVC_Handler	1
+../Core/Src/stm32f1xx_it.c:159:6:SVC_Handler	1
-../Core/Src/stm32f1xx_it.c:168:6:DebugMon_Handler	1
+../Core/Src/stm32f1xx_it.c:172:6:DebugMon_Handler	1
-../Core/Src/stm32f1xx_it.c:181:6:PendSV_Handler	1
+../Core/Src/stm32f1xx_it.c:185:6:PendSV_Handler	1
-../Core/Src/stm32f1xx_it.c:194:6:SysTick_Handler	1
+../Core/Src/stm32f1xx_it.c:198:6:SysTick_Handler	1
-../Core/Src/stm32f1xx_it.c:215:6:DMA1_Channel1_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:219:6:DMA1_Channel1_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:229:6:ADC1_2_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:233:6:DMA1_Channel2_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:243:6:CAN1_RX0_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:247:6:DMA1_Channel3_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:257:6:TIM3_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:261:6:DMA1_Channel6_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:271:6:USART1_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:275:6:DMA1_Channel7_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:285:6:USART2_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:289:6:ADC1_2_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:299:6:USART3_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:303:6:CAN1_RX0_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:313:6:UART5_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:317:6:TIM3_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:327:6:CAN2_TX_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:331:6:USART1_IRQHandler	1
-../Core/Src/stm32f1xx_it.c:341:6:CAN2_RX1_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:345:6:USART2_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:359:6:USART3_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:373:6:UART5_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:387:6:CAN2_TX_IRQHandler	1
+../Core/Src/stm32f1xx_it.c:401:6:CAN2_RX1_IRQHandler	1

Debug/Core/Src/subdir.mk

@@ -13,6 +13,7 @@ C_SRCS += \
 ../Core/Src/crc.c \
 ../Core/Src/debug.c \
 ../Core/Src/dma.c \
+../Core/Src/fire_alarm.c \
 ../Core/Src/gpio.c \
 ../Core/Src/main.c \
 ../Core/Src/meter.c \
@@ -41,6 +42,7 @@ C_DEPS += \
 ./Core/Src/crc.d \
 ./Core/Src/debug.d \
 ./Core/Src/dma.d \
+./Core/Src/fire_alarm.d \
 ./Core/Src/gpio.d \
 ./Core/Src/main.d \
 ./Core/Src/meter.d \
@@ -69,6 +71,7 @@ OBJS += \
 ./Core/Src/crc.o \
 ./Core/Src/debug.o \
 ./Core/Src/dma.o \
+./Core/Src/fire_alarm.o \
 ./Core/Src/gpio.o \
 ./Core/Src/main.o \
 ./Core/Src/meter.o \
@@ -96,7 +99,7 @@ Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
 clean: clean-Core-2f-Src
 
 clean-Core-2f-Src:
-	-$(RM) ./Core/Src/adc.cyclo ./Core/Src/adc.d ./Core/Src/adc.o ./Core/Src/adc.su ./Core/Src/board.cyclo ./Core/Src/board.d ./Core/Src/board.o ./Core/Src/board.su ./Core/Src/can.cyclo ./Core/Src/can.d ./Core/Src/can.o ./Core/Src/can.su ./Core/Src/charger_control.cyclo ./Core/Src/charger_control.d ./Core/Src/charger_control.o ./Core/Src/charger_control.su ./Core/Src/cp.cyclo ./Core/Src/cp.d ./Core/Src/cp.o ./Core/Src/cp.su ./Core/Src/crc.cyclo ./Core/Src/crc.d ./Core/Src/crc.o ./Core/Src/crc.su ./Core/Src/debug.cyclo ./Core/Src/debug.d ./Core/Src/debug.o ./Core/Src/debug.su ./Core/Src/dma.cyclo ./Core/Src/dma.d ./Core/Src/dma.o ./Core/Src/dma.su ./Core/Src/gpio.cyclo ./Core/Src/gpio.d ./Core/Src/gpio.o ./Core/Src/gpio.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/meter.cyclo ./Core/Src/meter.d ./Core/Src/meter.o ./Core/Src/meter.su ./Core/Src/psu_control.cyclo ./Core/Src/psu_control.d ./Core/Src/psu_control.o ./Core/Src/psu_control.su ./Core/Src/rgb_controller.cyclo ./Core/Src/rgb_controller.d ./Core/Src/rgb_controller.o ./Core/Src/rgb_controller.su ./Core/Src/rtc.cyclo ./Core/Src/rtc.d ./Core/Src/rtc.o ./Core/Src/rtc.su ./Core/Src/serial.cyclo ./Core/Src/serial.d ./Core/Src/serial.o ./Core/Src/serial.su ./Core/Src/serial_control.cyclo ./Core/Src/serial_control.d ./Core/Src/serial_control.o ./Core/Src/serial_control.su ./Core/Src/serial_handler.cyclo ./Core/Src/serial_handler.d ./Core/Src/serial_handler.o ./Core/Src/serial_handler.su ./Core/Src/sma_filter.cyclo ./Core/Src/sma_filter.d ./Core/Src/sma_filter.o ./Core/Src/sma_filter.su ./Core/Src/soft_rtc.cyclo ./Core/Src/soft_rtc.d ./Core/Src/soft_rtc.o ./Core/Src/soft_rtc.su ./Core/Src/stm32f1xx_hal_msp.cyclo ./Core/Src/stm32f1xx_hal_msp.d ./Core/Src/stm32f1xx_hal_msp.o ./Core/Src/stm32f1xx_hal_msp.su ./Core/Src/stm32f1xx_it.cyclo ./Core/Src/stm32f1xx_it.d ./Core/Src/stm32f1xx_it.o ./Core/Src/stm32f1xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f1xx.cyclo ./Core/Src/system_stm32f1xx.d ./Core/Src/system_stm32f1xx.o ./Core/Src/system_stm32f1xx.su ./Core/Src/tim.cyclo ./Core/Src/tim.d ./Core/Src/tim.o ./Core/Src/tim.su ./Core/Src/usart.cyclo ./Core/Src/usart.d ./Core/Src/usart.o ./Core/Src/usart.su
+	-$(RM) ./Core/Src/adc.cyclo ./Core/Src/adc.d ./Core/Src/adc.o ./Core/Src/adc.su ./Core/Src/board.cyclo ./Core/Src/board.d ./Core/Src/board.o ./Core/Src/board.su ./Core/Src/can.cyclo ./Core/Src/can.d ./Core/Src/can.o ./Core/Src/can.su ./Core/Src/charger_control.cyclo ./Core/Src/charger_control.d ./Core/Src/charger_control.o ./Core/Src/charger_control.su ./Core/Src/cp.cyclo ./Core/Src/cp.d ./Core/Src/cp.o ./Core/Src/cp.su ./Core/Src/crc.cyclo ./Core/Src/crc.d ./Core/Src/crc.o ./Core/Src/crc.su ./Core/Src/debug.cyclo ./Core/Src/debug.d ./Core/Src/debug.o ./Core/Src/debug.su ./Core/Src/dma.cyclo ./Core/Src/dma.d ./Core/Src/dma.o ./Core/Src/dma.su ./Core/Src/fire_alarm.cyclo ./Core/Src/fire_alarm.d ./Core/Src/fire_alarm.o ./Core/Src/fire_alarm.su ./Core/Src/gpio.cyclo ./Core/Src/gpio.d ./Core/Src/gpio.o ./Core/Src/gpio.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/meter.cyclo ./Core/Src/meter.d ./Core/Src/meter.o ./Core/Src/meter.su ./Core/Src/psu_control.cyclo ./Core/Src/psu_control.d ./Core/Src/psu_control.o ./Core/Src/psu_control.su ./Core/Src/rgb_controller.cyclo ./Core/Src/rgb_controller.d ./Core/Src/rgb_controller.o ./Core/Src/rgb_controller.su ./Core/Src/rtc.cyclo ./Core/Src/rtc.d ./Core/Src/rtc.o ./Core/Src/rtc.su ./Core/Src/serial.cyclo ./Core/Src/serial.d ./Core/Src/serial.o ./Core/Src/serial.su ./Core/Src/serial_control.cyclo ./Core/Src/serial_control.d ./Core/Src/serial_control.o ./Core/Src/serial_control.su ./Core/Src/serial_handler.cyclo ./Core/Src/serial_handler.d ./Core/Src/serial_handler.o ./Core/Src/serial_handler.su ./Core/Src/sma_filter.cyclo ./Core/Src/sma_filter.d ./Core/Src/sma_filter.o ./Core/Src/sma_filter.su ./Core/Src/soft_rtc.cyclo ./Core/Src/soft_rtc.d ./Core/Src/soft_rtc.o ./Core/Src/soft_rtc.su ./Core/Src/stm32f1xx_hal_msp.cyclo ./Core/Src/stm32f1xx_hal_msp.d ./Core/Src/stm32f1xx_hal_msp.o ./Core/Src/stm32f1xx_hal_msp.su ./Core/Src/stm32f1xx_it.cyclo ./Core/Src/stm32f1xx_it.d ./Core/Src/stm32f1xx_it.o ./Core/Src/stm32f1xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f1xx.cyclo ./Core/Src/system_stm32f1xx.d ./Core/Src/system_stm32f1xx.o ./Core/Src/system_stm32f1xx.su ./Core/Src/tim.cyclo ./Core/Src/tim.d ./Core/Src/tim.o ./Core/Src/tim.su ./Core/Src/usart.cyclo ./Core/Src/usart.d ./Core/Src/usart.o ./Core/Src/usart.su
 
 .PHONY: clean-Core-2f-Src
 

Debug/Core/Src/usart.cyclo

@@ -1,6 +1,6 @@
-../Core/Src/usart.c:33:6:MX_UART5_Init	2
+../Core/Src/usart.c:37:6:MX_UART5_Init	2
-../Core/Src/usart.c:62:6:MX_USART1_UART_Init	2
+../Core/Src/usart.c:66:6:MX_USART1_UART_Init	2
-../Core/Src/usart.c:91:6:MX_USART2_UART_Init	2
+../Core/Src/usart.c:95:6:MX_USART2_UART_Init	2
-../Core/Src/usart.c:120:6:MX_USART3_UART_Init	2
+../Core/Src/usart.c:124:6:MX_USART3_UART_Init	2
-../Core/Src/usart.c:148:6:HAL_UART_MspInit	5
+../Core/Src/usart.c:152:6:HAL_UART_MspInit	9
-../Core/Src/usart.c:279:6:HAL_UART_MspDeInit	5
+../Core/Src/usart.c:349:6:HAL_UART_MspDeInit	5

Debug/objects.list

@@ -6,6 +6,7 @@
 "./Core/Src/crc.o"
 "./Core/Src/debug.o"
 "./Core/Src/dma.o"
+"./Core/Src/fire_alarm.o"
 "./Core/Src/gpio.o"
 "./Core/Src/main.o"
 "./Core/Src/meter.o"