achamaikin/GbTModuleEV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

latest version

Browse Source
This commit is contained in:
init.bin
2026-01-19 15:11:05 +03:00
parent 5ea401f34d
commit 9830ece932
26 changed files with 21459 additions and 21183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Core/Src/connector.c
View File

@@ -7,6 +7,7 @@
#include "connector.h"
#include "lock.h"
#include "board.h"
#include "edcan.h"
CONN_State_t connectorState;
@@ -25,25 +26,29 @@ void CONN_Task(){
case CONN_Initializing: // unlocked
GBT_Lock(0);
CONN_SetState(CONN_Available);
GBT_LockState.error = 0;
break;
case CONN_Faulted: //unlocked
GBT_Lock(0);
if(GBT_EDCAN_Input.chargingError == 0) CONN_SetState(CONN_Available);
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK) GBT_ForceLock(0);
break;
case CONN_Available: //unlocked, waiting to connect
GBT_Lock(0);
GBT_LockState.error = 0;
if(GBT_EDCAN_Input.chargingError != 0) CONN_SetState(CONN_Faulted);
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK) GBT_ForceLock(0);
if((CONN_CC_GetState()==GBT_CC_4V) && (GBT_EDCAN_Input.chargeControl != FORCE_UNLOCK)){ // Исправить
CONN_SetState(CONN_Preparing);
GBT_Lock(1);
}
break;
// Выйти из двух состояний в Finished если force unlock
case CONN_Preparing: //locked, waiting to charge
GBT_Lock(1);
case CONN_Preparing: //unlocked, waiting to charge
GBT_Lock(0);
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK) GBT_ForceLock(0);
if(CONN_CC_GetState()==GBT_CC_4V){
if(GBT_EDCAN_Input.chargeControl == CHARGING_ALLOWED){
// RELAY_Write(RELAY_AUX, 1);
@@ -62,22 +67,44 @@ void CONN_Task(){
GBT_Lock(1);
if(GBT_State == GBT_COMPLETE){
CONN_SetState(CONN_Finishing);
}
if(GBT_StopSource == GBT_STOP_EVSE){
CONN_SetState(CONN_Suspended_EVSE);
}else if(GBT_StopSource == GBT_STOP_EV){
CONN_SetState(CONN_Suspended_EV);
}else if(GBT_StopSource == GBT_STOP_OCPP){
CONN_SetState(CONN_Finishing);
}else{
CONN_SetState(CONN_Suspended_EVSE);
}
}//FIXME
//
break;
case CONN_Suspended_EV://charging completed by EV, waiting to transaction stop
GBT_Lock(0);
if(GBT_EDCAN_Input.chargeControl == CHARGING_NOT_ALLOWED) CONN_SetState(CONN_Finishing);
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK) CONN_SetState(CONN_Finishing); // --> Finished
break;
case CONN_Suspended_EVSE://charging completed by EVSE, waiting to transaction stop
GBT_Lock(0);
if(GBT_EDCAN_Input.chargeControl == CHARGING_NOT_ALLOWED) CONN_SetState(CONN_Finishing);
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK) CONN_SetState(CONN_Finishing); // --> Finished
break;
case CONN_Finishing://charging completed, waiting to disconnect, unlocked
GBT_Lock(0);
// RELAY_Write(RELAY_AUX, 0);
//TODO: Reconnection
// if(GBT_EDCAN_Input.chargeControl == CHARGING_NOT_ALLOWED){
// CONN_SetState(CONN_Initializing);
// }
//TODO Force unlock time limit
if(GBT_EDCAN_Input.chargeControl == FORCE_UNLOCK) GBT_ForceLock(0);
if(CONN_CC_GetState()==GBT_CC_6V){
CONN_SetState(CONN_Initializing);
GBT_Lock(0);
CONN_SetState(CONN_Available);
}
//Проблема, если нажать кнопку и не вынуть пистолет, то он снова блочится
break;
default:
CONN_SetState(CONN_Initializing);
@@ -93,12 +120,15 @@ void CONN_Task(){
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");
if(connectorState == CONN_Initializing) EDCAN_printf(LOG_INFO,"CONN_Initializing\n");
if(connectorState == CONN_Faulted) EDCAN_printf(LOG_INFO,"CONN_Faulted\n");
if(connectorState == CONN_Available) EDCAN_printf(LOG_INFO,"CONN_Available\n");
if(connectorState == CONN_Preparing) EDCAN_printf(LOG_INFO,"CONN_Preparing\n");
if(connectorState == CONN_Charging) EDCAN_printf(LOG_INFO,"CONN_Charging\n");
if(connectorState == CONN_Finishing) EDCAN_printf(LOG_INFO,"CONN_Finishing\n");
if(connectorState == CONN_Suspended_EV) EDCAN_printf(LOG_INFO,"CONN_Suspended_EV\n");
if(connectorState == CONN_Suspended_EVSE) EDCAN_printf(LOG_INFO,"CONN_Suspended_EVSE\n");
GBT_EDCAN_Output.connectorState = state;
}