Browse Source

2020-05-21 / Eason Yang
1.Change : main.c Reason : Rename version
2.Change : Module_InternalComm.c Reason : Fixed CSU reset MCU logic
Version : B0.42.XX.XXXX.XX

8009 4 năm trước cách đây
mục cha
commit
94da791b5e

+ 17 - 14
EVSE/Projects/AW-Regular/Apps/Module_InternalComm.c

@@ -2000,25 +2000,28 @@ int main(void)
 				//===============================
 				// Case 7 : Config primary MCU reset request
 				//===============================
-				if(ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest == ON)
+				if((access("/sys/class/gpio/gpio116/value", F_OK)) != -1)
 				{
-					if(Config_AC_MCU_RESET_REQUEST(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].mcuResetRequest) == PASS)
+					if(ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest == ON)
 					{
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("********* High priority polling : Case 7 *********\r\n");
-						DEBUG_INFO("**************************************************\r\n");
-						DEBUG_INFO("MCU-%d set MCU reset Request : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest);
+						if(Config_AC_MCU_RESET_REQUEST(Uart1Fd, (gun_index>0?ADDR_AC_PRIMARY_2:ADDR_AC_PRIMARY_1), &ShmCharger->gun_info[gun_index].mcuResetRequest) == PASS)
+						{
+							DEBUG_INFO("**************************************************\r\n");
+							DEBUG_INFO("********* High priority polling : Case 7 *********\r\n");
+							DEBUG_INFO("**************************************************\r\n");
+							DEBUG_INFO("MCU-%d set MCU reset Request : %d\r\n", gun_index, ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest);
 
-						ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest = OFF;
+							ShmCharger->gun_info[gun_index].mcuResetRequest.isMcuResetRequest = OFF;
 
-						failCount[gun_index] = 0;
-					}
-					else
-					{
-						DEBUG_WARN("MCU-%d get MCU reset fail...%d\r\n", gun_index, failCount[gun_index]);
-						if(failCount[gun_index]<1000)
+							failCount[gun_index] = 0;
+						}
+						else
 						{
-							failCount[gun_index]++;
+							DEBUG_WARN("MCU-%d get MCU reset fail...%d\r\n", gun_index, failCount[gun_index]);
+							if(failCount[gun_index]<1000)
+							{
+								failCount[gun_index]++;
+							}
 						}
 					}
 				}

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

@@ -1181,7 +1181,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.41.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.42.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)

BIN
EVSE/Projects/AW-Regular/Images/FactoryDefaultConfig.bin


BIN
EVSE/Projects/AW-Regular/Images/ramdisk.gz