6 Commits
Author SHA1 Message Date
raduetandCursor af8bbd5275 Expose charging session elapsed time in monitoring packet (v1.0.27).
CONN.ChargingTime ticks at 1 Hz during Charging; serial GET_STATUS reports elapsed min/sec instead of zero stubs.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-08 11:29:01 +02:00
raduetandCursor 96826da0e0 Add PSU diagnostic logging for setpoints and state transitions (v1.0.26).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-06 09:19:36 +02:00
raduetandCursor 49a4fd8ee1 Replace hv_mode gate with CS60 hv_limit logic for unrestricted HV setpoints (v1.0.25).
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-30 19:27:47 +02:00
raduet 86b0bfc0fc Remove FAKE_500V Everest workaround; use real setpoints on the bus (v1.0.24). 2026-06-30 18:30:07 +02:00
raduetandCursor a583e12132 Add PSU fast discharge API for DC precharge step-down (v1.0.23).
Policy/executor hooks, event-driven OFF/ON state machine, and release binaries.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-30 16:28:25 +02:00
raduetandCursor ecf8e3d2f0 Build artifacts updated.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-17 12:43:15 +02:00
20 changed files with 36866 additions and 33003 deletions
+21 -4
View File
@@ -9,7 +9,24 @@
#define PSU_NUM 1 #define PSU_NUM 1
/* Everest / стенд: запрос «500 В» на шине — реально на PSU задаются U/I ниже; статус может оставаться 500 В (serial.c). */ /* Dynamic LV clamp (CS60 hv_limit): active only on overload at low bus voltage. */
#define FAKE_EVREQ_VOLTAGE_V 500u #define PSU_LV_CLAMP_V 499u
#define FAKE_PSU_VOLTAGE_V 300u #define PSU_HV_LIMIT_ON_THRESHOLD 480u
#define FAKE_PSU_CURRENT_0P1A 10u #define PSU_HV_LIMIT_OFF_THRESHOLD 495u
#define PSU_HV_SWITCH_DELAY_MS 1000u
#define PSU_HV_LOAD_CURRENT 300u /* 30.0 A, MeasuredCurrent is 0.1 A/bit */
#define PSU_HV_LIMIT_MAX_COUNT 3u
/* Fast discharge: PSU off/on cycle on step-down setpoint (unloaded bus). */
#define PSD_ENABLE 1u
#define PSD_MAX_CMD_CURRENT_0P1A 20u /* 2.0 A */
#define PSD_MAX_MEASURED_CURRENT_0P1A 30u /* 3.0 A */
#define PSD_MEASURED_LATCH_MS 500u
#define PSD_MIN_VOLTAGE_STEP_V 50u
#define PSD_DISCHARGE_MARGIN_V 15u
#define PSD_DEBOUNCE_MS 2000u
#define PSD_MAX_PER_SESSION 4u
#define PSD_OFF_TIMEOUT_MS 10000u /* как PSU_WAIT_ACK_OFF */
#define PSD_ON_TIMEOUT_MS 10000u
#define PSD_ON_RETRY_MS 500u /* повтор SET+ON в ON_WAIT */
#define PSD_PRECHARGE_TOLERANCE_V 40u /* ~±10% for 350 V precharge window */
+5
View File
@@ -68,6 +68,10 @@ typedef struct{
uint16_t WantedCurrent; //0.1A/bit uint16_t WantedCurrent; //0.1A/bit
CONN_Error_t chargingError; // 0 if okay CONN_Error_t chargingError; // 0 if okay
uint8_t EvConnected; uint8_t EvConnected;
uint32_t ChargingTime; // seconds of active charging in current session
uint8_t hv_limit; // Limits PSU voltage to LV range when set
uint32_t hv_tick; // Timer for delayed HV limit switching
uint8_t hv_limit_count; // Anti-chatter counter for LV limit switching
} ChargingConnector_t; } ChargingConnector_t;
@@ -79,3 +83,4 @@ extern ChargingConnector_t CONN;
void CONN_Init(); void CONN_Init();
void CONN_Loop(); void CONN_Loop();
void CONN_GetElapsedForMonitoring(uint16_t *min, uint8_t *sec);
+1 -1
View File
@@ -27,7 +27,7 @@ extern "C" {
/* USER CODE BEGIN EC */ /* USER CODE BEGIN EC */
#define FW_VERSION_MAJOR 1 #define FW_VERSION_MAJOR 1
#define FW_VERSION_MINOR 0 #define FW_VERSION_MINOR 0
#define FW_VERSION_PATCH 19 #define FW_VERSION_PATCH 27
/* USER CODE END EC */ /* USER CODE END EC */
/* Exported macro ------------------------------------------------------------*/ /* Exported macro ------------------------------------------------------------*/
+21
View File
@@ -0,0 +1,21 @@
#pragma once
#include <stdint.h>
#include "power_setpoint_policy.h"
typedef enum {
PSD_TRY_IDLE = 0,
PSD_TRY_APPLIED_NORMAL,
PSD_TRY_START_FAST_DISCHARGE,
} PowerSetpointTryResult_t;
void PowerSetpoint_Init(void);
void PowerSetpoint_OnCommand(uint16_t voltage_V, uint16_t current_0p1A);
void PowerSetpoint_UpdateDeliveryLatch(void);
uint8_t PowerSetpoint_HasPending(void);
uint8_t PowerSetpoint_IsBusy(void);
PowerSetpointTryResult_t PowerSetpoint_TryApply(void);
void PowerSetpoint_GetFastDischargeTarget(PowerSetpoint_t *target);
void PowerSetpoint_OnFastDischargeComplete(void);
void PowerSetpoint_OnFastDischargeAbort(void);
+35
View File
@@ -0,0 +1,35 @@
#pragma once
#include <stdint.h>
#include "charger_config.h"
typedef struct {
uint16_t voltage_V;
uint16_t current_0p1A;
} PowerSetpoint_t;
typedef enum {
POWER_SETPOINT_NORMAL,
POWER_SETPOINT_FAST_DISCHARGE,
} PowerSetpointAction_t;
typedef struct {
uint8_t dc_contactor_closed;
uint8_t psu_hv_enabled;
uint16_t measured_voltage_V;
uint16_t measured_current_0p1A;
uint8_t power_delivery_active;
uint8_t enable_output;
uint8_t psu_state_connected;
uint8_t psu_cont_fault;
uint8_t psu_fault;
uint8_t fast_discharge_count;
uint32_t last_fast_discharge_ms;
uint32_t now_ms;
} PowerPathContext_t;
PowerSetpointAction_t PowerSetpoint_Decide(
const PowerSetpoint_t *applied,
const PowerSetpoint_t *next,
const PowerPathContext_t *ctx);
+6 -2
View File
@@ -5,6 +5,7 @@
void PSU_Init(); void PSU_Init();
void PSU_Enable(uint8_t addr, uint8_t enable); void PSU_Enable(uint8_t addr, uint8_t enable);
void PSU_SetVoltageCurrent(uint8_t addr, uint16_t voltage, uint16_t current);
void PSU_ReadWrite(void); void PSU_ReadWrite(void);
// --- Состояние силового модуля (DC30, один PSU) --- // --- Состояние силового модуля (DC30, один PSU) ---
@@ -16,6 +17,11 @@ typedef enum{
PSU_WAIT_ACK_ON, // ждём подтверждение включения модуля (напряжение выше порога) PSU_WAIT_ACK_ON, // ждём подтверждение включения модуля (напряжение выше порога)
PSU_CONT_WAIT_ACK_ON, // включаем DC-контактор и ждём подтверждение PSU_CONT_WAIT_ACK_ON, // включаем DC-контактор и ждём подтверждение
PSU_CONNECTED, // модуль включён, DC-контактор замкнут PSU_CONNECTED, // модуль включён, DC-контактор замкнут
PSU_FAST_DISCHARGE_OFF,
PSU_FAST_DISCHARGE_WAIT, /* ждём подтверждение выключения (как PSU_WAIT_ACK_OFF) */
PSU_FAST_DISCHARGE_SET, /* задать целевое U/I при выключенном модуле */
PSU_FAST_DISCHARGE_ON, /* команда включения после set */
PSU_FAST_DISCHARGE_ON_WAIT, /* ждём подтверждение включения (как PSU_WAIT_ACK_ON) */
PSU_CURRENT_DROP, // снижение тока перед отключением PSU_CURRENT_DROP, // снижение тока перед отключением
PSU_WAIT_ACK_OFF, // ждём подтверждение выключения модуля (напряжение ниже порога) PSU_WAIT_ACK_OFF, // ждём подтверждение выключения модуля (напряжение ниже порога)
PSU_CONT_WAIT_ACK_OFF, // выключаем DC-контактор и ждём подтверждение PSU_CONT_WAIT_ACK_OFF, // выключаем DC-контактор и ждём подтверждение
@@ -78,8 +84,6 @@ typedef struct {
// Дополнительные параметры для одного модуля DC30 // Дополнительные параметры для одного модуля DC30
uint32_t power_limit; // лимит мощности [кВт] uint32_t power_limit; // лимит мощности [кВт]
uint8_t hv_mode; // HV-режим (ограничение напряжения)
uint32_t hv_tick; // таймер для задержки входа в HV-режим
uint32_t tempAmbient; // температура окружающего воздуха (из PSU_04) uint32_t tempAmbient; // температура окружающего воздуха (из PSU_04)
union { uint8_t raw; PSU_Status0_t bits; } status0; // modularForm0 union { uint8_t raw; PSU_Status0_t bits; } status0; // modularForm0
+24
View File
@@ -13,10 +13,15 @@ void CONN_Init(){
CONN.connControl = CMD_NONE; CONN.connControl = CMD_NONE;
CONN.connState = Unknown; CONN.connState = Unknown;
CONN.RequestedVoltage = PSU_MIN_VOLTAGE; CONN.RequestedVoltage = PSU_MIN_VOLTAGE;
CONN.ChargingTime = 0;
CONN.hv_limit = 0u;
CONN.hv_tick = 0u;
CONN.hv_limit_count = 0u;
} }
void CONN_Loop(){ void CONN_Loop(){
static uint32_t charging_time_tick = 0;
static CONN_State_t last_connState = Unknown; static CONN_State_t last_connState = Unknown;
if(last_connState != CONN.connState){ if(last_connState != CONN.connState){
last_connState = CONN.connState; last_connState = CONN.connState;
@@ -37,6 +42,25 @@ void CONN_Loop(){
log_printf(LOG_WARN, "CONN0 Error: %d\n", (int)CONN.chargingError); log_printf(LOG_WARN, "CONN0 Error: %d\n", (int)CONN.chargingError);
} }
if (HAL_GetTick() - charging_time_tick >= 1000U) {
charging_time_tick += 1000U;
if (CONN.connState == Charging) {
CONN.ChargingTime++;
}
if (CONN.connState == Unplugged) {
CONN.ChargingTime = 0;
}
}
}
void CONN_GetElapsedForMonitoring(uint16_t *min, uint8_t *sec) {
uint32_t elapsed_sec = CONN.ChargingTime;
if (min != NULL) {
*min = (uint16_t)(elapsed_sec / 60U);
}
if (sec != NULL) {
*sec = (uint8_t)(elapsed_sec % 60U);
}
} }
void CONN_SetState(CONN_State_t state){ void CONN_SetState(CONN_State_t state){
+196
View File
@@ -0,0 +1,196 @@
#include "power_setpoint_executor.h"
#include "charger_config.h"
#include "charger_control.h"
#include "debug.h"
#include "psu_control.h"
#include "serial.h"
static PowerSetpoint_t applied;
static PowerSetpoint_t pending;
static PowerSetpoint_t fd_target;
static uint8_t setpoint_dirty;
static uint8_t fd_active;
static uint8_t power_delivery_latched;
static uint8_t fast_discharge_count;
static uint32_t last_fast_discharge_ms;
static uint32_t measured_high_current_since_ms;
static uint8_t session_ended_state(CONN_State_t state)
{
return (state == Unknown) || (state == Unplugged) || (state == Finished) ||
(state == FinishedEV) || (state == FinishedEVSE);
}
void PowerSetpoint_Init(void)
{
applied.voltage_V = PSU_MIN_VOLTAGE;
applied.current_0p1A = 0u;
pending = applied;
fd_target = applied;
setpoint_dirty = 0u;
fd_active = 0u;
power_delivery_latched = 0u;
fast_discharge_count = 0u;
last_fast_discharge_ms = 0u;
measured_high_current_since_ms = 0u;
}
void PowerSetpoint_OnCommand(uint16_t voltage_V, uint16_t current_0p1A)
{
#if PSD_ENABLE
pending.voltage_V = voltage_V;
pending.current_0p1A = current_0p1A;
setpoint_dirty = 1u;
#else
(void)voltage_V;
(void)current_0p1A;
#endif
}
void PowerSetpoint_UpdateDeliveryLatch(void)
{
#if PSD_ENABLE
uint32_t now = HAL_GetTick();
if (!CONN.EnableOutput || !CONN.EvConnected || session_ended_state(CCS_EvseState)) {
power_delivery_latched = 0u;
fast_discharge_count = 0u;
last_fast_discharge_ms = 0u;
measured_high_current_since_ms = 0u;
return;
}
if (CONN.WantedCurrent > PSD_MAX_CMD_CURRENT_0P1A) {
power_delivery_latched = 1u;
}
if (CCS_EvseState == Charging) {
power_delivery_latched = 1u;
}
if (CONN.MeasuredCurrent >= PSD_MAX_MEASURED_CURRENT_0P1A) {
if (measured_high_current_since_ms == 0u) {
measured_high_current_since_ms = now;
} else if ((now - measured_high_current_since_ms) >= PSD_MEASURED_LATCH_MS) {
power_delivery_latched = 1u;
}
} else {
measured_high_current_since_ms = 0u;
}
#endif
}
uint8_t PowerSetpoint_HasPending(void)
{
#if PSD_ENABLE
return setpoint_dirty;
#else
return 0u;
#endif
}
uint8_t PowerSetpoint_IsBusy(void)
{
#if PSD_ENABLE
if (!fd_active) {
return 0u;
}
switch (PSU0.state) {
case PSU_FAST_DISCHARGE_OFF:
case PSU_FAST_DISCHARGE_WAIT:
case PSU_FAST_DISCHARGE_SET:
case PSU_FAST_DISCHARGE_ON:
case PSU_FAST_DISCHARGE_ON_WAIT:
return 1u;
default:
return 0u;
}
#else
return 0u;
#endif
}
static PowerPathContext_t build_context(void)
{
PowerPathContext_t ctx;
ctx.dc_contactor_closed = PSU0.CONT_enabled;
ctx.psu_hv_enabled = PSU0.PSU_enabled;
ctx.measured_voltage_V = CONN.MeasuredVoltage;
ctx.measured_current_0p1A = (uint16_t)CONN.MeasuredCurrent;
ctx.power_delivery_active = power_delivery_latched;
ctx.enable_output = CONN.EnableOutput;
ctx.psu_state_connected = (PSU0.state == PSU_CONNECTED) ? 1u : 0u;
ctx.psu_cont_fault = PSU0.cont_fault;
ctx.psu_fault = PSU0.psu_fault;
ctx.fast_discharge_count = fast_discharge_count;
ctx.last_fast_discharge_ms = last_fast_discharge_ms;
ctx.now_ms = HAL_GetTick();
return ctx;
}
PowerSetpointTryResult_t PowerSetpoint_TryApply(void)
{
#if PSD_ENABLE
PowerPathContext_t ctx;
PowerSetpointAction_t action;
if (!setpoint_dirty || fd_active) {
return PSD_TRY_IDLE;
}
ctx = build_context();
action = PowerSetpoint_Decide(&applied, &pending, &ctx);
if (action == POWER_SETPOINT_FAST_DISCHARGE) {
fd_target = pending;
fd_active = 1u;
setpoint_dirty = 0u;
log_printf(LOG_INFO, "Fast discharge trigger %u->%u I=%u\n",
(unsigned)applied.voltage_V,
(unsigned)fd_target.voltage_V,
(unsigned)fd_target.current_0p1A);
return PSD_TRY_START_FAST_DISCHARGE;
}
if (!PSU0.ready) {
return PSD_TRY_IDLE;
}
PSU_SetVoltageCurrent(0, pending.voltage_V, pending.current_0p1A);
applied = pending;
setpoint_dirty = 0u;
return PSD_TRY_APPLIED_NORMAL;
#else
return PSD_TRY_IDLE;
#endif
}
void PowerSetpoint_GetFastDischargeTarget(PowerSetpoint_t *target)
{
if (target != 0) {
*target = fd_target;
}
}
void PowerSetpoint_OnFastDischargeComplete(void)
{
#if PSD_ENABLE
applied = fd_target;
fd_active = 0u;
fast_discharge_count++;
last_fast_discharge_ms = HAL_GetTick();
log_printf(LOG_INFO, "Fast discharge complete, V=%u\n", (unsigned)CONN.MeasuredVoltage);
#endif
}
void PowerSetpoint_OnFastDischargeAbort(void)
{
#if PSD_ENABLE
fd_active = 0u;
pending = fd_target;
setpoint_dirty = 1u;
log_printf(LOG_WARN, "Fast discharge aborted, V=%u\n", (unsigned)CONN.MeasuredVoltage);
#endif
}
+77
View File
@@ -0,0 +1,77 @@
#include "power_setpoint_policy.h"
PowerSetpointAction_t PowerSetpoint_Decide(
const PowerSetpoint_t *applied,
const PowerSetpoint_t *next,
const PowerPathContext_t *ctx)
{
#if !PSD_ENABLE
(void)applied;
(void)next;
(void)ctx;
return POWER_SETPOINT_NORMAL;
#else
uint16_t delta_v;
if (applied == 0 || next == 0 || ctx == 0) {
return POWER_SETPOINT_NORMAL;
}
if (next->voltage_V >= applied->voltage_V) {
return POWER_SETPOINT_NORMAL;
}
delta_v = (uint16_t)(applied->voltage_V - next->voltage_V);
if (delta_v < PSD_MIN_VOLTAGE_STEP_V) {
return POWER_SETPOINT_NORMAL;
}
if (applied->current_0p1A > PSD_MAX_CMD_CURRENT_0P1A ||
next->current_0p1A > PSD_MAX_CMD_CURRENT_0P1A) {
return POWER_SETPOINT_NORMAL;
}
if (ctx->measured_current_0p1A >= PSD_MAX_MEASURED_CURRENT_0P1A) {
return POWER_SETPOINT_NORMAL;
}
if (ctx->measured_voltage_V <= (uint16_t)(next->voltage_V + PSD_DISCHARGE_MARGIN_V)) {
return POWER_SETPOINT_NORMAL;
}
if (ctx->power_delivery_active) {
return POWER_SETPOINT_NORMAL;
}
if (!ctx->enable_output) {
return POWER_SETPOINT_NORMAL;
}
if (!ctx->psu_state_connected) {
return POWER_SETPOINT_NORMAL;
}
if (!ctx->dc_contactor_closed) {
return POWER_SETPOINT_NORMAL;
}
if (!ctx->psu_hv_enabled) {
return POWER_SETPOINT_NORMAL;
}
if (ctx->psu_cont_fault || ctx->psu_fault) {
return POWER_SETPOINT_NORMAL;
}
if (ctx->fast_discharge_count >= PSD_MAX_PER_SESSION) {
return POWER_SETPOINT_NORMAL;
}
if (ctx->last_fast_discharge_ms != 0u &&
(ctx->now_ms - ctx->last_fast_discharge_ms) < PSD_DEBOUNCE_MS) {
return POWER_SETPOINT_NORMAL;
}
return POWER_SETPOINT_FAST_DISCHARGE;
#endif
}
+306 -22
View File
@@ -6,6 +6,7 @@
#include "charger_control.h" #include "charger_control.h"
#include "debug.h" #include "debug.h"
#include "isr_opt.h" #include "isr_opt.h"
#include "power_setpoint_executor.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -25,14 +26,165 @@ PSU_t PSU0;
#define PSU_VOLTAGE_THRESHOLD 20 // Порог напряжения для определения состояния (В) #define PSU_VOLTAGE_THRESHOLD 20 // Порог напряжения для определения состояния (В)
#define PSU_ONLINE_TIMEOUT 500 // Таймаут для определения состояния (мс) #define PSU_ONLINE_TIMEOUT 500 // Таймаут для определения состояния (мс)
#define PSU_STARTUP_DELAY 4000 // Задержка 2 секунды перед включением #define PSU_STARTUP_DELAY 4000 // Задержка 2 секунды перед включением
#define PSU_DIAG_LOG_MS 2000u
uint32_t can_lastpacket; uint32_t can_lastpacket;
extern CAN_HandleTypeDef hcan2; extern CAN_HandleTypeDef hcan2;
static uint16_t psu_last_can_v;
static uint16_t psu_last_can_i_0p1A;
static void PSU_SendCmd(uint8_t source, uint8_t destination, uint8_t cmd, void *data); static void PSU_SendCmd(uint8_t source, uint8_t destination, uint8_t cmd, void *data);
static const char *PSU_StateName(PSU_State_t state)
{
switch (state) {
case PSU_UNREADY: return "UNREADY";
case PSU_INITIALIZING: return "INIT";
case PSU_READY: return "READY";
case PSU_WAIT_ACK_ON: return "WAIT_ON";
case PSU_CONT_WAIT_ACK_ON: return "CONT_ON";
case PSU_CONNECTED: return "CONNECTED";
case PSU_FAST_DISCHARGE_OFF: return "FD_OFF";
case PSU_FAST_DISCHARGE_WAIT: return "FD_WAIT";
case PSU_FAST_DISCHARGE_SET: return "FD_SET";
case PSU_FAST_DISCHARGE_ON: return "FD_ON";
case PSU_FAST_DISCHARGE_ON_WAIT: return "FD_ON_WAIT";
case PSU_CURRENT_DROP: return "CUR_DROP";
case PSU_CONT_WAIT_ACK_OFF: return "CONT_OFF";
case PSU_WAIT_ACK_OFF: return "WAIT_OFF";
case PSU_OFF_PAUSE: return "OFF_PAUSE";
default: return "?";
}
}
static void PSU_LogPeriodicDiag(void)
{
static uint32_t last_log_ms;
uint32_t now = HAL_GetTick();
uint8_t block_setpoint;
if ((now - last_log_ms) < PSU_DIAG_LOG_MS) {
return;
}
last_log_ms = now;
#if PSD_ENABLE
block_setpoint = PowerSetpoint_HasPending() || PowerSetpoint_IsBusy();
#else
block_setpoint = 0u;
#endif
log_printf(LOG_INFO,
"PSU diag st=%s req=%uV/%u.%uA want=%uV/%u.%uA "
"can=%uV/%u.%uA meas=%uV/%d.%uA "
"enOut=%u out=%u rdy=%u on=%u cont=%u ac=%u hv=%u psd_blk=%u "
"err=%u s0=0x%02x s1=0x%02x s2=0x%02x can_age=%lums\n",
PSU_StateName(PSU0.state),
(unsigned)CONN.RequestedVoltage,
(unsigned)(CONN.RequestedCurrent / 10u),
(unsigned)(CONN.RequestedCurrent % 10u),
(unsigned)CONN.RequestedVoltage,
(unsigned)(CONN.WantedCurrent / 10u),
(unsigned)(CONN.WantedCurrent % 10u),
(unsigned)psu_last_can_v,
(unsigned)(psu_last_can_i_0p1A / 10u),
(unsigned)(psu_last_can_i_0p1A % 10u),
(unsigned)CONN.MeasuredVoltage,
(int)(CONN.MeasuredCurrent / 10),
(unsigned)(((CONN.MeasuredCurrent < 0) ?
-CONN.MeasuredCurrent : CONN.MeasuredCurrent) % 10),
(unsigned)CONN.EnableOutput,
(unsigned)CONN.outputEnabled,
(unsigned)PSU0.ready,
(unsigned)PSU0.PSU_enabled,
(unsigned)PSU0.CONT_enabled,
(unsigned)PSU0.enableAC,
(unsigned)CONN.hv_limit,
(unsigned)block_setpoint,
(unsigned)CONN.chargingError,
(unsigned)PSU0.status0.raw,
(unsigned)PSU0.status1.raw,
(unsigned)PSU0.status2.raw,
(unsigned long)(can_lastpacket ? (now - can_lastpacket) : 9999u));
}
static void PSU_HvControl(void)
{
if (CONN.EnableOutput == 0u) {
if ((CONN.hv_limit != 0u) || (CONN.hv_limit_count != 0u)) {
log_printf(LOG_INFO, "HV limit reset output off\n");
}
CONN.hv_limit = 0u;
CONN.hv_tick = 0u;
CONN.hv_limit_count = 0u;
return;
}
if (!PSU0.online) {
if ((CONN.hv_limit != 0u) || (CONN.hv_limit_count != 0u)) {
log_printf(LOG_INFO, "HV limit reset no PSU\n");
}
CONN.hv_limit = 0u;
CONN.hv_tick = 0u;
CONN.hv_limit_count = 0u;
return;
}
if (CONN.hv_limit == 0u) {
if ((CONN.hv_limit_count < PSU_HV_LIMIT_MAX_COUNT) &&
(CONN.MeasuredVoltage < PSU_HV_LIMIT_ON_THRESHOLD) &&
(CONN.MeasuredCurrent > PSU_HV_LOAD_CURRENT)) {
if (CONN.hv_tick == 0u) {
CONN.hv_tick = HAL_GetTick();
} else if ((HAL_GetTick() - CONN.hv_tick) >= PSU_HV_SWITCH_DELAY_MS) {
CONN.hv_limit = 1u;
CONN.hv_limit_count++;
CONN.hv_tick = 0u;
log_printf(LOG_WARN, "HV limit ON V=%d I=%d cnt=%d\n",
(int)CONN.MeasuredVoltage,
(int)CONN.MeasuredCurrent,
(int)CONN.hv_limit_count);
if (CONN.hv_limit_count >= PSU_HV_LIMIT_MAX_COUNT) {
log_printf(LOG_WARN, "HV limit locked cnt=%d\n",
(int)CONN.hv_limit_count);
}
}
} else {
CONN.hv_tick = 0u;
}
} else {
if ((CONN.MeasuredVoltage > PSU_HV_LIMIT_OFF_THRESHOLD) ||
(CONN.MeasuredCurrent <= PSU_HV_LOAD_CURRENT)) {
if (CONN.hv_tick == 0u) {
CONN.hv_tick = HAL_GetTick();
} else if ((HAL_GetTick() - CONN.hv_tick) >= PSU_HV_SWITCH_DELAY_MS) {
CONN.hv_limit = 0u;
CONN.hv_tick = 0u;
log_printf(LOG_INFO, "HV limit OFF V=%d I=%d cnt=%d\n",
(int)CONN.MeasuredVoltage,
(int)CONN.MeasuredCurrent,
(int)CONN.hv_limit_count);
}
} else {
CONN.hv_tick = 0u;
}
}
}
static void PSU_SwitchState(PSU_State_t state){ static void PSU_SwitchState(PSU_State_t state){
if (PSU0.state != state) {
log_printf(LOG_INFO,
"PSU st %s->%s enOut=%u rdy=%u on=%u cont=%u err=%u\n",
PSU_StateName(PSU0.state),
PSU_StateName(state),
(unsigned)CONN.EnableOutput,
(unsigned)PSU0.ready,
(unsigned)PSU0.PSU_enabled,
(unsigned)PSU0.CONT_enabled,
(unsigned)CONN.chargingError);
}
PSU0.state = state; PSU0.state = state;
PSU0.statetick = HAL_GetTick(); PSU0.statetick = HAL_GetTick();
} }
@@ -41,6 +193,24 @@ static uint32_t PSU_StateTime(void){
return HAL_GetTick() - PSU0.statetick; return HAL_GetTick() - PSU0.statetick;
} }
static void PSU_FastDischarge_PushTarget(void)
{
PowerSetpoint_t fd_sp;
PowerSetpoint_GetFastDischargeTarget(&fd_sp);
PSU_SetVoltageCurrent(0, fd_sp.voltage_V, fd_sp.current_0p1A);
PSU_Enable(0, 1);
}
static void PSU_FastDischarge_AbortToConnected(void)
{
PowerSetpoint_OnFastDischargeAbort();
if (!PSU0.PSU_enabled) {
PSU_FastDischarge_PushTarget();
}
PSU_SwitchState(PSU_CONNECTED);
}
ISR_FAST void HAL_CAN_RxFifo1MsgPendingCallback(CAN_HandleTypeDef *hcan){ ISR_FAST void HAL_CAN_RxFifo1MsgPendingCallback(CAN_HandleTypeDef *hcan){
static CAN_RxHeaderTypeDef RxHeader; static CAN_RxHeaderTypeDef RxHeader;
@@ -150,10 +320,9 @@ void PSU_Init(){
PSU0.statetick = HAL_GetTick(); PSU0.statetick = HAL_GetTick();
PSU0.power_limit = PSU_MAX_POWER; // kW PSU0.power_limit = PSU_MAX_POWER; // kW
PSU0.hv_mode = 0;
PSU0.hv_tick = 0;
PSU_Enable(0, 0); PSU_Enable(0, 0);
PowerSetpoint_Init();
} }
void PSU_Enable(uint8_t addr, uint8_t enable){ void PSU_Enable(uint8_t addr, uint8_t enable){
@@ -183,7 +352,9 @@ void PSU_SetVoltageCurrent(uint8_t addr, uint16_t voltage, uint16_t current){
if(voltage<PSU_MIN_VOLTAGE) voltage = PSU_MIN_VOLTAGE; if(voltage<PSU_MIN_VOLTAGE) voltage = PSU_MIN_VOLTAGE;
if((PSU0.hv_mode==0) && voltage>499) voltage = 499; if((CONN.hv_limit != 0u) && (voltage > PSU_LV_CLAMP_V)){
voltage = PSU_LV_CLAMP_V;
}
uint32_t current_ma = current * 100; uint32_t current_ma = current * 100;
uint32_t voltage_mv = voltage * 1000; uint32_t voltage_mv = voltage * 1000;
@@ -198,6 +369,8 @@ void PSU_SetVoltageCurrent(uint8_t addr, uint16_t voltage, uint16_t current){
data.moduleVoltage[2] = (voltage_mv >> 8) & 0xFF; data.moduleVoltage[2] = (voltage_mv >> 8) & 0xFF;
data.moduleVoltage[3] = (voltage_mv >> 0) & 0xFF; data.moduleVoltage[3] = (voltage_mv >> 0) & 0xFF;
psu_last_can_v = voltage;
psu_last_can_i_0p1A = current;
PSU_SendCmd(0xF0, addr, 0x1C, &data); PSU_SendCmd(0xF0, addr, 0x1C, &data);
} }
@@ -258,35 +431,50 @@ void PSU_ReadWrite(){
} }
CONN.RequestedPower = CONN.RequestedCurrent * CONN.RequestedVoltage / 10; CONN.RequestedPower = CONN.RequestedCurrent * CONN.RequestedVoltage / 10;
if(PSU0.ready){ #if PSD_ENABLE
if (CONN.RequestedVoltage == FAKE_EVREQ_VOLTAGE_V) { {
PSU_SetVoltageCurrent(0, (uint16_t)FAKE_PSU_VOLTAGE_V, (uint16_t)FAKE_PSU_CURRENT_0P1A); uint8_t block_setpoint = PowerSetpoint_HasPending() || PowerSetpoint_IsBusy();
}else{
PSU_SetVoltageCurrent(0, CONN.RequestedVoltage, CONN.RequestedCurrent); // Normal mode if (PSU0.ready && !block_setpoint) {
} PSU_SetVoltageCurrent(0, CONN.RequestedVoltage, CONN.RequestedCurrent);
ED_Delay(CAN_DELAY); ED_Delay(CAN_DELAY);
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;
} }
} }
#else
if (PSU0.ready) {
PSU_SetVoltageCurrent(0, CONN.RequestedVoltage, CONN.RequestedCurrent); // Normal mode
ED_Delay(CAN_DELAY);
}
#endif
// PSU_SetHVMode(0, PSU0.hv_mode); // auto set, no need if (PSU0.ready) {
// ED_Delay(CAN_DELAY); PSU_HvControl();
}
} }
void PSU_Task(void){ void PSU_Task(void){
static uint32_t psu_on_tick = 0; static uint32_t psu_on_tick = 0;
static uint32_t cont_ok_tick = 0; static uint32_t cont_ok_tick = 0;
static uint32_t fd_on_last_cmd_ms = 0;
PowerSetpointTryResult_t psd_result;
#if PSD_ENABLE
PowerSetpoint_UpdateDeliveryLatch();
if (PowerSetpoint_HasPending()) {
psd_result = PowerSetpoint_TryApply();
if (psd_result == PSD_TRY_START_FAST_DISCHARGE) {
PSU_SwitchState(PSU_FAST_DISCHARGE_OFF);
}
}
#endif
// Обновляем ONLINE/READY по таймауту // Обновляем ONLINE/READY по таймауту
if((HAL_GetTick() - can_lastpacket) > PSU_ONLINE_TIMEOUT){ if((HAL_GetTick() - can_lastpacket) > PSU_ONLINE_TIMEOUT){
if (PSU0.online) {
log_printf(LOG_WARN, "PSU CAN timeout age=%lums -> offline\n",
(unsigned long)(HAL_GetTick() - can_lastpacket));
}
PSU0.online = 0; PSU0.online = 0;
PSU0.PSU_enabled = 0; PSU0.PSU_enabled = 0;
PSU_04.moduleTemperature = 0; PSU_04.moduleTemperature = 0;
@@ -345,8 +533,9 @@ void PSU_Task(void){
case PSU_READY: case PSU_READY:
// модуль готов, но выключен // модуль готов, но выключен
PSU0.hv_mode = 0; CONN.hv_limit = 0u;
PSU0.hv_tick = 0; CONN.hv_tick = 0u;
CONN.hv_limit_count = 0u;
RELAY_Write(RELAY_DC, 0); RELAY_Write(RELAY_DC, 0);
if(!PSU0.ready){ if(!PSU0.ready){
@@ -403,6 +592,99 @@ void PSU_Task(void){
} }
break; break;
case PSU_FAST_DISCHARGE_OFF:
if (!CONN.EnableOutput || !PSU0.ready || PSU0.cont_fault || PSU0.psu_fault) {
log_printf(LOG_WARN, "Fast discharge abort -> stop\n");
PowerSetpoint_OnFastDischargeAbort();
PSU_SwitchState(PSU_CURRENT_DROP);
break;
}
PSU_Enable(0, 0);
PSU_SwitchState(PSU_FAST_DISCHARGE_WAIT);
break;
case PSU_FAST_DISCHARGE_WAIT: {
PowerSetpoint_t fd_sp;
if (!CONN.EnableOutput || !PSU0.ready || PSU0.cont_fault || PSU0.psu_fault) {
log_printf(LOG_WARN, "Fast discharge abort -> stop\n");
PowerSetpoint_OnFastDischargeAbort();
PSU_SwitchState(PSU_CURRENT_DROP);
break;
}
/* Как PSU_WAIT_ACK_OFF: 020 V на телеметрии = модуль выключен */
if (!PSU0.PSU_enabled) {
PowerSetpoint_GetFastDischargeTarget(&fd_sp);
log_printf(LOG_INFO, "Fast discharge off ack, V=%u -> set %u\n",
(unsigned)CONN.MeasuredVoltage, (unsigned)fd_sp.voltage_V);
PSU_SwitchState(PSU_FAST_DISCHARGE_SET);
} else if (PSU_StateTime() > PSD_OFF_TIMEOUT_MS) {
log_printf(LOG_WARN, "Fast discharge off timeout, V=%u\n",
(unsigned)CONN.MeasuredVoltage);
PSU_FastDischarge_AbortToConnected();
}
break;
}
case PSU_FAST_DISCHARGE_SET: {
PowerSetpoint_t fd_sp;
if (!CONN.EnableOutput || !PSU0.ready || PSU0.cont_fault || PSU0.psu_fault) {
log_printf(LOG_WARN, "Fast discharge abort -> stop\n");
PowerSetpoint_OnFastDischargeAbort();
PSU_SwitchState(PSU_CURRENT_DROP);
break;
}
PowerSetpoint_GetFastDischargeTarget(&fd_sp);
PSU_SetVoltageCurrent(0, fd_sp.voltage_V, fd_sp.current_0p1A);
PSU_SwitchState(PSU_FAST_DISCHARGE_ON);
break;
}
case PSU_FAST_DISCHARGE_ON:
if (!CONN.EnableOutput || !PSU0.ready || PSU0.cont_fault || PSU0.psu_fault) {
log_printf(LOG_WARN, "Fast discharge abort -> stop\n");
PowerSetpoint_OnFastDischargeAbort();
PSU_SwitchState(PSU_CURRENT_DROP);
break;
}
PSU_Enable(0, 1);
fd_on_last_cmd_ms = HAL_GetTick();
PSU_SwitchState(PSU_FAST_DISCHARGE_ON_WAIT);
break;
case PSU_FAST_DISCHARGE_ON_WAIT: {
PowerSetpoint_t fd_sp;
uint16_t v_low;
if (!CONN.EnableOutput || !PSU0.ready || PSU0.cont_fault || PSU0.psu_fault) {
log_printf(LOG_WARN, "Fast discharge abort -> stop\n");
PowerSetpoint_OnFastDischargeAbort();
PSU_SwitchState(PSU_CURRENT_DROP);
break;
}
PowerSetpoint_GetFastDischargeTarget(&fd_sp);
v_low = (fd_sp.voltage_V > PSD_PRECHARGE_TOLERANCE_V) ?
(uint16_t)(fd_sp.voltage_V - PSD_PRECHARGE_TOLERANCE_V) : 0u;
if (PSU0.PSU_enabled && CONN.MeasuredVoltage >= v_low) {
PowerSetpoint_OnFastDischargeComplete();
PSU_SwitchState(PSU_CONNECTED);
} else {
if ((HAL_GetTick() - fd_on_last_cmd_ms) >= PSD_ON_RETRY_MS) {
PSU_FastDischarge_PushTarget();
fd_on_last_cmd_ms = HAL_GetTick();
}
if (PSU_StateTime() > PSD_ON_TIMEOUT_MS) {
log_printf(LOG_WARN, "Fast discharge on timeout, V=%u (target %u)\n",
(unsigned)CONN.MeasuredVoltage, (unsigned)fd_sp.voltage_V);
PSU_FastDischarge_AbortToConnected();
}
}
break;
}
case PSU_CURRENT_DROP: case PSU_CURRENT_DROP:
// снижаем ток до нуля перед отключением DC // снижаем ток до нуля перед отключением DC
CONN.RequestedCurrent = 0; CONN.RequestedCurrent = 0;
@@ -449,6 +731,8 @@ void PSU_Task(void){
PSU_SwitchState(PSU_UNREADY); PSU_SwitchState(PSU_UNREADY);
break; break;
} }
PSU_LogPeriodicDiag();
} }
+36 -26
View File
@@ -7,6 +7,7 @@
#include "debug.h" #include "debug.h"
#include "isr_opt.h" #include "isr_opt.h"
#include "psu_control.h" #include "psu_control.h"
#include "power_setpoint_executor.h"
#include "serial_control.h" #include "serial_control.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@@ -46,7 +47,6 @@ static uint8_t enabled = 0;
static uint8_t pwm_duty_percent = 100; static uint8_t pwm_duty_percent = 100;
uint8_t isolation_enable = 0; uint8_t isolation_enable = 0;
static uint32_t last_host_seen = 0; static uint32_t last_host_seen = 0;
static uint8_t fake_500_voltage_mode = 0;
static uint8_t everest_timed_out = 0; static uint8_t everest_timed_out = 0;
static uint8_t everest_timeout_warn_latched = 0; static uint8_t everest_timeout_warn_latched = 0;
static uint8_t everest_timeout_stop_latched = 0; static uint8_t everest_timeout_stop_latched = 0;
@@ -330,22 +330,41 @@ void CCS_SerialLoop(void) {
} }
// 10s timeout: enforce safe-state until host communication recovers. // 10s timeout: enforce safe-state until host communication recovers.
if (host_timeout_stop) { {
CONN.EnableOutput = 0; static uint8_t prev_enable_output = 0xFFu;
CCS_EvseState = Unknown; uint8_t new_enable_output;
CP_SetDuty(100);
if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) { if (host_timeout_stop) {
CCS_ConnectorState = CCS_DISABLED;
}
} else {
if (last_cmd == CMD_STOP) {
CONN.EnableOutput = 0; CONN.EnableOutput = 0;
} else { CCS_EvseState = Unknown;
CONN.EnableOutput = ev_enable_output ? 1 : 0; CP_SetDuty(100);
if((CONN.EnableOutput == 0) && (CONN.connState == Preparing)){ if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) {
CONN.EnableOutput = 0; CCS_ConnectorState = CCS_DISABLED;
} }
new_enable_output = 0u;
} else {
if (last_cmd == CMD_STOP) {
CONN.EnableOutput = 0;
} else {
CONN.EnableOutput = ev_enable_output ? 1 : 0;
if((CONN.EnableOutput == 0) && (CONN.connState == Preparing)){
CONN.EnableOutput = 0;
}
}
new_enable_output = CONN.EnableOutput;
} }
if (prev_enable_output != 0xFFu && prev_enable_output != new_enable_output) {
log_printf(LOG_INFO,
"EnableOutput %u->%u ev=%u stop=%u host_to=%u err=%u\n",
(unsigned)prev_enable_output,
(unsigned)new_enable_output,
(unsigned)ev_enable_output,
(unsigned)(last_cmd == CMD_STOP),
(unsigned)host_timeout_stop,
(unsigned)CONN.chargingError);
}
prev_enable_output = new_enable_output;
} }
if ((cp_state_buffer == EV_STATE_B_CONN_PREP) || if ((cp_state_buffer == EV_STATE_B_CONN_PREP) ||
@@ -453,9 +472,6 @@ static void send_state(void) {
CCS_State.DutyCycle = CP_GetDuty(); CCS_State.DutyCycle = CP_GetDuty();
CCS_State.OutputEnabled = PSU0.CONT_enabled; CCS_State.OutputEnabled = PSU0.CONT_enabled;
CCS_State.MeasuredVoltage = (uint16_t)CONN.MeasuredVoltage; CCS_State.MeasuredVoltage = (uint16_t)CONN.MeasuredVoltage;
if (fake_500_voltage_mode) {
CCS_State.MeasuredVoltage = FAKE_EVREQ_VOLTAGE_V;
}
CCS_State.MeasuredCurrent = (uint16_t)CONN.MeasuredCurrent; CCS_State.MeasuredCurrent = (uint16_t)CONN.MeasuredCurrent;
CCS_State.Power = CCS_Power; CCS_State.Power = CCS_Power;
CCS_State.Energy = CCS_Energy; CCS_State.Energy = CCS_Energy;
@@ -533,15 +549,9 @@ ISR_FAST static void apply_command(uint8_t cmd, const uint8_t* payload, uint16_t
} }
case CMD_E2M_SET_OUTPUT_VOLTAGE: { case CMD_E2M_SET_OUTPUT_VOLTAGE: {
const e2m_set_output_t* p = (const e2m_set_output_t*)payload; const e2m_set_output_t* p = (const e2m_set_output_t*)payload;
if (p->voltage_V == FAKE_EVREQ_VOLTAGE_V) { CONN.RequestedVoltage = p->voltage_V;
fake_500_voltage_mode = 1u; CONN.WantedCurrent = p->current_0p1A;
CONN.RequestedVoltage = FAKE_PSU_VOLTAGE_V; PowerSetpoint_OnCommand(p->voltage_V, p->current_0p1A);
CONN.WantedCurrent = FAKE_PSU_CURRENT_0P1A;
} else {
fake_500_voltage_mode = 0u;
CONN.RequestedVoltage = p->voltage_V;
CONN.WantedCurrent = p->current_0p1A;
}
break; break;
} }
case CMD_E2M_ISOLATION_CONTROL: { case CMD_E2M_ISOLATION_CONTROL: {
+3 -2
View File
@@ -139,8 +139,9 @@ static void monitoring_data_callback(void) {
statusPacket.outputEnabled = CONN.outputEnabled; statusPacket.outputEnabled = CONN.outputEnabled;
statusPacket.chargingError = CONN.chargingError; statusPacket.chargingError = CONN.chargingError;
statusPacket.connState = CONN.connState; statusPacket.connState = CONN.connState;
statusPacket.chargingElapsedTimeMin = 0; CONN_GetElapsedForMonitoring(
statusPacket.chargingElapsedTimeSec = 0; &statusPacket.chargingElapsedTimeMin,
&statusPacket.chargingElapsedTimeSec);
statusPacket.estimatedRemainingChargingTime = 0; statusPacket.estimatedRemainingChargingTime = 0;
// состояние зарядной станции // состояние зарядной станции
Binary file not shown.
Binary file not shown.
+4037 -3747
View File
File diff suppressed because it is too large Load Diff
+25604 -23374
View File
File diff suppressed because it is too large Load Diff
+2447 -2075
View File
File diff suppressed because it is too large Load Diff
+4037 -3747
View File
File diff suppressed because it is too large Load Diff
+3 -2
View File
@@ -1,3 +1,4 @@
../Core/Src/charger_control.c:11:6:CONN_Init 1 ../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:23:6:CONN_Loop 10
../Core/Src/charger_control.c:42:6:CONN_SetState 16 ../Core/Src/charger_control.c:56:6:CONN_GetElapsedForMonitoring 3
../Core/Src/charger_control.c:66:6:CONN_SetState 16
+7 -1
View File
@@ -17,6 +17,8 @@ C_SRCS += \
../Core/Src/gpio.c \ ../Core/Src/gpio.c \
../Core/Src/main.c \ ../Core/Src/main.c \
../Core/Src/meter.c \ ../Core/Src/meter.c \
../Core/Src/power_setpoint_executor.c \
../Core/Src/power_setpoint_policy.c \
../Core/Src/psu_control.c \ ../Core/Src/psu_control.c \
../Core/Src/rgb_controller.c \ ../Core/Src/rgb_controller.c \
../Core/Src/rtc.c \ ../Core/Src/rtc.c \
@@ -46,6 +48,8 @@ C_DEPS += \
./Core/Src/gpio.d \ ./Core/Src/gpio.d \
./Core/Src/main.d \ ./Core/Src/main.d \
./Core/Src/meter.d \ ./Core/Src/meter.d \
./Core/Src/power_setpoint_executor.d \
./Core/Src/power_setpoint_policy.d \
./Core/Src/psu_control.d \ ./Core/Src/psu_control.d \
./Core/Src/rgb_controller.d \ ./Core/Src/rgb_controller.d \
./Core/Src/rtc.d \ ./Core/Src/rtc.d \
@@ -75,6 +79,8 @@ OBJS += \
./Core/Src/gpio.o \ ./Core/Src/gpio.o \
./Core/Src/main.o \ ./Core/Src/main.o \
./Core/Src/meter.o \ ./Core/Src/meter.o \
./Core/Src/power_setpoint_executor.o \
./Core/Src/power_setpoint_policy.o \
./Core/Src/psu_control.o \ ./Core/Src/psu_control.o \
./Core/Src/rgb_controller.o \ ./Core/Src/rgb_controller.o \
./Core/Src/rtc.o \ ./Core/Src/rtc.o \
@@ -99,7 +105,7 @@ Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
clean: clean-Core-2f-Src clean: clean-Core-2f-Src
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/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 -$(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/power_setpoint_executor.cyclo ./Core/Src/power_setpoint_executor.d ./Core/Src/power_setpoint_executor.o ./Core/Src/power_setpoint_executor.su ./Core/Src/power_setpoint_policy.cyclo ./Core/Src/power_setpoint_policy.d ./Core/Src/power_setpoint_policy.o ./Core/Src/power_setpoint_policy.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 .PHONY: clean-Core-2f-Src