[Improve][AW-CCS][Module_AlarmDetect.c]

2022-12-28 / EASON YANG
Action:
1. Improve : Europe over current protection magnification 125 -> 115.
2. Added : More Europe model name.
3. Improve : Europe over current protection threshold.

File:
1.Module_AlarmDetect.c
Action 1
Action 2
Action 3

FIRMWARE VERSION: AX-32 = B0.64.XX.XXXX.PX / AX-48 = V0.64.XX.XXXX.PX / AX-80 = B0.64.XX.XXXX.PX

EVSE/Projects/AW-CCS/Apps/Module_AlarmDetect.c

@@ -332,30 +332,34 @@ int qca7000FlashCheck()
 void ccsOverCurrentProtection(uint8_t gun_index)
 {	
 	if((ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'E') ||
-	   (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'T') ||
-	   (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'Z'))
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'T') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'Z') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'M') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'P') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'I') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'F'))
 	{
-		Over_Current[gun_index].OC_BegThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) - 100;
-		Over_Current[gun_index].OC_EndThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) - 200;
-	}
-	else
-	{
-		if(ShmCharger->gun_info[gun_index].targetCurrent > 20)
-		{
-			Over_Current[gun_index].OC_BegThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) + 0;
-			Over_Current[gun_index].OC_EndThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) - 200;
-		}
-		else
-		{
-			Over_Current[gun_index].OC_BegThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * 100) + 200;
-			Over_Current[gun_index].OC_EndThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * 100) + 0;
-		}
-	}
+        Over_Current[gun_index].OC_BegThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) + 0;
+        Over_Current[gun_index].OC_EndThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) - 200;
+    }
+    else
+    {
+        if(ShmCharger->gun_info[gun_index].targetCurrent > 20)
+        {
+            Over_Current[gun_index].OC_BegThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) + 0;
+            Over_Current[gun_index].OC_EndThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * OCP_Magnification) - 200;
+        }
+        else
+        {
+            Over_Current[gun_index].OC_BegThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * 100) + 200;
+            Over_Current[gun_index].OC_EndThreshold = (ShmCharger->gun_info[gun_index].targetCurrent * 100) + 0;
+        }
+    }
 	
 	#ifdef isDebugPrint
-	DEBUG_INFO("Gun-[%d] OC_BegThreshold: %d \n", gun_index, Over_Current[gun_index].OC_BegThreshold);
-	DEBUG_INFO("Gun-[%d] OC_EndThreshold: %d \n", gun_index, Over_Current[gun_index].OC_EndThreshold);
-	#endif
+    DEBUG_INFO("Gun-[%d] OC_BegThreshold: %d \n", gun_index, Over_Current[gun_index].OC_BegThreshold);
+    DEBUG_INFO("Gun-[%d] OC_EndThreshold: %d \n", gun_index, Over_Current[gun_index].OC_EndThreshold);
+    #endif
 }
 	
 
@@ -379,11 +383,15 @@ int main(void)
 	}
 	
 	if((ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'E') ||
-	   (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'T') ||
-	   (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'Z'))
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'T') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'Z') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'M') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'P') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'I') ||
+       (ShmSysConfigAndInfo->SysConfig.ModelName[3] == 'F'))
 	{
 		// Europe
-		OCP_Magnification = 125;
+		OCP_Magnification = 115;
 	}
 	else
 	{

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

@@ -3479,26 +3479,26 @@ void get_firmware_version(unsigned char gun_index)
 	   (ShmSysConfigAndInfo->SysConfig.ModelName[6] == '1'))
 	{
 		// AX-48 BOM VERSION: A1
-		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.63.00.0000.00");
+		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "V0.64.00.0000.00");
 	}
 	else if((ShmSysConfigAndInfo->SysConfig.ModelName[4] == '2') &&
 	        (ShmSysConfigAndInfo->SysConfig.ModelName[5] == '2') &&
 	        (ShmSysConfigAndInfo->SysConfig.ModelName[6] == '1'))
 	{
 		// AX-32 BOM VERSION: A0
-		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.63.00.0000.00");
+		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.64.00.0000.00");
 	}
 	else if((ShmSysConfigAndInfo->SysConfig.ModelName[4] == '1') &&
 	        (ShmSysConfigAndInfo->SysConfig.ModelName[5] == '9') &&
 	        (ShmSysConfigAndInfo->SysConfig.ModelName[6] == '1'))
 	{
 		// AX-80 BOM VERSION: A0
-		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.63.00.0000.00");
+		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.64.00.0000.00");
 	}
 	else
 	{
 		// Unknown 
-		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.63.00.0000.00");
+		sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.64.00.0000.00");
 	}
 
 	// Get AC connector type from model name