2020.11.13 / Shayne Lo

    Actions:
    1. add inpput configuration 0~9,A
	2. add saftyRegulation Z,M,P,I,L
	3. add network option D,A,Files
	4. fix modelname requirment to 14

    Files:
    1. As follow commit history

    Image version: 1.0.10.0
    Image checksum: XXXXXXXX

    Hardware PWB P/N : XXXXXXX
    Hardware Version : XXXXXXX

20200327.txt

@@ -0,0 +1,16 @@
+    2020.03.27 / Shayne Lo
+
+    Actions:
+    1. Update to ne
+
+    Files:
+    1. As follow commit history
+
+    Image version: 1.0.6.0
+    Image checksum: XXXXXXXX
+
+    Hardware PWB P/N : XXXXXXX
+    Hardware Version : XXXXXXX
+
+\\172.1.2.195\Teams\核心能力軟韌體\Modulization\Software_Module_UPGRADE\Firmware Specification
+\\172.1.2.195\Projects\Software_Design_3\EV\Firmware Header Builder\Release

src/library/PH.Bootloader/obj/Release/PH.Bootloader.csproj.FileListAbsolute.txt

@@ -1 +1,3 @@
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\library\PH.Bootloader\obj\Release\PH.Bootloader.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\library\PH.Bootloader\obj\Release\PH.Bootloader.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\library\PH.Bootloader\obj\Release\PH.Bootloader.csproj.CoreCompileInputs.cache

src/main/DSPBootloader/obj/Release/DSPBootloader.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a70c74e9035979fac95605c441d9ea2c0f44387b
+38518d334575b53aca6fb627c5a65e0b9c169b12

src/main/DSPBootloader/obj/Release/DSPBootloader.csproj.FileListAbsolute.txt

@@ -2,3 +2,8 @@ I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHe
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.Properties.Resources.resources
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.csproj.GenerateResource.cache
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.Form1.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.Properties.Resources.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.csproj.GenerateResource.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.csproj.CoreCompileInputs.cache

src/main/FirmwareHeaderBuilder/Controller/HeaderBuilder.cs

@@ -299,7 +299,7 @@ namespace FirmwareHeaderBuilder.Controller
 
             if (!string.IsNullOrEmpty(name))
             {
-                if (name.Length <= 16)
+                if (name.Length != 14)
                 {
                     try
                     {
@@ -314,7 +314,7 @@ namespace FirmwareHeaderBuilder.Controller
                 }
                 else
                 {
-                    errCode = ErrorCode.ModelNameOverLenLimit;
+                    errCode = ErrorCode.ModelNameLenError;
                 }
             }
             else

src/main/FirmwareHeaderBuilder/Form1.cs

@@ -188,8 +188,8 @@ namespace FirmwareHeaderBuilder
                 case ErrorCode.ModelNameInputTypeError:
                     MessageBox.Show("輸入的 Model Name 出現不合法的字元", "執行", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     break;
-                case ErrorCode.ModelNameOverLenLimit:
-                    MessageBox.Show("輸入的  Model Name 長度過長 (Max.=16)", "執行", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                case ErrorCode.ModelNameLenError:
+                    MessageBox.Show("輸入的  Model Name 長度須為 14", "執行", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     break;
                 case ErrorCode.ReadFileError:
                     MessageBox.Show("讀取映像檔時發生錯誤", "執行", MessageBoxButtons.OK, MessageBoxIcon.Error);

src/main/FirmwareHeaderBuilder/Model/ErrorCode.cs

@@ -15,7 +15,7 @@ namespace FirmwareHeaderBuilder.Model
         /// <summary>產品型號不存在。</summary>
         ModelNameEmpty,
         /// <summary>產品型號超過長度限制。</summary>
-        ModelNameOverLenLimit,
+        ModelNameLenError,
         /// <summary>產品型號輸入型態錯誤。</summary>
         ModelNameInputTypeError,
         /// <summary>產品型號尚未備妥。</summary>

src/main/FirmwareHeaderBuilder/Model/ModelNaming/InputConfiguration.cs

@@ -21,6 +21,29 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
 
         public static InputConfiguration E = new InputConfiguration("E", "1 Phase 2 wires + PE, 100 - 120Vac, 50Hz/60Hz");
 
+        public static InputConfiguration N0 = new InputConfiguration("0", "1 phase 2 wires + PE, CEE 7/7 plug (compatible with Type E and Type F), 220 - 240Vac, 50Hz/60Hz. (For European)");
+
+        public static InputConfiguration N1 = new InputConfiguration("1", "1 phase 2 wires + PE, BS 1363 plug (Type G), 220 - 240Vac, 50Hz/60Hz. (For UK)");
+
+        public static InputConfiguration N2 = new InputConfiguration("2", "1 phase 2 wires + PE, AS/NZS 3112 (Type I), 220 - 240Vac, 50Hz/60Hz. (For Australia, New Zealand)");
+
+        public static InputConfiguration N3 = new InputConfiguration("3", "1 phase 2 wires + PE, GB 2099.1‐2008 and GB 1002‐2008 (Type I), 220 - 240Vac, 50Hz/60Hz. (For China)");
+
+        public static InputConfiguration N4 = new InputConfiguration("4", "1 phase 2 wires + PE, IS1293 plug (Type M), 220 - 240Vac, 50Hz/60Hz. (For Indian and South African)");
+
+        public static InputConfiguration N5 = new InputConfiguration("5", "2 phase 2 wires + PE, NEMA 5-15 plug (Type B), 120 Vac, 50Hz/60Hz.(For UL, TW, Japan)");
+
+        public static InputConfiguration N6 = new InputConfiguration("6", "2 phase 2 wires + PE, NEMA 6-20 plug, 200 - 240Vac, 50Hz/60Hz. (For UL, TW)");
+
+        public static InputConfiguration N7 = new InputConfiguration("7", "2 phase 2 wires + PE, NEMA 14-30 plug, 120 - 240Vac, 50Hz/60Hz. (For UL)");
+
+        public static InputConfiguration N8 = new InputConfiguration("8", "2 phase 2 wires + PE, NEMA 14-50 plug, 120 - 240Vac, 50Hz/60Hz. (For UL)");
+
+        public static InputConfiguration N9 = new InputConfiguration("9", "2 phase 2 wires + PE, NEMA 6-50 plug, 200 - 240Vac, 50Hz/60Hz. (For UL, TW)");
+
+        public static InputConfiguration A = new InputConfiguration("A", "2 phase 2 wires + PE, NEMA 14-60 plug, 200 - 240Vac, 50Hz/60Hz. (For UL)");
+
+
         /// <summary>取得代碼。</summary>
         public string   Code { get; set; }
         /// <summary>取得名稱。</summary>
@@ -46,6 +69,17 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return W;
                 yield return T;
                 yield return E;
+                yield return N0;
+                yield return N1;
+                yield return N2;
+                yield return N3;
+                yield return N4;
+                yield return N5;
+                yield return N6;
+                yield return N7;
+                yield return N8;
+                yield return N9;
+                yield return A;
             }
         }
 
@@ -60,6 +94,17 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return W.Name;
                 yield return T.Name;
                 yield return E.Name;
+                yield return N0.Name;
+                yield return N1.Name;
+                yield return N2.Name;
+                yield return N3.Name;
+                yield return N4.Name;
+                yield return N5.Name;
+                yield return N6.Name;
+                yield return N7.Name;
+                yield return N8.Name;
+                yield return N9.Name;
+                yield return A.Name;
             }
         }
 

src/main/FirmwareHeaderBuilder/Model/ModelNaming/NetworkOption.cs

@@ -21,6 +21,10 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
 
         public static NetworkOption D = new NetworkOption("D", "Ethernet + WiFi + 4G");
 
+        public static NetworkOption A = new NetworkOption("A", "Ethernet + WiFi external antenna + 4G");
+
+        public static NetworkOption F = new NetworkOption("F", "WiFi only");
+
         /// <summary>取得代碼。</summary>
         public string Code { get; set; }
         /// <summary>取得名稱。</summary>
@@ -46,6 +50,8 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return T;
                 yield return U;
                 yield return D;
+                yield return A;
+                yield return F;
             }
         }
 
@@ -60,6 +66,8 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return T.Name;
                 yield return U.Name;
                 yield return D.Name;
+                yield return A.Name;
+                yield return F.Name;
             }
         }
 

src/main/FirmwareHeaderBuilder/Model/ModelNaming/SafetyRegulation.cs

@@ -22,6 +22,16 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
 
         public static SafetyRegulation Z = new SafetyRegulation("Z", "EV ready / French Market");
 
+        public static SafetyRegulation M = new SafetyRegulation("M", "E + MID Meter");
+
+        public static SafetyRegulation P = new SafetyRegulation("P", "E + PTB certification");
+
+        public static SafetyRegulation I = new SafetyRegulation("I", "Z + TIC Meter pcb");
+
+        public static SafetyRegulation F = new SafetyRegulation("F", "Z + MID Meter");
+
+        public static SafetyRegulation L = new SafetyRegulation("L", "U + UL meter");
+
         /// <summary>取得代碼。</summary>
         public string   Code { get; set; }
         /// <summary>取得名稱。</summary>
@@ -49,6 +59,11 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return K;
                 yield return B;
                 yield return Z;
+                yield return M;
+                yield return P;
+                yield return I;
+                yield return F;
+                yield return L;
             }
         }
 
@@ -65,6 +80,11 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return K.Name;
                 yield return B.Name;
                 yield return Z.Name;
+                yield return M.Name;
+                yield return P.Name;
+                yield return I.Name;
+                yield return F.Name;
+                yield return L.Name;
             }
         }
 

src/main/FirmwareHeaderBuilder/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 您可以指定所有的值，或將組建編號或修訂編號設為預設值
 // 指定為預設值: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.9.0")]
-[assembly: AssemblyFileVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.0.10.0")]
+[assembly: AssemblyFileVersion("1.0.10.0")]

src/main/IntegratedBootloader/obj/Release/IntegratedBootloader.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-a70c74e9035979fac95605c441d9ea2c0f44387b
+38518d334575b53aca6fb627c5a65e0b9c169b12

src/main/IntegratedBootloader/obj/Release/IntegratedBootloader.csproj.FileListAbsolute.txt

@@ -2,3 +2,8 @@ I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHe
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.Properties.Resources.resources
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.csproj.GenerateResource.cache
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.Form1.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.Properties.Resources.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.csproj.GenerateResource.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.csproj.CoreCompileInputs.cache

src/main/PIC32Bootloader/obj/Release/PIC32Bootloader.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f89b08c158eb8d0c5081cd65985a015f000ff36f
+969d4b03e7d197cb4540325756ce09921e2a3150

src/main/PIC32Bootloader/obj/Release/PIC32Bootloader.csproj.FileListAbsolute.txt

@@ -3,3 +3,8 @@ I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHe
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.Properties.Resources.resources
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.csproj.GenerateResource.cache
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.Form1.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.Properties.Resources.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.csproj.GenerateResource.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.csproj.CoreCompileInputs.cache

src/main/PIC32Bootloader2/obj/Release/PIC32Bootloader2.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c23516879186cef0154695ff8d193bcf13c122fd
+e6bf318578c41436d2cee64e723aec7f85493fb3

src/main/PIC32Bootloader2/obj/Release/PIC32Bootloader2.csproj.FileListAbsolute.txt

@@ -3,3 +3,8 @@ I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHe
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.Properties.Resources.resources
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.csproj.GenerateResource.cache
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.Form1.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.Properties.Resources.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.csproj.GenerateResource.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.csproj.CoreCompileInputs.cache

src/test/PH.BootloaderTests/obj/Release/PH.BootloaderTests.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f3420313b807970f4114f8c53e7276abe7cc77e4
+ff929958960e4d4f154d93b862e0d058d3adf475

src/test/PH.BootloaderTests/obj/Release/PH.BootloaderTests.csproj.FileListAbsolute.txt

@@ -1,2 +1,4 @@
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\PH.BootloaderTests\obj\Release\PH.BootloaderTests.csprojAssemblyReference.cache
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\PH.BootloaderTests\obj\Release\PH.BootloaderTests.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\PH.BootloaderTests\obj\Release\PH.BootloaderTests.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\PH.BootloaderTests\obj\Release\PH.BootloaderTests.csproj.CoreCompileInputs.cache

src/test/UnitTest_Bootloader.RS485/obj/Release/UnitTest_Bootloader.RS485.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f89b08c158eb8d0c5081cd65985a015f000ff36f
+969d4b03e7d197cb4540325756ce09921e2a3150

src/test/UnitTest_Bootloader.RS485/obj/Release/UnitTest_Bootloader.RS485.csproj.FileListAbsolute.txt

@@ -3,3 +3,8 @@ I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHe
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.Properties.Resources.resources
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.csproj.GenerateResource.cache
 I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.csproj.CoreCompileInputs.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.csprojAssemblyReference.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.Form1.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.Properties.Resources.resources
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.csproj.GenerateResource.cache
+D:\RobertProject\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.csproj.CoreCompileInputs.cache