Enhance board and PSU control structures; update connector state handling and stop button logic. Adjust LED color cycles for better visual feedback. Refactor serial communication to improve state management and error handling.

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/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/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 16
 /* 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

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

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_CC, 1);
+    RELAY_Write(RELAY_CP, 0);
+    RELAY_Write(RELAY_CC, 0);
     RELAY_Write(RELAY_DC1, 0);
 
     SMAFilter_Init(&conn_temp_adc_filter[0]);

Core/Src/charger_control.c

@@ -43,16 +43,7 @@ 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);
-    }
+    return;
 }
 
 void CONN_SetState(CONN_State_t 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,63 @@ CP_State_t CP_GetState(void) {
     }
 }
 
-void CP_Loop(void) {
-    (void)CP_GetState();
+CP_State_t CP_GetFilteredState(void) {
+    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 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/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
-	if(!IN_ReadInput(IN_ESTOP)){
-		CONN.connControl = CMD_STOP;
+	/* Run no faster than once per 10 ms. */
+	if((now - tick) < 10){
+		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

@@ -2,6 +2,7 @@
 #include "main.h"
 #include "string.h"
 #include "charger_control.h"
+#include "board.h"
 
 #include "tim.h"
 
@@ -10,11 +11,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 },
-	.Tr = 50,
-	.Th = 50,
-	.Tf = 50,
-	.Tl = 50,
+	.Color2 = { .R = 0, .G = 0, .B = 0 },
+	.Tr = 10,
+	.Th = 5,
+	.Tf = 10,
+	.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 +64,12 @@ RGB_Cycle_t color_unplugged = {
 };
 
 RGB_Cycle_t color_preparing = {
-	.Color1 = { .R = 0, .G = 0, .B = 250 },
-	.Color2 = { .R = 0, .G = 0, .B = 250 },
-	.Tr = 50,
+	.Color1 = { .R = 0, .G = 0, .B = 255 },
+	.Color2 = { .R = 0, .G = 0, .B = 0 },
+	.Tr = 10,
 	.Th = 10,
-	.Tf = 50,
-	.Tl = 0,
+	.Tf = 10,
+	.Tl = 10,
 };
 
 RGB_Cycle_t color_charging = {
@@ -94,6 +104,14 @@ void LED_Write(){
       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

@@ -31,6 +31,10 @@ uint8_t ev_enable_output = 0;
 #define MAX_RX_BUFFER_SIZE 256
 #define EVEREST_TIMEOUT_MS 5000u
 #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];
@@ -42,16 +46,16 @@ 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 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);
@@ -137,6 +141,8 @@ void CCS_SerialLoop(void) {
     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;
+    static uint32_t stop_tick = 0;
 
     if ((&huart3)->RxState == HAL_UART_STATE_READY) {
         uart3_arm_rx_or_log("SerialLoop");
@@ -144,13 +150,32 @@ void CCS_SerialLoop(void) {
 
     CCS_UART3_Watchdog();
 
-    /* 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 (CONN.connControl == CMD_FORCE_UNLOCK) {
+        if (force_unlock_tick == 0) {
+            force_unlock_tick = HAL_GetTick();
+        } else if ((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 ((HAL_GetTick() - stop_tick) >= 1000) {
+            CONN.connControl = CMD_NONE;
+            stop_tick = 0;
+        }
+    } else {
+        stop_tick = 0;
+    }
+
     if((HAL_GetTick() - last_cmd_sent) > CMD_INTERVAL){
         if ((HAL_GetTick() - last_state_sent) >= 200) {
             send_state();
@@ -164,10 +189,14 @@ void CCS_SerialLoop(void) {
         }
 
         if (((CONN.connControl == CMD_STOP) ||
+             (CONN.connControl == CMD_FORCE_UNLOCK) ||
              (CONN.chargingError != CONN_NO_ERROR)) &&
             ((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();
         }
 
@@ -182,16 +211,19 @@ void CCS_SerialLoop(void) {
     (void)replug_watchdog_tick;
     (void)replug_watchdog1_tick;
 
-    if (!config_initialized) {
-        // Keep connector in Unknown until host sends valid SET_CONFIG.
-        RELAY_Write(RELAY_CP, 1);
-        CONN_SetState(Unknown);
-    } else {
-        switch(CCS_ConnectorState){
+    uint8_t host_timed_out = (last_host_seen > 0 && (HAL_GetTick() - last_host_seen) > EVEREST_TIMEOUT_MS);
+    switch(CCS_ConnectorState){
+            case CCS_UNKNOWN:
+                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 ((CONN.chargingError == CONN_NO_ERROR) && !host_timed_out){
                     CCS_ConnectorState = CCS_UNPLUGGED;
                 }
                 break;
@@ -255,7 +287,6 @@ void CCS_SerialLoop(void) {
                     }
                 }
                 break;
-        }
     }
 
     // If Everest timeout happened, keep safe-state and limit log frequency.
@@ -269,6 +300,9 @@ void CCS_SerialLoop(void) {
         CONN.EnableOutput = 0;
         CCS_EvseState = Unknown;
         CP_SetDuty(100);
+        if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) {
+            CCS_ConnectorState = CCS_DISABLED;
+        }
     } else if (last_host_seen > 0 && (HAL_GetTick() - last_host_seen) > EVEREST_TIMEOUT_MS) {
         log_printf(LOG_ERR, "Everest timeout\n");
         everest_timed_out = 1;
@@ -278,6 +312,9 @@ void CCS_SerialLoop(void) {
         CONN.EnableOutput = 0;
         CCS_EvseState = Unknown;
         CP_SetDuty(100);
+        if (CCS_ConnectorState != CCS_DISABLED && CCS_ConnectorState != CCS_UNKNOWN) {
+            CCS_ConnectorState = CCS_DISABLED;
+        }
     } else {
         if (last_cmd == CMD_STOP) {
             CONN.EnableOutput = 0;
@@ -384,7 +421,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;
@@ -433,7 +472,9 @@ ISR_FAST static void apply_command(uint8_t cmd, const uint8_t* payload, uint16_t
             uint8_t duty = p->pwm_duty_percent;
             if (duty > 100) duty = 100;
             pwm_duty_percent = duty;
-            CP_SetDuty(duty);
+            if (CONN.connControl != CMD_FORCE_UNLOCK) {
+                CP_SetDuty(duty);
+            }
             break;
         }
         case CMD_E2M_ENABLE_OUTPUT: {
@@ -459,8 +500,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;
-            CONN.RequestedVoltage = p->voltage_V;
-            CONN.WantedCurrent = p->current_0p1A;
+            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: {

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:20:6:CONN_Loop	6
-../Core/Src/charger_control.c:42:6:CONN_Task	6
-../Core/Src/charger_control.c:58:6:CONN_SetState	16
-../Core/Src/charger_control.c:84:6:CONN_PrintChargingTotal	1
+../Core/Src/charger_control.c:42:6:CONN_Task	1
+../Core/Src/charger_control.c:49:6:CONN_SetState	16
+../Core/Src/charger_control.c:75: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:33:6:CP_Init	1
-../Core/Src/cp.c:50:6:CP_SetDuty	1
-../Core/Src/cp.c:63:9:CP_GetDuty	1
-../Core/Src/cp.c:67:9:CP_GetVoltage	1
-../Core/Src/cp.c:72:12:CP_GetState	12
-../Core/Src/cp.c:96:6:CP_Loop	1
+../Core/Src/cp.c:19:16:CP_ReadVoltageMv	1
+../Core/Src/cp.c:36:6:CP_Init	1
+../Core/Src/cp.c:53:6:CP_SetDuty	1
+../Core/Src/cp.c:66:9:CP_GetDuty	1
+../Core/Src/cp.c:70:9:CP_GetVoltage	1
+../Core/Src/cp.c:75:12:CP_GetState	12
+../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	4

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:118:13:CAN1_MinimalReInit	3
-../Core/Src/main.c:136:5:main	1
-../Core/Src/main.c:219:6:SystemClock_Config	4
-../Core/Src/main.c:279:6:Error_Handler	1
+../Core/Src/main.c:108:6:StopButtonControl	8
+../Core/Src/main.c:151:13:CAN1_MinimalReInit	3
+../Core/Src/main.c:169:5:main	1
+../Core/Src/main.c:250:6:SystemClock_Config	4
+../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:169:6:PSU_SetHVMode	2
-../Core/Src/psu_control.c:176:6:PSU_SetVoltageCurrent	5
-../Core/Src/psu_control.c:203:6:PSU_SendCmd	4
-../Core/Src/psu_control.c:239:10:max	2
-../Core/Src/psu_control.c:244:6:PSU_ReadWrite	6
-../Core/Src/psu_control.c:280:6:PSU_Task	41
+../Core/Src/psu_control.c:158:6:PSU_Enable	3
+../Core/Src/psu_control.c:170:6:PSU_SetHVMode	2
+../Core/Src/psu_control.c:177:6:PSU_SetVoltageCurrent	5
+../Core/Src/psu_control.c:204:6:PSU_SendCmd	4
+../Core/Src/psu_control.c:240:10:max	2
+../Core/Src/psu_control.c:245:6:PSU_ReadWrite	8
+../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:146:6:interpolateColors	3
-../Core/Src/rgb_controller.c:164:6:RGB_SetColor	1
-../Core/Src/rgb_controller.c:170:6:LED_SetColor	1
-../Core/Src/rgb_controller.c:175:6:LED_Init	1
-../Core/Src/rgb_controller.c:207:6:LED_Task	10
+../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:225:6:LED_Task	10

Debug/Core/Src/serial.cyclo

@@ -1,18 +1,18 @@
-../Core/Src/serial.c:59:22:uart3_log_hal_error	3
-../Core/Src/serial.c:79:22:uart3_arm_rx_or_log	3
-../Core/Src/serial.c:94:15:CCS_RxEventCallback	4
-../Core/Src/serial.c:117:15:HAL_UART_ErrorCallback	5
-../Core/Src/serial.c:135:6:CCS_SerialLoop	43
-../Core/Src/serial.c:301:6:CCS_Init	1
-../Core/Src/serial.c:315:26:crc16_ibm	3
-../Core/Src/serial.c:330:17:CCS_BuildPacket	4
-../Core/Src/serial.c:346:13:CCS_SendPacket	2
-../Core/Src/serial.c:354:13:CCS_SendResetReason	1
-../Core/Src/serial.c:358:6:CCS_SendEmergencyStop	1
-../Core/Src/serial.c:362:6:CCS_SendStart	1
-../Core/Src/serial.c:366:13:CCS_CalculateEnergy	2
-../Core/Src/serial.c:381:13:send_state	3
-../Core/Src/serial.c:409:26:expected_payload_len	2
-../Core/Src/serial.c:425:22:apply_command	13
-../Core/Src/serial.c:497:25:process_received_packet	8
-../Core/Src/serial.c:550:13:CCS_UART3_Watchdog	3
+../Core/Src/serial.c:63:22:uart3_log_hal_error	3
+../Core/Src/serial.c:83:22:uart3_arm_rx_or_log	3
+../Core/Src/serial.c:98:15:CCS_RxEventCallback	4
+../Core/Src/serial.c:121:15:HAL_UART_ErrorCallback	5
+../Core/Src/serial.c:139:6:CCS_SerialLoop	60
+../Core/Src/serial.c:338:6:CCS_Init	1
+../Core/Src/serial.c:352:26:crc16_ibm	3
+../Core/Src/serial.c:367:17:CCS_BuildPacket	4
+../Core/Src/serial.c:383:13:CCS_SendPacket	2
+../Core/Src/serial.c:391:13:CCS_SendResetReason	1
+../Core/Src/serial.c:395:6:CCS_SendEmergencyStop	1
+../Core/Src/serial.c:399:6:CCS_SendStart	1
+../Core/Src/serial.c:403:13:CCS_CalculateEnergy	2
+../Core/Src/serial.c:418:13:send_state	3
+../Core/Src/serial.c:448:26:expected_payload_len	2
+../Core/Src/serial.c:464:22:apply_command	15
+../Core/Src/serial.c:545:25:process_received_packet	8
+../Core/Src/serial.c:598:13:CCS_UART3_Watchdog	3