Merge branch 'AW-Regular' of https://git.phihong.com.tw:30000/System_Integration/CSU3_AM335x into AW-Regular

EVSE/Projects/AW-Regular/Apps/main.c

@@ -1063,7 +1063,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.16.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.17.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2299,7 +2299,6 @@ int main(void)
 						}
 
 						setLedMotion(gun_index, LED_ACTION_STOP);
-						setRelay(gun_index, OFF);
 						getDateTimeString((char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StopDateTime);
 					}
 
@@ -2418,6 +2417,7 @@ int main(void)
 					   ShmOCPP16Data->MsMsg.bits.ResetReq)
 					{
 						setSpeaker(ON,SPEAKER_SHORT);
+						setRelay(gun_index, OFF);
 						sleep(5);
 
 						if(!ShmCharger->gun_info[gun_index].primaryMcuState.relay_state)

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/.version

@@ -1 +1 @@
-399
+400