2020-03-31 / Kathy Yeh

1. modify  SendLocalList logic

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -8680,7 +8680,7 @@ int handleSendLocalListRequest(char *uuid, char *payload)
 		memset(ShmOCPP16Data->SendLocalList.LocalAuthorizationList, 0 , sizeof(struct StructLocalAuthorizationList)* 500);
 
 		c= 0;
-		while(c < i)
+		while(c < i) // i is CardList Number
 		{
 			//Search "IdToken"
 			memset(sstr ,0, sizeof(sstr) );
@@ -8776,18 +8776,13 @@ int handleSendLocalListRequest(char *uuid, char *payload)
 			}
 			else if(strcmp(updateTypestr, UpdateTypeStr[Differential]) == 0)
 			{
-				if((strcmp(idTagstr, idTagAuthorization) == 0) && (parentIdTag[0] != '\0'))
-				{
-					OCPP_addLocalList_1(listVersionInt, idTagstr, parentIdTag, expiryDate, idTagstatus);  // update
-
-				}
-				else if((strcmp(idTagstr, idTagAuthorization) == 0) && (parentIdTag[0] == '\0'))
+				if(strcmp(idTagstr, idTagAuthorization) == 0)
 				{
 					OCPP_deleteIdTag(idTagstr);
 					OCPP_addLocalList_1(listVersionInt, idTagstr, parentIdTag, expiryDate, idTagstatus);  // update
 					//OCPP_deleteIdTag(idTagstr);
 				}
-				else if((strcmp(idTagstr, idTagAuthorization) != 0) && (parentIdTag[0] != '\0'))
+				else if(strcmp(idTagstr, idTagAuthorization) != 0)
 				{
 					OCPP_addLocalList_1(listVersionInt, idTagstr, parentIdTag, expiryDate, idTagstatus);  // add
 
@@ -11648,7 +11643,7 @@ int initialConfigurationTable(void)
 
 		while( fgets (str, sizeof(str), fp)!=NULL )
 		{
-			DEBUG_INFO("Get Configuration \n");
+			//DEBUG_INFO("Get Configuration \n");
 
 			str[strlen(str) - 1] = '\0'; // eat the newline fgets() stores
 			//*************************key*********************************/
@@ -12444,7 +12439,6 @@ void getKeyValue(char *keyReq)
 
 	 if(isEmpty || strcmp(keyReq, "AllowOfflineTxForUnknownId") == 0)
 	 {
-		 DEBUG_INFO("AllowOfflineTxForUnknownId\n");
 		strcpy((char *)ShmOCPP16Data->GetConfiguration.Key[GetConfiguration_AllowOfflineTxForUnknownId].Item, "AllowOfflineTxForUnknownId");
 		strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_AllowOfflineTxForUnknownId].Key, "AllowOfflineTxForUnknownId");
 		if(ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemAccessibility == 1)
@@ -14658,7 +14652,7 @@ static int callback(void *data, int argc, char **argv, char **azColName){
      // printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
    }
 
-   printf("\n");
+   //printf("\n");
    return 0;
 }
 
@@ -14764,7 +14758,7 @@ void OCPP_getIdTag(char idTag[])
     memset(idTagAuthorization, 0, sizeof(idTagAuthorization));
     memset(&idTagQuery, 0, sizeof(idTagQuery));
 
-    DEBUG_INFO("look up card: %s in ocpp_auth_local table", idTag);
+    //DEBUG_INFO("look up card: %s in ocpp_auth_local table", idTag);
     sprintf(sql,"select * from ocpp_auth_local where idtag='%s'", idTag);
 
     /* Execute SQL statement */
@@ -14854,7 +14848,7 @@ int OCPP_addLocalList_1(int version, char *idTag, char *parentTage, char *expiry
 	   return isSuccess;
 	 }
 
-	 DEBUG_INFO("successfully Insert records created\n");
+	// DEBUG_INFO("successfully Insert records created\n");
 	 isSuccess = TRUE;
 	 return isSuccess;
 }