2020-03-31 / Kathy Yeh

1. modify close error : ConnectWsServer() detach
2. modify error : Configuration format
3. modify Key StopTransactionOnInvalidId Value
4. modify GetCompositeSchedule value
5. modify GetChargingProfileRequest() logic
6. add Key AllowOfflineTxForUnknownId logic

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -33,11 +33,11 @@
 #include    	"MessageHandler.h"
 #include	"sqlite3.h"
 
-
 #ifndef SPEC_LATEST_SUPPORTED
 #define SPEC_LATEST_SUPPORTED 13
 #endif
 
+
 #define Debug
 //#define ARRAY_SIZE(A)		(sizeof(A) / sizeof(A[0]))
 #define PASS				1
@@ -48,6 +48,7 @@ typedef enum boolean { FALSE, TRUE } BOOL;
 struct lws 								*wsi_client;
 struct lws_context 						*context;
 static int sendbuffer = 0;
+pthread_t pid;
 extern int server_sign;
 
 extern void CheckSystemValue(void);
@@ -461,6 +462,7 @@ static int OCPP16Callback(struct lws *wsi, enum lws_callback_reasons reason, voi
 			#ifdef SystemLogMessage
 			DEBUG_INFO("LWS_CALLBACK_WSI_DESTROY\n");
 			#endif
+			pthread_detach(pid);
 			server_sign = FALSE;
 			break;
 		case LWS_CALLBACK_LOCK_POLL:
@@ -584,8 +586,13 @@ static int OCPP16Callback(struct lws *wsi, enum lws_callback_reasons reason, voi
 			//DEBUG_INFO("LWS_CALLBACK_CLIENT_WRITEABLE\n");
 			#endif
 			SendData(wsi);
+			//lws_rx_flow_control( wsi, 1 );
 			break;
+
 		case LWS_CALLBACK_CLIENT_RECEIVE://8
+
+			// lws_rx_flow_control( wsi, 0 );
+
 			((char *)in)[len] = '\0';
 
 			//Print Out Adjudgement
@@ -661,14 +668,14 @@ static struct lws_protocols protocols[] = {
 	{
 		"ocpp1.6",
 		OCPP16Callback,
-		65536,//10240,
-		65536,//10240,
+		10240,//65536,//10240,
+		10240,//65536,//10240,
 	},
 	{
 		"ocpp1.6",
 		OCPP16Callback,
-		65536,//10240,
-		65536,//10240,
+		10240,//65536,//10240,
+		10240,//65536,//10240,
 	},
 	{
 		NULL, NULL, 0		/* End of list */
@@ -678,7 +685,7 @@ static struct lws_protocols protocols[] = {
 
 void* ConnectWsServer(void* data)  //int ConnectWsServer()
 {
-	pthread_detach(pthread_self());
+	//pthread_detach(pthread_self());
 	//int result = PASS;
 	struct lws_context_creation_info ContextInfo;
 	struct lws_client_connect_info ConnInfo;
@@ -1342,41 +1349,6 @@ if( fgets (str, 1200, fp)!=NULL ) {
 
 		sstr[c] = '\0';
 		temptransactionId = atoi(sstr);
-		//puts(str);
-		//DEBUG_INFO("\n uuid:%s", "");
-		//DEBUG_INFO("\n data:%s", str);
-#if 0
-		if(IsStopTransaction == TRUE)
-		{
-			for(int i=0; i <10; i++)
-			{
-				//DEBUG_INFO("\n StopTransaction i:%d\n", i);
-				//DEBUG_INFO("\n StopTransaction SentQueueTransactionId[i]:%d\n", SentQueueTransactionId[i]);
-				//DEBUG_INFO("\n sStopTransaction temptransactionId:%d\n", temptransactionId);
-				if(SentQueueTransactionId[i] == temptransactionId)
-				{
-					tempconnectorId = i;
-					gunIndex = i;
-					break;
-				}
-
-
-			}
-		}
-		else
-		{
-			if(tempconnectorId > 0)
-			{
-				SentQueueTransactionId[tempconnectorId-1] = temptransactionId;
-				gunIndex = tempconnectorId-1;
-			}
-		}
-#endif
-
-
-		//DEBUG_INFO("\n gunIndex=%d \n",gunIndex);
-		//DEBUG_INFO("\n temptransactionId=%d \n",temptransactionId);
-		//DEBUG_INFO("\n GetTransactionId(gunIndex)=%d \n",GetTransactionId(gunIndex));
 
 		gettransactionId = GetTransactionId(tempconnectorId, IdtagStr);
 		if((gettransactionId != 0)&&(temptransactionId != gettransactionId))
@@ -1441,8 +1413,6 @@ void* processTransactionQueue(void* data) {
 					OfflineTransaction = 0;
 					if(TransactionMessageResend < TransactionMessageAttemptsGet()) //
 					{
-						//DEBUG_INFO("TransactionMessageResend=%d\n",TransactionMessageResend);
-						//DEBUG_INFO("TransactionMessageAttemptsGet=%d\n",TransactionMessageAttemptsGet());
 						//DEBUG_INFO("processTransactionQueue queue is not empty!\n");
 
 						TransactionQueueInterval= TransactionMessageRetryIntervalGet()* TransactionMessageResend;
@@ -1450,10 +1420,8 @@ void* processTransactionQueue(void* data) {
 						sendbuffer = 1;
 						TransactionMessageResend = TransactionMessageResend + 1;
 						//DEBUG_INFO("After ADD,TransactionMessageResend=%d\n",TransactionMessageResend);
-
 						sleep(TransactionQueueInterval);
 
-
 					}
 					else
 					{
@@ -1496,7 +1464,6 @@ void CheckTransactionPacket(char *uuid)
 	if(queueNotEmpty == 1)
 	{
 		cmpResult = strcmp(frontUUID, uuid);
-		//cmpResult = strcmp(frontData, uuid);
 
 		if (cmpResult == 0)
 		{
@@ -1607,7 +1574,7 @@ int main(void)
 	char rmFileCmd[100]={0};
 	struct stat stats;
 	pthread_t t;
-	pthread_t pid;
+	//pthread_t pid;
 	#ifdef SystemLogMessage
 	DEBUG_INFO("Initialization...\n");
 	#endif
@@ -1705,7 +1672,7 @@ int main(void)
 
 	initialConfigurationTable();
 	removeMessageSentFile();
-	OCPP_get_TableAuthlocalAllData();
+	//OCPP_get_TableAuthlocalAllData();
 
 	for(;;)
 	{