[Improve][Modularization][Module_OcppBackend / Module_OcppBackend20]

2021.06.11 / Folus Wen

Actions:
1. OCPP connection timeout configuration value follow web page config item.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/ocpp20/MessageHandler.c

@@ -17019,6 +17019,12 @@ int GetInternetConn(void)
 	return ShmSysConfigAndInfo->SysInfo.InternetConn;
 }
 
+int GetBackendConnectionTimeout(void)
+{
+	return ShmSysConfigAndInfo->SysConfig.BackendConnTimeout>=0?ShmSysConfigAndInfo->SysConfig.BackendConnTimeout:300;
+}
+
+
 int isConnectorInitMode(int gun_index)
 {
 	int tempIndex = 0;

EVSE/Modularization/ocpp20/MessageHandler.h

@@ -1007,6 +1007,7 @@ void FillStartTransaction(int ConnectorId, unsigned char IdTag[], int MeterStart
 void splitstring(char *src,const char *separator,char **dest,int *num);
 int GetWebSocketPingInterval(void);
 int GetInternetConn(void);
+int GetBackendConnectionTimeout(void);
 int isConnectorInitMode(int gun_index);
 void refreshProcDogTimer();
 int GetServerSign(void);

EVSE/Modularization/ocpp20/Module_OcppBackend20.c

@@ -401,8 +401,8 @@ void* ConnectWsServer(void* data)  //int ConnectWsServer()
 	}
 
 	ContextInfo.protocols = protocols;
-	ContextInfo.timeout_secs = GetWebSocketPingInterval();//WebSocketPingInterval;//30;//9999;//30;
-	ContextInfo.ws_ping_pong_interval = GetWebSocketPingInterval();//WebSocketPingInterval;//30;//0 for none, else interval in seconds
+	ContextInfo.timeout_secs = GetBackendConnectionTimeout();
+	ContextInfo.ws_ping_pong_interval = GetWebSocketPingInterval();
 	ContextInfo.ka_time = 20;
 	ContextInfo.keepalive_timeout = 5;
 	ContextInfo.ka_probes = 2;

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -17617,6 +17617,11 @@ int GetInternetConn(void)
 	return ShmSysConfigAndInfo->SysInfo.InternetConn;
 }
 
+int GetBackendConnectionTimeout(void)
+{
+	return ShmSysConfigAndInfo->SysConfig.BackendConnTimeout>=0?ShmSysConfigAndInfo->SysConfig.BackendConnTimeout:300;
+}
+
 int isConnectorInitMode(int gun_index)
 {
 	int tempIndex = 0;

EVSE/Modularization/ocppfiles/MessageHandler.h

@@ -579,6 +579,7 @@ void FillStartTransaction(int ConnectorId, unsigned char IdTag[], int MeterStart
 void splitstring(char *src,const char *separator,char **dest,int *num);
 int GetWebSocketPingInterval(void);
 int GetInternetConn(void);
+int GetBackendConnectionTimeout(void);
 int isConnectorInitMode(int gun_index);
 void refreshProcDogTimer();
 int GetServerSign(void);

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -462,8 +462,8 @@ void* ConnectWsServer(void* data)  //int ConnectWsServer()
 	}
 
 	ContextInfo.protocols = protocols;
-	ContextInfo.timeout_secs = GetWebSocketPingInterval();//WebSocketPingInterval;//30;//9999;//30;
-	ContextInfo.ws_ping_pong_interval = GetWebSocketPingInterval();//WebSocketPingInterval;//30;//0 for none, else interval in seconds
+	ContextInfo.timeout_secs = GetBackendConnectionTimeout();
+	ContextInfo.ws_ping_pong_interval = GetWebSocketPingInterval();
 	ContextInfo.ka_time = 20;
 	ContextInfo.keepalive_timeout = 5;
 	ContextInfo.ka_probes = 2;