2020-04-24 / ct_chen

Actions:
1. webservice fix psu version array displaying error

Files:
1. EVSE/Modularization/WebService.c

EVSE/Modularization/WebService.c

@@ -829,6 +829,11 @@ int main(int argc, char *argv[]) {
 		ShmSysConfigAndInfo->SysConfig.Ccs1PlugInTime=0;
 		ShmSysConfigAndInfo->SysConfig.Ccs2PlugInTimes=0;
 		ShmSysConfigAndInfo->SysConfig.ChademoPlugInTimes=0;
+		// strcpy((char *)&ShmPsuData->PsuVersion[0].FwPrimaryVersion, "DC 9.01");
+		// strcpy((char *)&ShmPsuData->PsuVersion[1].FwPrimaryVersion, "DC 9.02");
+		// strcpy((char *)&ShmPsuData->PsuVersion[0].FwSecondVersion, "PFC 9.02");
+		// strcpy((char *)&ShmPsuData->PsuVersion[1].FwSecondVersion, "PFC 9.03");
+
 		//charging
 		ShmSysConfigAndInfo->SysConfig.MaxChargingEnergy=0;
 		ShmSysConfigAndInfo->SysConfig.MaxChargingPower=0;
@@ -908,6 +913,10 @@ int main(int argc, char *argv[]) {
 		struct SysConfigData 	SysConfig;
 		memcpy(&SysConfig, &ShmSysConfigAndInfo->SysConfig, sizeof(struct SysConfigData));
 		StoreUsrConfigData(&SysConfig);
+		
+		// struct PsuModuleVer 	PsuData;
+		// memcpy(&PsuData, &ShmPsuData->PsuVersion, sizeof(struct PsuModuleVer));
+		// StoreUsrConfigData(&PsuData);
 
 		#ifdef SystemLogMessage
 		DEBUG_INFO("WebService initial OK");
@@ -1236,8 +1245,10 @@ int main(int argc, char *argv[]) {
 		FirmwareUpdate = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.FirmwareUpdate);
 		if(strcmp(IsAcDc, "D") == 0){
 			for(int i=0;i<PsuQuantity;i++){
-				FwPrimaryVersion[i] = json_object_new_string((char *)&ShmPsuData->PsuVersion->FwPrimaryVersion[i]);
-				FwSecondVersion[i] = json_object_new_string((char *)&ShmPsuData->PsuVersion->FwSecondVersion[i]);
+				FwPrimaryVersion[i] = json_object_new_string((char *)&ShmPsuData->PsuVersion[i].FwPrimaryVersion);
+				FwSecondVersion[i] = json_object_new_string((char *)&ShmPsuData->PsuVersion[i].FwSecondVersion);
+				json_object_array_add(FwPrimaryVersionArr,FwPrimaryVersion[i]);
+				json_object_array_add(FwSecondVersionArr,FwSecondVersion[i]);
 			}
 		}
 
@@ -1663,10 +1674,6 @@ int main(int argc, char *argv[]) {
 		json_object_object_add(jobj1,"ChademoPlugInTimes",ChademoPlugInTimes);
 		json_object_object_add(jobj1,"FirmwareUpdate",FirmwareUpdate);
 		if(strcmp(IsAcDc, "D") == 0){
-			for(int i=0;i<PsuQuantity;i++){
-				json_object_array_add(FwPrimaryVersionArr,FwPrimaryVersion[i]);
-				json_object_array_add(FwSecondVersionArr,FwSecondVersion[i]);
-			}
 			json_object_object_add(jobj1,"FwPrimaryVersion",FwPrimaryVersionArr);
 			json_object_object_add(jobj1,"FwSecondVersion",FwSecondVersionArr);
 		}