[Improve][Modularization][Module_Upgrade]

2021.03.08 / Folus Wen

Actions:
1. Model name check rule change to only valid EVSE Type, Connector Type, Generation, Customization.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/Module_Upgrade.c

@@ -177,15 +177,20 @@ int Upgrade_Flash(unsigned int Type,char *SourcePath,char *ModelName)
     DEBUG_INFO("Delete source file.\n");
 
     //read out the header
-    int i;
     int isModelNameOK = PASS;
-    for(i=0;i<16;i++)
-    {
-        if(ModelName[i] != ptr[i])
-        {
-            isModelNameOK = FAIL;
-        }
-    }
+
+	if((ModelName[0] != ptr[0]) ||
+	   (ModelName[1] != ptr[1]) ||
+	   (ModelName[7] != ptr[7]) ||
+	   (ModelName[8] != ptr[8]) ||
+	   (ModelName[9] != ptr[9]) ||
+	   (ModelName[11] != ptr[11]) ||
+	   (ModelName[12] != ptr[12]) ||
+	   (ModelName[13] != ptr[13]))
+	{
+		isModelNameOK = FAIL;
+	}
+
 
     if(isModelNameOK == FAIL)
     {
@@ -681,15 +686,20 @@ int Upgrade_UART(int uartfdOrd,unsigned int Type,unsigned char TargetAddr,char *
     ImageLen = read(fd,ptr,MaxLen);
     close(fd);
     //read out the header
-    int i;
     int isModelNameOK = PASS;
-    for(i=0;i<16;i++)
-    {
-        if(ModelName[i] != ptr[i])
-        {
-            isModelNameOK = FAIL;
-        }
-    }
+
+    if((ModelName[0] != ptr[0]) ||
+	   (ModelName[1] != ptr[1]) ||
+	   (ModelName[7] != ptr[7]) ||
+	   (ModelName[8] != ptr[8]) ||
+	   (ModelName[9] != ptr[9]) ||
+	   (ModelName[11] != ptr[11]) ||
+	   (ModelName[12] != ptr[12]) ||
+	   (ModelName[13] != ptr[13]))
+	{
+		isModelNameOK = FAIL;
+	}
+
 
     if(isModelNameOK == FAIL)
     {
@@ -970,13 +980,20 @@ int Upgrade_CAN(int canfd,unsigned int Type,unsigned char TargetAddr,char *Sourc
     ImageLen = read(fd,ptr,MaxLen);
     close(fd);
     //read out the header
-    int i;
     int isModelNameOK = PASS;
-    for(i=0;i<16;i++) {
-        if(ModelName[i] != ptr[i]){
-            isModelNameOK = FAIL;
-        }
-    }
+
+    if((ModelName[0] != ptr[0]) ||
+	   (ModelName[1] != ptr[1]) ||
+	   (ModelName[7] != ptr[7]) ||
+	   (ModelName[8] != ptr[8]) ||
+	   (ModelName[9] != ptr[9]) ||
+	   (ModelName[11] != ptr[11]) ||
+	   (ModelName[12] != ptr[12]) ||
+	   (ModelName[13] != ptr[13]))
+	{
+		isModelNameOK = FAIL;
+	}
+
 
     if(isModelNameOK == FAIL)
     {
@@ -1096,14 +1113,18 @@ int Check_CCS_image_header(unsigned int Type,char *SourcePath,char *ModelName)
     ImageLen = read(fd,ptr,MaxLen);
     close(fd);
     //read out the header
-    int i;
     int isModelNameOK = PASS;
-	for(i=0;i<16;i++)
+
+    if((ModelName[0] != ptr[0]) ||
+	   (ModelName[1] != ptr[1]) ||
+	   (ModelName[7] != ptr[7]) ||
+	   (ModelName[8] != ptr[8]) ||
+	   (ModelName[9] != ptr[9]) ||
+	   (ModelName[11] != ptr[11]) ||
+	   (ModelName[12] != ptr[12]) ||
+	   (ModelName[13] != ptr[13]))
 	{
-		if(ModelName[i] != ptr[i])
-		{
-			isModelNameOK = FAIL;
-		}
+		isModelNameOK = FAIL;
 	}
 
 	if(isModelNameOK == FAIL)