Эх сурвалжийг харах

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

FolusWen 4 жил өмнө
parent
commit
54f2e87ee6

+ 8 - 1
EVSE/Projects/Noodoe/Apps/main.c

@@ -1270,7 +1270,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 
 	// Get CSU root file system version
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.47.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.48.00.0000.00");
 
 
 	// Get AC connector type from model name
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2401,6 +2401,7 @@ int main(void)
 						{
 						{
 							DEBUG_INFO("URL is empty kill Module_OcppBackend...\n");
 							DEBUG_INFO("URL is empty kill Module_OcppBackend...\n");
 							system ("pkill OcppBackend");
 							system ("pkill OcppBackend");
+							LoadSysConfigAndInfo(&ShmSysConfigAndInfo->SysConfig);
 						}
 						}
 
 
 						// If rotate switch equal zero, the system needs to change Debug mode
 						// If rotate switch equal zero, the system needs to change Debug mode
@@ -2579,6 +2580,9 @@ int main(void)
 					{
 					{
 						// Authorization timeout process.
 						// Authorization timeout process.
 						ShmCharger->gun_info[gun_index].rfidReq = OFF;
 						ShmCharger->gun_info[gun_index].rfidReq = OFF;
+						setSpeaker(ON,SPEAKER_INTERVAL_3COUNT);
+						setLedMotion(gun_index,LED_ACTION_RFID_FAIL);
+						sleep(3);
 						setChargerMode(gun_index, SYS_MODE_IDLE);
 						setChargerMode(gun_index, SYS_MODE_IDLE);
 						DEBUG_WARN("Authorize timeout !!!\n");
 						DEBUG_WARN("Authorize timeout !!!\n");
 					}
 					}
@@ -3483,6 +3487,9 @@ int main(void)
 								sprintf((char*)ShmOCPP16Data->FirmwareStatusNotification.Status, "InstallationFailed");
 								sprintf((char*)ShmOCPP16Data->FirmwareStatusNotification.Status, "InstallationFailed");
 								ShmOCPP16Data->SpMsg.bits.FirmwareStatusNotificationReq = ON;
 								ShmOCPP16Data->SpMsg.bits.FirmwareStatusNotificationReq = ON;
 								DEBUG_WARN("Firmware upgrade fail.\n");
 								DEBUG_WARN("Firmware upgrade fail.\n");
+								
+								sleep(1);
+								system("rm -rvf /mnt/* ");
 								close(wtdFd);
 								close(wtdFd);
 								system("/usr/bin/run_evse_restart.sh");
 								system("/usr/bin/run_evse_restart.sh");
 							}
 							}

BIN
EVSE/Projects/Noodoe/Images/ramdisk.gz


BIN
EVSE/rootfs/root/OcppBackend20