2022-06-29/Jerry Wang

[OCPP 1.6PH]

Action:
1. Fix mapping queue crash problem.

File:
1. EVSE/Modularization/ocppph/Module_OcppBackend.c
--> Action 1

EVSE/Modularization/ocppph/Module_OcppBackend.c

@@ -1039,12 +1039,6 @@ int sentqueue()
 								//replace transactionId
 								json_object_object_add(objPayload, "transactionId", json_object_new_int(transactionId_map));
 							}
-							else if((transactionId_map == 0) && (transactionId_org == 0))
-							{
-								//replace transactionId
-								transactionId_map = GetStartTransactionId(connectorId-1);
-								json_object_object_add(objData, "idTx", json_object_new_int(transactionId_map));
-							}
 							else
 							{
 								transactionId_map = transactionId_org;
@@ -1070,7 +1064,6 @@ int sentqueue()
 							{
 								transactionId_org = json_object_get_int(json_object_object_get(objData, "idTx"));
 
-
 								//Get IdTag from StartTransaction , store to StartTransactionIdTagTemp, For StopTransaction usage in Queue (StartTransaction. StopTransaction user id different), get actual TransactionId
 								GetStartTransactionIdTag(connectorId-1);
 								transactionId_map = GetTransactionId(connectorId, (unsigned char*)"", NO);
@@ -1087,7 +1080,8 @@ int sentqueue()
 								else if((transactionId_map == 0) && (transactionId_org == 0))
 								{
 									//replace transactionId
-									json_object_object_add(objData, "idTx", json_object_new_int(GetStartTransactionId(connectorId-1)));
+									transactionId_map = GetStartTransactionId(connectorId-1);
+									json_object_object_add(objData, "idTx", json_object_new_int(transactionId_map));
 								}
 								else
 								{
@@ -1479,6 +1473,7 @@ int main(void)
 					queueOpInfo.PreTransactionMessageResend = queueOpInfo.TransactionMessageResend;
 				}
 
+				// PING packet
 				if(isWebsocketSendable && (0 < GetWebSocketPingInterval()) && ((GetWebSocketPingInterval()+counterPingSend) <= getDiffSecNow(startTime.pingOn)))
 				{
 					lws_callback_on_writable(wsi_client);
@@ -1499,7 +1494,6 @@ int main(void)
 					if(getDiffSecNow(startTime.reConnect) >= 3)
 					{
 						DEBUG_INFO("GetOcppConnStatus() = %d\n", GetOcppConnStatus());
-
 						lws_context_destroy(context);
 						ConnectionEstablished = 0;
 						context = NULL;