forked from achamaikin/CCSModuleSW30Web
latest version
This commit is contained in:
@@ -7,107 +7,148 @@
|
||||
#include "connector.h"
|
||||
#include "lock.h"
|
||||
#include "board.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
CONN_State_t connectorState;
|
||||
extern GBT_EDCAN_Output_t GBT_EDCAN_Output;
|
||||
extern GBT_EDCAN_Input_t GBT_EDCAN_Input;
|
||||
|
||||
uint8_t CC_STATE_FILTERED;
|
||||
extern uint8_t config_initialized;
|
||||
|
||||
void CONN_Init(){
|
||||
CONN_SetState(CONN_Initializing);
|
||||
}
|
||||
gbtCcState_t CC_STATE_FILTERED;
|
||||
|
||||
void CONN_Task(){
|
||||
|
||||
switch (connectorState){
|
||||
case CONN_Initializing: // unlocked
|
||||
case Unknown: // unlocked, waiting for config
|
||||
GBT_Lock(0);
|
||||
CONN_SetState(CONN_Available);
|
||||
GBT_LockState.error = 0;
|
||||
break;
|
||||
case CONN_Faulted: //unlocked
|
||||
GBT_Lock(0);
|
||||
|
||||
break;
|
||||
case CONN_Available: //unlocked, waiting to connect
|
||||
GBT_Lock(0);
|
||||
GBT_LockState.error = 0;
|
||||
if((CONN_CC_GetState()==GBT_CC_4V) && (GBT_EDCAN_Input.chargeControl != FORCE_UNLOCK)){ // Исправить
|
||||
CONN_SetState(CONN_Preparing);
|
||||
GBT_Lock(1);
|
||||
|
||||
if (config_initialized) {
|
||||
CONN_SetState(Unplugged);
|
||||
}
|
||||
break;
|
||||
|
||||
// Выйти из двух состояний в Finished если force unlock
|
||||
case CONN_Preparing: //locked, waiting to charge
|
||||
GBT_Lock(1);
|
||||
case Disabled: // faulted, unlocked
|
||||
GBT_Lock(0);
|
||||
if(CONN.chargingError == 0) CONN_SetState(Unplugged);
|
||||
if(CONN.connControl == CMD_FORCE_UNLOCK) GBT_ForceLock(0);
|
||||
break;
|
||||
|
||||
case Unplugged: // unlocked, waiting to connect
|
||||
GBT_Lock(0);
|
||||
if(CONN.chargingError != 0) CONN_SetState(Disabled);
|
||||
if(CONN.connControl == CMD_FORCE_UNLOCK) GBT_ForceLock(0);
|
||||
|
||||
if((CONN_CC_GetState()==GBT_CC_4V) && (CONN.connControl != CMD_FORCE_UNLOCK)){
|
||||
CONN_SetState(AuthRequired);
|
||||
GBT_Lock(0);
|
||||
}
|
||||
break;
|
||||
|
||||
case AuthRequired: // plugged, waiting to start charge
|
||||
GBT_Lock(0);
|
||||
if(CONN.connControl == CMD_FORCE_UNLOCK) GBT_ForceLock(0);
|
||||
if(CONN_CC_GetState()==GBT_CC_4V){
|
||||
if(GBT_EDCAN_Input.chargeControl == CHARGING_ALLOWED){
|
||||
// RELAY_Write(RELAY_AUX, 1);
|
||||
// GBT_Start();
|
||||
CONN_SetState(CONN_Charging);
|
||||
if(CONN.connControl == CMD_START){
|
||||
CONN_SetState(Preparing);
|
||||
}
|
||||
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK){
|
||||
CONN_SetState(CONN_Available);//TODO: CONN_Occupied_complete
|
||||
if(CONN.connControl == CMD_FORCE_UNLOCK){
|
||||
CONN_SetState(Unplugged);
|
||||
}
|
||||
//if (CHARGING_NOT_ALLOWED) stay here
|
||||
// if CHARGING_NOT_ALLOWED — stay here
|
||||
}else{
|
||||
CONN_SetState(CONN_Available);
|
||||
CONN_SetState(Unplugged);
|
||||
}
|
||||
break;
|
||||
case CONN_Charging://charging, locked
|
||||
|
||||
case Preparing: // charging, locked
|
||||
GBT_Lock(1);
|
||||
|
||||
if(GBT_State == GBT_COMPLETE){
|
||||
CONN_SetState(CONN_Finishing);
|
||||
if(GBT_StopSource == GBT_STOP_EVSE){
|
||||
CONN_SetState(FinishedEVSE);
|
||||
}else if(GBT_StopSource == GBT_STOP_EV){
|
||||
CONN_SetState(FinishedEV);
|
||||
}else if(GBT_StopSource == GBT_STOP_OCPP){
|
||||
CONN_SetState(Finished);
|
||||
}else{
|
||||
CONN_SetState(FinishedEVSE);
|
||||
}
|
||||
}
|
||||
if(GBT_State == GBT_S10_CHARGING){
|
||||
CONN_SetState(Charging);
|
||||
}
|
||||
//
|
||||
|
||||
break;
|
||||
case CONN_Finishing://charging completed, waiting to disconnect, unlocked
|
||||
case Charging: // charging, locked
|
||||
GBT_Lock(1);
|
||||
|
||||
if(GBT_State == GBT_COMPLETE){
|
||||
if(GBT_StopSource == GBT_STOP_EVSE){
|
||||
CONN_SetState(FinishedEVSE);
|
||||
}else if(GBT_StopSource == GBT_STOP_EV){
|
||||
CONN_SetState(FinishedEV);
|
||||
}else if(GBT_StopSource == GBT_STOP_OCPP){
|
||||
CONN_SetState(Finished);
|
||||
}else{
|
||||
CONN_SetState(FinishedEVSE);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case FinishedEV: // charging completed by EV, waiting to transaction stop
|
||||
GBT_Lock(0);
|
||||
// RELAY_Write(RELAY_AUX, 0);
|
||||
//TODO: Reconnection
|
||||
// if(GBT_EDCAN_Input.chargeControl == CHARGING_NOT_ALLOWED){
|
||||
// CONN_SetState(CONN_Initializing);
|
||||
// }
|
||||
if(CONN_CC_GetState()==GBT_CC_6V){
|
||||
CONN_SetState(CONN_Initializing);
|
||||
}
|
||||
//Проблема, если нажать кнопку и не вынуть пистолет, то он снова блочится
|
||||
CONN_SetState(Finished);
|
||||
break;
|
||||
|
||||
case FinishedEVSE: // charging completed by EVSE, waiting to transaction stop
|
||||
GBT_Lock(0);
|
||||
CONN_SetState(Finished);
|
||||
break;
|
||||
|
||||
case Finished: // charging completed, waiting to disconnect, unlocked
|
||||
GBT_Lock(0);
|
||||
|
||||
//TODO Force unlock time limit
|
||||
if(CONN.connControl == CMD_FORCE_UNLOCK) GBT_ForceLock(0);
|
||||
|
||||
if(CONN_CC_GetState()==GBT_CC_6V){
|
||||
GBT_Lock(0);
|
||||
CONN_SetState(Unplugged);
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
CONN_SetState(CONN_Initializing);
|
||||
|
||||
CONN_SetState(Unknown);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
//external
|
||||
//CONN_SetState(CONN_Error);
|
||||
//CONN_SetState(CONN_Occupied_charging);
|
||||
//CONN_SetState(CONN_Occupied_Complete);
|
||||
//CONN_SetState(Disabled);
|
||||
|
||||
void CONN_SetState(CONN_State_t state){
|
||||
connectorState = state;
|
||||
if(connectorState == CONN_Initializing) printf ("CONN_Initializing\n");
|
||||
if(connectorState == CONN_Faulted) printf ("CONN_Error\n");
|
||||
if(connectorState == CONN_Available) printf ("CONN_Available\n");
|
||||
if(connectorState == CONN_Preparing) printf ("CONN_Occupied_waiting\n");
|
||||
if(connectorState == CONN_Charging) printf ("CONN_Occupied_charging\n");
|
||||
if(connectorState == CONN_Finishing) printf ("CONN_Occupied_complete\n");
|
||||
GBT_EDCAN_Output.connectorState = state;
|
||||
|
||||
if(connectorState == Unknown) log_printf(LOG_INFO, "Connector: Unknown\n");
|
||||
if(connectorState == Unplugged) log_printf(LOG_INFO, "Connector: Unplugged\n");
|
||||
if(connectorState == Disabled) log_printf(LOG_INFO, "Connector: Disabled\n");
|
||||
if(connectorState == Preparing) log_printf(LOG_INFO, "Connector: Preparing\n");
|
||||
if(connectorState == AuthRequired) log_printf(LOG_INFO, "Connector: AuthRequired\n");
|
||||
if(connectorState == WaitingForEnergy) log_printf(LOG_INFO, "Connector: WaitingForEnergy\n");
|
||||
if(connectorState == ChargingPausedEV) log_printf(LOG_INFO, "Connector: ChargingPausedEV\n");
|
||||
if(connectorState == ChargingPausedEVSE) log_printf(LOG_INFO, "Connector: ChargingPausedEVSE\n");
|
||||
if(connectorState == Charging) log_printf(LOG_INFO, "Connector: Charging\n");
|
||||
if(connectorState == AuthTimeout) log_printf(LOG_INFO, "Connector: AuthTimeout\n");
|
||||
if(connectorState == Finished) log_printf(LOG_INFO, "Connector: Finished\n");
|
||||
if(connectorState == FinishedEVSE) log_printf(LOG_INFO, "Connector: FinishedEVSE\n");
|
||||
if(connectorState == FinishedEV) log_printf(LOG_INFO, "Connector: FinishedEV\n");
|
||||
if(connectorState == Replugging) log_printf(LOG_INFO, "Connector: Replugging\n");
|
||||
|
||||
CONN.connState = state;
|
||||
}
|
||||
|
||||
void CONN_CC_ReadStateFiltered() {
|
||||
static uint32_t last_change_time;
|
||||
static uint32_t last_check_time;
|
||||
static uint8_t prev_state;
|
||||
static uint32_t last_change_time = 0;
|
||||
static uint32_t last_check_time = 0;
|
||||
static uint8_t prev_state = 0;
|
||||
|
||||
// if((last_check_time+100)>HAL_GetTick()) return;
|
||||
if((HAL_GetTick()-last_check_time)<100) return;
|
||||
|
||||
last_check_time = HAL_GetTick();
|
||||
@@ -120,64 +161,13 @@ void CONN_CC_ReadStateFiltered() {
|
||||
} else if ((HAL_GetTick() - last_change_time) >= 300) {
|
||||
CC_STATE_FILTERED = prev_state;
|
||||
}
|
||||
|
||||
// switch(new_state){
|
||||
// case GBT_CC_UNKNOWN:
|
||||
// printf("GBT_CC_UNKNOWN\n");
|
||||
// break;
|
||||
// case GBT_CC_12V:
|
||||
// printf("GBT_CC_12V\n");
|
||||
// break;
|
||||
// case GBT_CC_6V:
|
||||
// printf("GBT_CC_6V\n");
|
||||
// break;
|
||||
// case GBT_CC_4V:
|
||||
// printf("GBT_CC_4V\n");
|
||||
// break;
|
||||
// case GBT_CC_2V:
|
||||
// printf("GBT_CC_2V\n");
|
||||
// break;
|
||||
//
|
||||
// }
|
||||
// switch(CONN_CC_GetState()){
|
||||
// case GBT_CC_UNKNOWN:
|
||||
// printf("FGBT_CC_UNKNOWN\n");
|
||||
// break;
|
||||
// case GBT_CC_12V:
|
||||
// printf("FGBT_CC_12V\n");
|
||||
// break;
|
||||
// case GBT_CC_6V:
|
||||
// printf("FGBT_CC_6V\n");
|
||||
// break;
|
||||
// case GBT_CC_4V:
|
||||
// printf("FGBT_CC_4V\n");
|
||||
// break;
|
||||
// case GBT_CC_2V:
|
||||
// printf("FGBT_CC_2V\n");
|
||||
// break;
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
||||
uint8_t CONN_CC_GetState(){
|
||||
return CC_STATE_FILTERED;
|
||||
}
|
||||
uint8_t CONN_CC_GetStateRaw(){
|
||||
//Vref=3.3v = 4095
|
||||
//k=1/11
|
||||
//Vin = 12v
|
||||
//Vin*k= 1.09v
|
||||
//12vin = 1353 ADC
|
||||
//TODO: Filter 100ms
|
||||
uint32_t adc;
|
||||
float volt;
|
||||
ADC_Select_Channel(ADC_CHANNEL_6);
|
||||
HAL_ADC_Start(&hadc1);
|
||||
HAL_ADC_PollForConversion(&hadc1, 100);
|
||||
adc = HAL_ADC_GetValue(&hadc1);
|
||||
HAL_ADC_Stop(&hadc1);
|
||||
|
||||
volt = (float)adc/113.4f;
|
||||
float volt = CONN_CC_GetAdc();
|
||||
// if((volt<12.6f) && (volt>11.4f)) return GBT_CC_12V;
|
||||
// if((volt<6.8f) && (volt>5.2f)) return GBT_CC_6V;
|
||||
// if((volt<4.8f) && (volt>3.2f)) return GBT_CC_4V;
|
||||
@@ -199,7 +189,7 @@ float CONN_CC_GetAdc(){
|
||||
|
||||
uint32_t adc;
|
||||
float volt;
|
||||
ADC_Select_Channel(ADC_CHANNEL_6);
|
||||
ADC_Select_Channel(ADC_CHANNEL_3);
|
||||
HAL_ADC_Start(&hadc1);
|
||||
HAL_ADC_PollForConversion(&hadc1, 100);
|
||||
adc = HAL_ADC_GetValue(&hadc1);
|
||||
|
||||
Reference in New Issue
Block a user