2022-04-14/Jerry Wang

Action:
1. Modify configuration keys 'isEnableLocalPowerSharing','PowerSharingServerIP' saving logic.
2. Correct all 'isEnableLocalPowerSharing' related naming word.
3. Add enum item 'IdTokenType_MacAddress' in OCPP_START_ID_TYPE and relocate items.

File:
1. EVSE/Modularization/ocppfiles/MessageHandler.c
--> Action 1,2
2. EVSE/Modularization/ocppfiles/MessageHandler.h
--> Action 2
3. EVSE/Modularization/ocppph/MessageHandler.c
--> Action 1,2
4. EVSE/Modularization/ocppph/MessageHandler.h
--> Action 2
5. define.h
--> Action 2,3

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -9996,7 +9996,7 @@ int handleChangeConfigurationRequest(char *uuid, char *payload)
 		SetOcppConnStatus(FALSE);
 	}
 
-	if(((strcmp(keystr,"FreeVend")==0)) && (strcmp(comfirmstr,"Accepted")==0))
+	if(((strcmp(keystr,"FreeVend")==0) || (strcmp(keystr,"isEnableLocalPowerSharing")==0) || (strcmp(keystr,"PowerSharingServerIP")==0)) && (strcmp(comfirmstr,"Accepted")==0))
 	{
 		StoreUsrConfigData(&ShmSysConfigAndInfo->SysConfig);
 	}
@@ -16266,17 +16266,17 @@ int initialConfigurationTable(void)
 
 		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","PreAuthAmount", "false", ShmOCPP16Data->ConfigurationTable.CoreProfile[PreAuthAmount].ItemData);
 
-		// isEnableLocalPowersharing
-		ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility = 1;
-		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemName, "isEnableLocalPowersharing");
-		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "0" );
+		// isEnableLocalPowerSharing
+		ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility = 1;
+		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemName, "isEnableLocalPowerSharing");
+		sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "%d", ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing);
 
-		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowersharing", "false", ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData);
+		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowerSharing", "false", ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData);
 
 		// PowerSharingServerIP
 		ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemAccessibility = 1;
 		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemName, "PowerSharingServerIP");
-		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, "" );
+		memcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, (char*)ShmSysConfigAndInfo->SysConfig.PowerSharingServerIP, 500);
 
 		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","PowerSharingServerIP", "false", ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData);
 
@@ -16757,16 +16757,16 @@ int initialConfigurationTable(void)
 					sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PreAuthAmount].ItemData, "%.2f", atof(valuestr));
 				}
 
-				if(strcmp(keystr, "isEnableLocalPowersharing") == 0)
+				if(strcmp(keystr, "isEnableLocalPowerSharing") == 0)
 				{
-					ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
-					sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "%d", atoi(valuestr));
+					ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
+					sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "%d", ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing);
 				}
 
 				if(strcmp(keystr, "PowerSharingServerIP") == 0)
 				{
 					ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
-					sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, "%s",valuestr);
+					memcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, (char *)ShmSysConfigAndInfo->SysConfig.PowerSharingServerIP,500);
 				}
 
 				if(strcmp(keystr, "EVCCID_PREFIX") == 0)
@@ -17334,14 +17334,14 @@ void StoreConfigurationTable(void)
 
 	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","PreAuthAmount", "false", (char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[PreAuthAmount].ItemData);
 
-	// isEnableLocalPowersharing
+	// isEnableLocalPowerSharing
 	/*
-	ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility = 1;
-	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemName, "isEnableLocalPowersharing");
-	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "0" );
+	ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility = 1;
+	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemName, "isEnableLocalPowerSharing");
+	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "0" );
 	*/
 
-	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowersharing", "false", (char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData);
+	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowerSharing", "false", (char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData);
 
 	// PowerSharingServerIP
 	/*
@@ -18404,21 +18404,21 @@ void getKeyValue(char *keyReq)
 			  isKnowKey = TRUE;
 		  }
 
-		  if(isEmpty ||  strcmp(keyReq, "isEnableLocalPowersharing") == 0 )
+		  if(isEmpty ||  strcmp(keyReq, "isEnableLocalPowerSharing") == 0 )
 		  {
-			  strcpy((char *)ShmOCPP16Data->GetConfiguration.Key[GetConfiguration_isEnableLocalPowersharing].Item, "isEnableLocalPowersharing");
-			  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].Key, "isEnableLocalPowersharing");
+			  strcpy((char *)ShmOCPP16Data->GetConfiguration.Key[GetConfiguration_isEnableLocalPowerSharing].Item, "isEnableLocalPowerSharing");
+			  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].Key, "isEnableLocalPowerSharing");
 
-			  if(ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility == 1)
+			  if(ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility == 1)
 			  {
-				  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].ReadOnly, "0"/*"FALSE"*/);
+				  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].ReadOnly, "0"/*"FALSE"*/);
 			  }
 			  else
 			  {
-				  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].ReadOnly, "1"/*"TRUE"*/);
+				  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].ReadOnly, "1"/*"TRUE"*/);
 			  }
 
-			  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].Value, (const char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData );
+			  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].Value, (const char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData );
 			  isKnowKey = TRUE;
 		  }
 
@@ -19753,9 +19753,9 @@ int setKeyValue(char *key, char *value)
 		}
 	}
 
-	if(strcmp(key, "isEnableLocalPowersharing") == 0)
+	if(strcmp(key, "isEnableLocalPowerSharing") == 0)
 	{
-		if(ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility == 1)
+		if(ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility == 1)
 		{
 			check_ascii = value[0];
 			if( (check_ascii < 48) || (check_ascii > 57) )
@@ -19766,7 +19766,8 @@ int setKeyValue(char *key, char *value)
 			{
 				if(atoi(value) >= 0)
 				{
-					sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "%d", atoi(value) );
+					sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "%d", atoi(value));
+					ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing = (unsigned char)atoi(value);
 					isSuccess = ConfigurationStatus_Accepted;
 				}
 				else

EVSE/Modularization/ocppfiles/MessageHandler.h

@@ -403,7 +403,7 @@ enum GetConfigurationKey {
 	GetConfiguration_StatusNotificationPeriodically,
 	GetConfiguration_StatusNotificationInterval,
 	GetConfiguration_PreAuthAmount,
-	GetConfiguration_isEnableLocalPowersharing,
+	GetConfiguration_isEnableLocalPowerSharing,
 	GetConfiguration_PowerSharingServerIP,
 	GetConfiguration_EVCCID_PREFIX,
 	GetConfiguration_LocalAuthListEnabled,

EVSE/Modularization/ocppph/MessageHandler.c

@@ -9534,7 +9534,7 @@ int handleChangeConfigurationRequest(char *uuid, char *payload)
 		SetOcppConnStatus(FALSE);
 	}
 
-	if(((strcmp(keystr,"FreeVend")==0)) && (strcmp(comfirmstr,"Accepted")==0))
+	if(((strcmp(keystr,"FreeVend")==0) || (strcmp(keystr,"isEnableLocalPowerSharing")==0) || (strcmp(keystr,"PowerSharingServerIP")==0)) && (strcmp(comfirmstr,"Accepted")==0))
 	{
 		StoreUsrConfigData(&ShmSysConfigAndInfo->SysConfig);
 	}
@@ -15733,17 +15733,17 @@ int initialConfigurationTable(void)
 
 		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","StatusNotificationInterval", "false", ShmOCPP16DataPH->ConfigurationTable.CoreProfile[StatusNotificationInterval].ItemData);
 
-		// isEnableLocalPowersharing
-		ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility = 1;
-		strcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemName, "isEnableLocalPowersharing");
-		strcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "0" );
+		// isEnableLocalPowerSharing
+		ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility = 1;
+		strcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemName, "isEnableLocalPowerSharing");
+		strcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "%d", ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing);
 
-		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowersharing", "false", ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData);
+		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowerSharing", "false", ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData);
 
 		// PowerSharingServerIP
 		ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemAccessibility = 1;
 		strcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemName, "PowerSharingServerIP");
-		strcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, "" );
+		memcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, (char*)ShmSysConfigAndInfo->SysConfig.PowerSharingServerIP, 500);
 
 		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","PowerSharingServerIP", "false", ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData);
 
@@ -16201,16 +16201,16 @@ int initialConfigurationTable(void)
 					sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[StatusNotificationInterval].ItemData, "%d", atoi(valuestr));
 				}
 
-				if(strcmp(keystr, "isEnableLocalPowersharing") == 0)
+				if(strcmp(keystr, "isEnableLocalPowerSharing") == 0)
 				{
-					ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
-					sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "%d", atoi(valuestr));
+					ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
+					sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "%d", ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing);
 				}
 
 				if(strcmp(keystr, "PowerSharingServerIP") == 0)
 				{
 					ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
-					sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, "%s",valuestr);
+					memcpy((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[PowerSharingServerIP].ItemData, (char *)ShmSysConfigAndInfo->SysConfig.PowerSharingServerIP,500);
 				}
 
 				if(strcmp(keystr, "EVCCID_PREFIX") == 0)
@@ -16741,14 +16741,14 @@ void StoreConfigurationTable(void)
 
 	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","StatusNotificationInterval", "false", (char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[StatusNotificationInterval].ItemData);
 
-	// isEnableLocalPowersharing
+	// isEnableLocalPowerSharing
 	/*
-	ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility = 1;
-	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemName, "isEnableLocalPowersharing");
-	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "0" );
+	ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility = 1;
+	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemName, "isEnableLocalPowerSharing");
+	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "0" );
 	*/
 
-	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowersharing", "false", (char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData);
+	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","isEnableLocalPowerSharing", "false", (char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData);
 
 	// PowerSharingServerIP
 	/*
@@ -17739,21 +17739,21 @@ void getKeyValue(char *keyReq)
 			  isKnowKey = TRUE;
 		  }
 
-		  if(isEmpty ||  strcmp(keyReq, "isEnableLocalPowersharing") == 0 )
+		  if(isEmpty ||  strcmp(keyReq, "isEnableLocalPowerSharing") == 0 )
 		  {
-			  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.Key[GetConfiguration_isEnableLocalPowersharing].Item, "isEnableLocalPowersharing");
-			  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].Key, "isEnableLocalPowersharing");
+			  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.Key[GetConfiguration_isEnableLocalPowerSharing].Item, "isEnableLocalPowerSharing");
+			  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].Key, "isEnableLocalPowerSharing");
 
-			  if(ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility == 1)
+			  if(ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility == 1)
 			  {
-				  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].ReadOnly, "0"/*"FALSE"*/);
+				  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].ReadOnly, "0"/*"FALSE"*/);
 			  }
 			  else
 			  {
-				  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].ReadOnly, "1"/*"TRUE"*/);
+				  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].ReadOnly, "1"/*"TRUE"*/);
 			  }
 
-			  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowersharing].Value, (const char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData );
+			  strcpy((char *)ShmOCPP16DataPH->GetConfiguration.ResponseConfigurationKey[GetConfiguration_isEnableLocalPowerSharing].Value, (const char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData );
 			  isKnowKey = TRUE;
 		  }
 
@@ -19031,9 +19031,9 @@ int setKeyValue(char *key, char *value)
 		}
 	}
 
-	if(strcmp(key, "isEnableLocalPowersharing") == 0)
+	if(strcmp(key, "isEnableLocalPowerSharing") == 0)
 	{
-		if(ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemAccessibility == 1)
+		if(ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemAccessibility == 1)
 		{
 			check_ascii = value[0];
 			if( (check_ascii < 48) || (check_ascii > 57) )
@@ -19044,7 +19044,8 @@ int setKeyValue(char *key, char *value)
 			{
 				if(atoi(value) >= 0)
 				{
-					sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowersharing].ItemData, "%d", atoi(value) );
+					sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[isEnableLocalPowerSharing].ItemData, "%d", atoi(value) );
+					ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharing = (unsigned char)atoi(value);
 					isSuccess = ConfigurationStatus_Accepted;
 				}
 				else

EVSE/Modularization/ocppph/MessageHandler.h

@@ -399,7 +399,7 @@ enum GetConfigurationKey {
 	GetConfiguration_MaintainServer,
 	GetConfiguration_StatusNotificationPeriodically,
 	GetConfiguration_StatusNotificationInterval,
-	GetConfiguration_isEnableLocalPowersharing,
+	GetConfiguration_isEnableLocalPowerSharing,
 	GetConfiguration_PowerSharingServerIP,
 	GetConfiguration_EVCCID_PREFIX,
 	GetConfiguration_LocalAuthListEnabled,

EVSE/Projects/define.h

@@ -329,7 +329,7 @@ enum CoreProfile {
      StatusNotificationPeriodically,
      StatusNotificationInterval,
 	 PreAuthAmount,
-	 isEnableLocalPowersharing,
+	 isEnableLocalPowerSharing,
 	 PowerSharingServerIP,
 	 EVCCID_PREFIX,
      ConfigurationVersion,
@@ -345,10 +345,11 @@ enum OCPP_START_ID_TYPE {
     IdTokenType_Central=0,
     IdTokenType_eMAID,
     IdTokenType_ISO14443,
+	IdTokenType_ISO15693,
     IdTokenType_KeyCode,
     IdTokenType_Local,
-    IdTokenType_NoAuthorization,
-    IdTokenType_ISO15693
+	IdTokenType_MacAddress,
+    IdTokenType_NoAuthorization
 };
 /**************************************************************************************/
 /****structure SysConfigData => shall store the data to NAND flash****************/
@@ -576,7 +577,7 @@ struct SysConfigData
 	struct LED				LedInfo;					// LED configuration info
 	unsigned char			ShowInformation;
 	unsigned char           isReqFirstUpgrade;          //EVSE is request first upgrade from PH server
-	unsigned char           isEnableLocalPowerSharging; //0: Disable power sharing  1: Master	2: Slave
+	unsigned char           isEnableLocalPowerSharing; //0: Disable power sharing  1: Master	2: Slave
 	unsigned char           StopChargingByButton;       //0: Disable  1: Enable
     struct LCD_NOUSE        Legacy_LcdOveride;          // LCD override info (no use anymore)
     struct TTIA             TTIA_Info;                  // TTIA configuration struct
@@ -629,7 +630,7 @@ struct ChargingInfoData
 	unsigned char PilotState;//1:state A, 2:State B1, 3:State B2, 4:State C, 5:State D, 6:State E, 7:State F, 8: Pilot error
 	unsigned char PilotDuty;					// 0~100%
 	unsigned char			StartUserId[32];			// This ID is trigger start charging event user by RFID, back-end, BLE.
-	unsigned char           StartIdType;                // 0: Central   1: eMAID    2: ISO14443 3: ISO15693 4: KeyCode  5: Local    6: MaxAddress   7: NoAuthorization
+	unsigned char           StartIdType;                // 0: Central   1: eMAID    2: ISO14443 3: ISO15693 4: KeyCode  5: Local    6: MacAddress   7: NoAuthorization
 	unsigned char			StartDateTime[32];			// Charging cycle start date time
 	unsigned char			StopDateTime[32];			// Charging cycle stop date time
 	unsigned char			StartMethod;