added WS2812 support

- Introduced CONN_ERR_FIRE_ALARM to handle fire alarm conditions in charger control.
- Added CMD_FIRE_ALARM command for external trigger handling in serial control.
- Updated firmware version from 1.0.17 to 1.0.19.
- Integrated fire alarm functionality into the charging loop and command handler.

CCSModuleSW30Web.ioc

@@ -332,8 +332,9 @@ PC5.GPIOParameters=GPIO_Label
 PC5.GPIO_Label=LOCK_B
 PC5.Locked=true
 PC5.Signal=GPIO_Output
-PC9.GPIOParameters=GPIO_Label
+PC9.GPIOParameters=GPIO_Speed,GPIO_Label
 PC9.GPIO_Label=LED_DATA
+PC9.GPIO_Speed=GPIO_SPEED_FREQ_HIGH
 PC9.Locked=true
 PC9.Signal=GPIO_Output
 PD0.Locked=true

Core/Inc/charger_control.h

@@ -47,6 +47,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/fire_alarm.h

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

Core/Inc/main.h

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

Core/Inc/rgb_controller.h

@@ -41,3 +41,5 @@ void LED_Task();
 void LED_Write();
 void LED_Init();
 void LED_SetColor(RGB_Cycle_t *color);
+void RGB_SetColor(RGB_t *color);
+void WS2812_SetColor(RGB_t *color);

Core/Inc/serial_control.h

@@ -25,6 +25,8 @@
 
 // Перезагрузка для входа в бутлоадер
 #define CMD_DEVICE_RESET		0xB5
+// Пожарная тревога (внешний триггер)
+#define CMD_FIRE_ALARM			0xB7
 
 // Коды ответов
 #define RESP_SUCCESS    		0x12

Core/Src/adc.c

@@ -1,218 +1,218 @@
-/* USER CODE BEGIN Header */
-
-/* USER CODE END Header */
-/* Includes ------------------------------------------------------------------*/
-#include "adc.h"
-
-/* USER CODE BEGIN 0 */
-#include "isr_opt.h"
-static volatile uint16_t adc_dma_raw[6];
-volatile ADC_ScanData_t adc_data = {0};
-static volatile uint8_t adc_scan_data_ready = 0u;
-
-void ADC_ScanStart(void)
-{
-  if (HAL_ADC_Start_DMA(&hadc1, (uint32_t *)adc_dma_raw, 6u) != HAL_OK)
-  {
-    Error_Handler();
-  }
-}
-
-ISR_FAST void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc)
-{
-  if (hadc->Instance != ADC1)
-  {
-    return;
-  }
-
-  adc_data.in3_raw = adc_dma_raw[0];
-  adc_data.cp_raw = adc_dma_raw[1];
-  adc_data.ntc1_raw = adc_dma_raw[2];
-  adc_data.ntc2_raw = adc_dma_raw[3];
-  adc_data.temp_sensor_raw = adc_dma_raw[4];
-  adc_data.vrefint_raw = adc_dma_raw[5];
-  adc_scan_data_ready = 1u;
-}
-
-/* USER CODE END 0 */
-
-ADC_HandleTypeDef hadc1;
-DMA_HandleTypeDef hdma_adc1;
-
-/* ADC1 init function */
-void MX_ADC1_Init(void)
-{
-
-  /* USER CODE BEGIN ADC1_Init 0 */
-
-  /* USER CODE END ADC1_Init 0 */
-
-  ADC_ChannelConfTypeDef sConfig = {0};
-
-  /* USER CODE BEGIN ADC1_Init 1 */
-
-  /* USER CODE END ADC1_Init 1 */
-
-  /** Common config
-  */
-  hadc1.Instance = ADC1;
-  hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
-  hadc1.Init.ContinuousConvMode = DISABLE;
-  hadc1.Init.DiscontinuousConvMode = DISABLE;
-  hadc1.Init.ExternalTrigConv = ADC_EXTERNALTRIGCONV_T3_TRGO;
-  hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
-  hadc1.Init.NbrOfConversion = 6;
-  if (HAL_ADC_Init(&hadc1) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_3;
-  sConfig.Rank = ADC_REGULAR_RANK_1;
-  sConfig.SamplingTime = ADC_SAMPLETIME_41CYCLES_5;
-  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_4;
-  sConfig.Rank = ADC_REGULAR_RANK_2;
-  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_8;
-  sConfig.Rank = ADC_REGULAR_RANK_3;
-  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_9;
-  sConfig.Rank = ADC_REGULAR_RANK_4;
-  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
-  sConfig.Rank = ADC_REGULAR_RANK_5;
-  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-
-  /** Configure Regular Channel
-  */
-  sConfig.Channel = ADC_CHANNEL_VREFINT;
-  sConfig.Rank = ADC_REGULAR_RANK_6;
-  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
-  {
-    Error_Handler();
-  }
-  /* USER CODE BEGIN ADC1_Init 2 */
-
-  /* USER CODE END ADC1_Init 2 */
-
-}
-
-void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
-{
-
-  GPIO_InitTypeDef GPIO_InitStruct = {0};
-  if(adcHandle->Instance==ADC1)
-  {
-  /* USER CODE BEGIN ADC1_MspInit 0 */
-
-  /* USER CODE END ADC1_MspInit 0 */
-    /* ADC1 clock enable */
-    __HAL_RCC_ADC1_CLK_ENABLE();
-
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    __HAL_RCC_GPIOB_CLK_ENABLE();
-    /**ADC1 GPIO Configuration
-    PA3     ------> ADC1_IN3
-    PA4     ------> ADC1_IN4
-    PB0     ------> ADC1_IN8
-    PB1     ------> ADC1_IN9
-    */
-    GPIO_InitStruct.Pin = GPIO_PIN_3|CP_ADC_Pin;
-    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-
-    GPIO_InitStruct.Pin = ADC_NTC1_Pin|ADC_NTC2_Pin;
-    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
-    /* ADC1 DMA Init */
-    /* ADC1 Init */
-    hdma_adc1.Instance = DMA1_Channel1;
-    hdma_adc1.Init.Direction = DMA_PERIPH_TO_MEMORY;
-    hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;
-    hdma_adc1.Init.MemInc = DMA_MINC_ENABLE;
-    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_MEDIUM;
-    if (HAL_DMA_Init(&hdma_adc1) != HAL_OK)
-    {
-      Error_Handler();
-    }
-
-    __HAL_LINKDMA(adcHandle,DMA_Handle,hdma_adc1);
-
-    /* ADC1 interrupt Init */
-    HAL_NVIC_SetPriority(ADC1_2_IRQn, 7, 0);
-    HAL_NVIC_EnableIRQ(ADC1_2_IRQn);
-  /* USER CODE BEGIN ADC1_MspInit 1 */
-
-  /* USER CODE END ADC1_MspInit 1 */
-  }
-}
-
-void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
-{
-
-  if(adcHandle->Instance==ADC1)
-  {
-  /* USER CODE BEGIN ADC1_MspDeInit 0 */
-
-  /* USER CODE END ADC1_MspDeInit 0 */
-    /* Peripheral clock disable */
-    __HAL_RCC_ADC1_CLK_DISABLE();
-
-    /**ADC1 GPIO Configuration
-    PA3     ------> ADC1_IN3
-    PA4     ------> ADC1_IN4
-    PB0     ------> ADC1_IN8
-    PB1     ------> ADC1_IN9
-    */
-    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_3|CP_ADC_Pin);
-
-    HAL_GPIO_DeInit(GPIOB, ADC_NTC1_Pin|ADC_NTC2_Pin);
-
-    /* ADC1 DMA DeInit */
-    HAL_DMA_DeInit(adcHandle->DMA_Handle);
-
-    /* ADC1 interrupt Deinit */
-    HAL_NVIC_DisableIRQ(ADC1_2_IRQn);
-  /* USER CODE BEGIN ADC1_MspDeInit 1 */
-
-  /* USER CODE END ADC1_MspDeInit 1 */
-  }
-}
-
-/* USER CODE BEGIN 1 */
-
-/* USER CODE END 1 */
+/* USER CODE BEGIN Header */
+
+/* USER CODE END Header */
+/* Includes ------------------------------------------------------------------*/
+#include "adc.h"
+
+/* USER CODE BEGIN 0 */
+#include "isr_opt.h"
+static volatile uint16_t adc_dma_raw[6];
+volatile ADC_ScanData_t adc_data = {0};
+static volatile uint8_t adc_scan_data_ready = 0u;
+
+void ADC_ScanStart(void)
+{
+  if (HAL_ADC_Start_DMA(&hadc1, (uint32_t *)adc_dma_raw, 6u) != HAL_OK)
+  {
+    Error_Handler();
+  }
+}
+
+ISR_FAST void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc)
+{
+  if (hadc->Instance != ADC1)
+  {
+    return;
+  }
+
+  adc_data.in3_raw = adc_dma_raw[0];
+  adc_data.cp_raw = adc_dma_raw[1];
+  adc_data.ntc1_raw = adc_dma_raw[2];
+  adc_data.ntc2_raw = adc_dma_raw[3];
+  adc_data.temp_sensor_raw = adc_dma_raw[4];
+  adc_data.vrefint_raw = adc_dma_raw[5];
+  adc_scan_data_ready = 1u;
+}
+
+/* USER CODE END 0 */
+
+ADC_HandleTypeDef hadc1;
+DMA_HandleTypeDef hdma_adc1;
+
+/* ADC1 init function */
+void MX_ADC1_Init(void)
+{
+
+  /* USER CODE BEGIN ADC1_Init 0 */
+
+  /* USER CODE END ADC1_Init 0 */
+
+  ADC_ChannelConfTypeDef sConfig = {0};
+
+  /* USER CODE BEGIN ADC1_Init 1 */
+
+  /* USER CODE END ADC1_Init 1 */
+
+  /** Common config
+  */
+  hadc1.Instance = ADC1;
+  hadc1.Init.ScanConvMode = ADC_SCAN_ENABLE;
+  hadc1.Init.ContinuousConvMode = DISABLE;
+  hadc1.Init.DiscontinuousConvMode = DISABLE;
+  hadc1.Init.ExternalTrigConv = ADC_EXTERNALTRIGCONV_T3_TRGO;
+  hadc1.Init.DataAlign = ADC_DATAALIGN_RIGHT;
+  hadc1.Init.NbrOfConversion = 6;
+  if (HAL_ADC_Init(&hadc1) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_3;
+  sConfig.Rank = ADC_REGULAR_RANK_1;
+  sConfig.SamplingTime = ADC_SAMPLETIME_41CYCLES_5;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_4;
+  sConfig.Rank = ADC_REGULAR_RANK_2;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_8;
+  sConfig.Rank = ADC_REGULAR_RANK_3;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_9;
+  sConfig.Rank = ADC_REGULAR_RANK_4;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_TEMPSENSOR;
+  sConfig.Rank = ADC_REGULAR_RANK_5;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+
+  /** Configure Regular Channel
+  */
+  sConfig.Channel = ADC_CHANNEL_VREFINT;
+  sConfig.Rank = ADC_REGULAR_RANK_6;
+  if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
+  {
+    Error_Handler();
+  }
+  /* USER CODE BEGIN ADC1_Init 2 */
+
+  /* USER CODE END ADC1_Init 2 */
+
+}
+
+void HAL_ADC_MspInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  GPIO_InitTypeDef GPIO_InitStruct = {0};
+  if(adcHandle->Instance==ADC1)
+  {
+  /* USER CODE BEGIN ADC1_MspInit 0 */
+
+  /* USER CODE END ADC1_MspInit 0 */
+    /* ADC1 clock enable */
+    __HAL_RCC_ADC1_CLK_ENABLE();
+
+    __HAL_RCC_GPIOA_CLK_ENABLE();
+    __HAL_RCC_GPIOB_CLK_ENABLE();
+    /**ADC1 GPIO Configuration
+    PA3     ------> ADC1_IN3
+    PA4     ------> ADC1_IN4
+    PB0     ------> ADC1_IN8
+    PB1     ------> ADC1_IN9
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_3|CP_ADC_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+
+    GPIO_InitStruct.Pin = ADC_NTC1_Pin|ADC_NTC2_Pin;
+    GPIO_InitStruct.Mode = GPIO_MODE_ANALOG;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+    /* ADC1 DMA Init */
+    /* ADC1 Init */
+    hdma_adc1.Instance = DMA1_Channel1;
+    hdma_adc1.Init.Direction = DMA_PERIPH_TO_MEMORY;
+    hdma_adc1.Init.PeriphInc = DMA_PINC_DISABLE;
+    hdma_adc1.Init.MemInc = DMA_MINC_ENABLE;
+    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_MEDIUM;
+    if (HAL_DMA_Init(&hdma_adc1) != HAL_OK)
+    {
+      Error_Handler();
+    }
+
+    __HAL_LINKDMA(adcHandle,DMA_Handle,hdma_adc1);
+
+    /* ADC1 interrupt Init */
+    HAL_NVIC_SetPriority(ADC1_2_IRQn, 7, 0);
+    HAL_NVIC_EnableIRQ(ADC1_2_IRQn);
+  /* USER CODE BEGIN ADC1_MspInit 1 */
+
+  /* USER CODE END ADC1_MspInit 1 */
+  }
+}
+
+void HAL_ADC_MspDeInit(ADC_HandleTypeDef* adcHandle)
+{
+
+  if(adcHandle->Instance==ADC1)
+  {
+  /* USER CODE BEGIN ADC1_MspDeInit 0 */
+
+  /* USER CODE END ADC1_MspDeInit 0 */
+    /* Peripheral clock disable */
+    __HAL_RCC_ADC1_CLK_DISABLE();
+
+    /**ADC1 GPIO Configuration
+    PA3     ------> ADC1_IN3
+    PA4     ------> ADC1_IN4
+    PB0     ------> ADC1_IN8
+    PB1     ------> ADC1_IN9
+    */
+    HAL_GPIO_DeInit(GPIOA, GPIO_PIN_3|CP_ADC_Pin);
+
+    HAL_GPIO_DeInit(GPIOB, ADC_NTC1_Pin|ADC_NTC2_Pin);
+
+    /* ADC1 DMA DeInit */
+    HAL_DMA_DeInit(adcHandle->DMA_Handle);
+
+    /* ADC1 interrupt Deinit */
+    HAL_NVIC_DisableIRQ(ADC1_2_IRQn);
+  /* USER CODE BEGIN ADC1_MspDeInit 1 */
+
+  /* USER CODE END ADC1_MspDeInit 1 */
+  }
+}
+
+/* USER CODE BEGIN 1 */
+
+/* USER CODE END 1 */

Core/Src/charger_control.c

@@ -2,6 +2,7 @@
 
 #include "charger_config.h"
 #include "debug.h"
+#include "fire_alarm.h"
 #include "psu_control.h"
 
 ChargingConnector_t CONN;
@@ -22,7 +23,9 @@ void CONN_Loop(){
 		CONN.connControl = CMD_NONE;
 	}
 
-	if(PSU0.cont_fault){
+	if (FireAlarm_IsLatched()) {
+		CONN.chargingError = CONN_ERR_FIRE_ALARM;
+	} else if(PSU0.cont_fault){
 		CONN.chargingError = CONN_ERR_CONTACTOR;
 	} else if(PSU0.psu_fault){
 		CONN.chargingError = CONN_ERR_PSU_FAULT;

Core/Src/fire_alarm.c

@@ -0,0 +1,20 @@
+#include "fire_alarm.h"
+
+#include "charger_control.h"
+#include "debug.h"
+#include "serial.h"
+
+static uint8_t fire_alarm_latched = 0;
+
+uint8_t FireAlarm_IsLatched(void) {
+    return fire_alarm_latched;
+}
+
+void FireAlarm_Activate(void) {
+    if (fire_alarm_latched) {
+        return;
+    }
+
+    fire_alarm_latched = 1;
+    log_printf(LOG_ERR, "FIRE ALARM activated\n");
+}

Core/Src/gpio.c

@@ -54,15 +54,15 @@ void MX_GPIO_Init(void)
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(GPIOD, RELAY_DC_Pin|USART2_DIR_Pin, GPIO_PIN_RESET);
 
-  /*Configure GPIO pin : DBG1_Pin */
-  GPIO_InitStruct.Pin = DBG1_Pin;
+  /*Configure GPIO pins : DBG1_Pin LED_DATA_Pin */
+  GPIO_InitStruct.Pin = DBG1_Pin|LED_DATA_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-  HAL_GPIO_Init(DBG1_GPIO_Port, &GPIO_InitStruct);
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
-  /*Configure GPIO pins : RELAY_CP_Pin LOCK_A_Pin LOCK_B_Pin LED_DATA_Pin */
-  GPIO_InitStruct.Pin = RELAY_CP_Pin|LOCK_A_Pin|LOCK_B_Pin|LED_DATA_Pin;
+  /*Configure GPIO pins : RELAY_CP_Pin LOCK_A_Pin LOCK_B_Pin */
+  GPIO_InitStruct.Pin = RELAY_CP_Pin|LOCK_A_Pin|LOCK_B_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;

Core/Src/rgb_controller.c

@@ -6,6 +6,15 @@
 #include "tim.h"
 #include <string.h>
 
+/* Второй светодиод в цепочке WS2812 */
+static RGB_t ws2812_led1 = { .R = 0, .G = 0, .B = 0 };
+
+#define WS2812_ERROR_BLINK_MS    100
+#define WS2812_ERROR_BLINK_PAUSE 30
+
+/* Яркость обоих WS2812 на плате, 0..255 */
+#define WS2812_BRIGHTNESS 60
+
 RGB_State_t LED_State;
 RGB_Cycle_t LED_Cycle;
 
@@ -179,10 +188,147 @@ void interpolateColors(RGB_t* color1, RGB_t* color2, uint16_t a, uint16_t b, RGB
 }
 
 
+#pragma GCC push_options
+#pragma GCC optimize("O2")
+
+
+#define WS2812_T0H_NOP  25
+#define WS2812_T0L_NOP  52
+#define WS2812_T1H_NOP  52
+#define WS2812_T1L_NOP  25
+
+#define _WS2812_DELAY_NOPS(n) __asm volatile(".rept " #n "\nnop\n.endr" ::: "memory")
+#define WS2812_DELAY_NOPS(n)  _WS2812_DELAY_NOPS(n)
+
+static void ws2812_send_pixel(uint8_t r, uint8_t g, uint8_t b)
+{
+	uint32_t tmp = ~(((uint32_t)g << 16) | ((uint32_t)r << 8) | (uint32_t)b);
+
+	for (int i = 0; i < 24; i++) {
+		LED_DATA_GPIO_Port->BSRR = LED_DATA_Pin;
+		if (tmp & (1U << 23)) {
+			WS2812_DELAY_NOPS(WS2812_T0H_NOP);
+			LED_DATA_GPIO_Port->BRR = LED_DATA_Pin;
+			WS2812_DELAY_NOPS(WS2812_T0L_NOP);
+		} else {
+			WS2812_DELAY_NOPS(WS2812_T1H_NOP);
+			LED_DATA_GPIO_Port->BRR = LED_DATA_Pin;
+			WS2812_DELAY_NOPS(WS2812_T1L_NOP);
+		}
+		tmp <<= 1;
+	}
+}
+
+static void ws2812_update(RGB_t *led0, RGB_t *led1)
+{
+	uint32_t primask = __get_PRIMASK();
+
+	__disable_irq();
+	ws2812_send_pixel(led0->R, led0->G, led0->B);
+	ws2812_send_pixel(led1->R, led1->G, led1->B);
+	__set_PRIMASK(primask);
+}
+
+#pragma GCC pop_options
+
+static RGB_t RGB_ScaleBrightness(const RGB_t *color)
+{
+	RGB_t out = {
+		.R = (uint8_t)((uint16_t)color->R * WS2812_BRIGHTNESS / 255),
+		.G = (uint8_t)((uint16_t)color->G * WS2812_BRIGHTNESS / 255),
+		.B = (uint8_t)((uint16_t)color->B * WS2812_BRIGHTNESS / 255),
+	};
+	return out;
+}
+
+/*
+ * Моргание красным на втором WS2812 при chargingError > 0.
+ * Логика как Slave-LB24 LED_Task: N вспышек = код ошибки, пауза 30×100 ms.
+ * Вызывается из LED_Task каждые 20 ms; шаг FSM — 100 ms.
+ */
+static void LED_Ws2812ErrorBlinkUpdate(void)
+{
+	static uint8_t err_counter;
+	static uint8_t led_state;
+	static uint8_t led_pause;
+	static uint32_t blink_tick;
+	static uint32_t flash_until;
+	static CONN_Error_t last_error = CONN_NO_ERROR;
+
+	const CONN_Error_t err = CONN.chargingError;
+	const uint32_t now = HAL_GetTick();
+
+	if (err == CONN_NO_ERROR) {
+		err_counter = 0;
+		led_state = 0;
+		led_pause = 0;
+		flash_until = 0;
+		last_error = CONN_NO_ERROR;
+		ws2812_led1.R = 0;
+		ws2812_led1.G = 0;
+		ws2812_led1.B = 0;
+		return;
+	}
+
+	if (err != last_error) {
+		err_counter = 0;
+		led_state = 0;
+		led_pause = 0;
+		flash_until = 0;
+		last_error = err;
+	}
+
+	if (now < flash_until) {
+		ws2812_led1.R = 255;
+		ws2812_led1.G = 0;
+		ws2812_led1.B = 0;
+		return;
+	}
+
+	ws2812_led1.R = 0;
+	ws2812_led1.G = 0;
+	ws2812_led1.B = 0;
+
+	if ((now - blink_tick) < WS2812_ERROR_BLINK_MS) {
+		return;
+	}
+	blink_tick = now;
+
+	uint8_t led_flash = 0;
+
+	if (led_pause > 0) {
+		led_pause--;
+	} else if (err_counter < (uint8_t)err) {
+		if (led_state == 0) {
+			led_state = 1;
+		} else {
+			led_flash = 1;
+			led_state = 0;
+			err_counter++;
+		}
+	} else {
+		err_counter = 0;
+		led_pause = WS2812_ERROR_BLINK_PAUSE;
+	}
+
+	if (led_flash) {
+		flash_until = now + WS2812_ERROR_BLINK_MS;
+		ws2812_led1.R = 255;
+		ws2812_led1.G = 0;
+		ws2812_led1.B = 0;
+	}
+}
+
 void RGB_SetColor(RGB_t *color){
-    htim4.Instance->CCR2 = color->R * 100 / 255;
-    htim4.Instance->CCR3 = color->G * 100 / 255;
-    htim4.Instance->CCR4 = color->B * 100 / 255;
+	htim4.Instance->CCR2 = color->R * 100 / 255;
+	htim4.Instance->CCR3 = color->G * 100 / 255;
+	htim4.Instance->CCR4 = color->B * 100 / 255;
+}
+
+void WS2812_SetColor(RGB_t *color){
+	RGB_t led0 = RGB_ScaleBrightness(color);
+	RGB_t led1 = RGB_ScaleBrightness(&ws2812_led1);
+	ws2812_update(&led0, &led1);
 }
 
 void LED_SetColor(RGB_Cycle_t *color){
@@ -196,6 +342,7 @@ void LED_Init(){
     HAL_TIM_PWM_Start(&htim4, TIM_CHANNEL_3);
     HAL_TIM_PWM_Start(&htim4, TIM_CHANNEL_4);
     RGB_SetColor(&color);
+    WS2812_SetColor(&color);
 }
 
 void LED_Task(){
@@ -239,6 +386,8 @@ void LED_Task(){
         default:
             LED_State.state = LED_RISING;
         }
+        LED_Ws2812ErrorBlinkUpdate();
         RGB_SetColor(&LED_State.color);
+        WS2812_SetColor(&LED_State.color);
     }
 }

Core/Src/serial_handler.c

@@ -3,6 +3,7 @@
 #include "board.h"
 #include "charger_control.h"
 #include "debug.h"
+#include "fire_alarm.h"
 #include "psu_control.h"
 #include "usart.h"
 #include <string.h>
@@ -86,6 +87,10 @@ 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);

Debug/Core/Src/charger_control.cyclo

@@ -1,3 +1,3 @@
-../Core/Src/charger_control.c:10:6:CONN_Init	1
-../Core/Src/charger_control.c:18:6:CONN_Loop	6
-../Core/Src/charger_control.c:39:6:CONN_SetState	16
+../Core/Src/charger_control.c:11:6:CONN_Init	1
+../Core/Src/charger_control.c:19:6:CONN_Loop	7
+../Core/Src/charger_control.c:42:6:CONN_SetState	16

Debug/Core/Src/rgb_controller.cyclo

@@ -1,6 +1,11 @@
-../Core/Src/rgb_controller.c:102:6:LED_Write	18
-../Core/Src/rgb_controller.c:164:6:interpolateColors	3
-../Core/Src/rgb_controller.c:182:6:RGB_SetColor	1
-../Core/Src/rgb_controller.c:188:6:LED_SetColor	1
-../Core/Src/rgb_controller.c:193:6:LED_Init	1
-../Core/Src/rgb_controller.c:201:6:LED_Task	10
+../Core/Src/rgb_controller.c:111:6:LED_Write	18
+../Core/Src/rgb_controller.c:173:6:interpolateColors	3
+../Core/Src/rgb_controller.c:203:13:ws2812_send_pixel	3
+../Core/Src/rgb_controller.c:222:13:ws2812_update	1
+../Core/Src/rgb_controller.c:234:14:RGB_ScaleBrightness	1
+../Core/Src/rgb_controller.c:249:13:LED_Ws2812ErrorBlinkUpdate	9
+../Core/Src/rgb_controller.c:322:6:RGB_SetColor	1
+../Core/Src/rgb_controller.c:328:6:WS2812_SetColor	1
+../Core/Src/rgb_controller.c:334:6:LED_SetColor	1
+../Core/Src/rgb_controller.c:339:6:LED_Init	1
+../Core/Src/rgb_controller.c:348:6:LED_Task	10

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:125:13:monitoring_data_callback	1
+../Core/Src/serial_handler.c:27:6:SC_CommandHandler	20
+../Core/Src/serial_handler.c:130:13:monitoring_data_callback	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/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"