Browse Source

[Improve][AX80][Module_AlarmDetect]

2021.12.13 / Folus Wen

Actions:
1. QCA7000 flash content check only run one time.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 3 years ago
parent
commit
17429215ea

+ 6 - 3
EVSE/Projects/AX80/Apps/Module_AlarmDetect.c

@@ -288,6 +288,7 @@ int qca7000FlashCheck()
 //==========================================
 int main(void)
 {
+	uint8_t isCheckQca7000[AC_QUANTITY] = {0};
 
 	if(InitShareMemory() == FAIL)
 	{
@@ -1093,9 +1094,9 @@ int main(void)
 			//=====================================
 			// QCA7000 flash content check
 			//=====================================
-			if(((gun_index == 0) && (ShmSysConfigAndInfo->SysConfig.ModelName[9] == '7')) ||
-			   ((gun_index == 1) && (ShmSysConfigAndInfo->SysConfig.ModelName[8] == '7')) ||
-			   ((gun_index == 2) && (ShmSysConfigAndInfo->SysConfig.ModelName[7] == '7')))
+			if((((gun_index == 0) && (ShmSysConfigAndInfo->SysConfig.ModelName[9] == '7')) ||
+			    ((gun_index == 1) && (ShmSysConfigAndInfo->SysConfig.ModelName[8] == '7')) ||
+			    ((gun_index == 2) && (ShmSysConfigAndInfo->SysConfig.ModelName[7] == '7'))) && !isCheckQca7000[gun_index])
 			{
 				if(qca7000FlashCheck() == FAIL)
 				{
@@ -1115,6 +1116,8 @@ int main(void)
 						DEBUG_INFO("ALARM_QCA_FLASH_FAIL : recover \n");
 					}
 				}
+
+				isCheckQca7000[gun_index] = TRUE;
 			}
 
 			//=====================================

+ 1 - 3
EVSE/Projects/AX80/Apps/Module_Cabinet.c

@@ -981,9 +981,7 @@ int main(void)
 	 * 		1. Rotary switch define change with system specification
 	 */
 
-	while(ShmDispenser->gun_info.mcuFlag.isReadFwVerPass ||
-	      ShmDispenser->gun_info.mcuFlag.isSetModelNamePass ||
-	      ShmDispenser->gun_info.mcuFlag.isSetSerialNumberPass)sleep(5);
+	while(ShmDispenser->gun_info.primaryMcuState.cp_state == CP_STATE_UNKNOWN)sleep(5);
 
 	if(ShmDispenser->gun_info.primaryMcuState.rotatory_switch == ROTARY_SWITCH_E_DISPENSER)
 	{

+ 1 - 1
EVSE/Projects/AX80/Apps/main.h

@@ -819,7 +819,6 @@ struct Charger
 struct DISPENSER
 {
 	Evse_Id								evseId;
-	struct SysConfigData				ConfigData;
 	Gun_Info							gun_info;
 	Timeout_Spec						timeoutSpec;
 	Fw_Upgrade_Info						fwUpgradeInfo;
@@ -827,6 +826,7 @@ struct DISPENSER
 	uint16_t							isInitialFail:1;
 	uint16_t							isCcsEnable:1;
 	uint16_t							isConnectedBackend:1;
+	struct SysConfigData				ConfigData;
 };
 
 #endif /* CONFIG_MAIN_H_ */