2020.06.19 / Shayne Lo

    Actions:
    1. add new option "D: Ethernet + WiFi + 4G" to NetWork Option
	2. replace output file name where "merged" replaced by ModelName

    Files:
    1. As follow commit history

    Image version: 1.0.9.0
    Image checksum: XXXXXXXX

    Hardware PWB P/N : XXXXXXX
    Hardware Version : XXXXXXX

src/library/PH.Bootloader/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

src/library/PH.Bootloader/obj/Release/PH.Bootloader.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+4810e1e24b8218f1f63ba80f444442ca8147615c

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

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

src/main/DSPBootloader/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

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

@@ -0,0 +1 @@
+a70c74e9035979fac95605c441d9ea2c0f44387b

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

@@ -0,0 +1,4 @@
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\DSPBootloader\obj\Release\DSPBootloader.Form1.resources
+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

src/main/FirmwareHeaderBuilder/Controller/HeaderBuilder.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net.NetworkInformation;
 using System.Text;
 using FirmwareHeaderBuilder.Model;
 using FirmwareHeaderBuilder.Model.ModelNaming;
@@ -18,6 +19,8 @@ namespace FirmwareHeaderBuilder.Controller
         private ImageType   imageType;
         private CRC32       crc32Handler;
 
+        private string      modelName;
+
         /// <summary>初始化 HeaderBuilder 類別的新執行個體。</summary>
         public HeaderBuilder()
         {
@@ -26,6 +29,8 @@ namespace FirmwareHeaderBuilder.Controller
             modelNameArray = null;
             isModelNameReady = false;
 
+            modelName = "";
+
             crc32Handler = CRC32.GetInatance();
         }
 
@@ -84,9 +89,9 @@ namespace FirmwareHeaderBuilder.Controller
                 string newFilePath;
 
                 if (string.IsNullOrEmpty(ext)) {
-                    newFilePath = fullPath + "_merged";
+                    newFilePath = fullPath + "_" + modelName;
                 } else {
-                    newFilePath = fullPath.Replace(ext, "_merged" + ext);
+                    newFilePath = fullPath.Replace(ext, "_" + modelName + ext);
                 }
 
                 File.WriteAllBytes(newFilePath, contents.ToArray());
@@ -299,6 +304,7 @@ namespace FirmwareHeaderBuilder.Controller
                     try
                     {
                         modelNameArray = Encoding.ASCII.GetBytes(name);
+                        modelName = name;
                         isModelNameReady = true;
                     }
                     catch

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

@@ -19,6 +19,8 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
 
         public static NetworkOption U = new NetworkOption("U", "Ethernet + Bluetooth");
 
+        public static NetworkOption D = new NetworkOption("D", "Ethernet + WiFi + 4G");
+
         /// <summary>取得代碼。</summary>
         public string Code { get; set; }
         /// <summary>取得名稱。</summary>
@@ -43,6 +45,7 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return W;
                 yield return T;
                 yield return U;
+                yield return D;
             }
         }
 
@@ -56,6 +59,7 @@ namespace FirmwareHeaderBuilder.Model.ModelNaming
                 yield return W.Name;
                 yield return T.Name;
                 yield return U.Name;
+                yield return D.Name;
             }
         }
 

src/main/FirmwareHeaderBuilder/Properties/AssemblyInfo.cs

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

src/main/IntegratedBootloader/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

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

@@ -0,0 +1 @@
+a70c74e9035979fac95605c441d9ea2c0f44387b

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

@@ -0,0 +1,4 @@
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\IntegratedBootloader\obj\Release\IntegratedBootloader.Form1.resources
+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

src/main/PIC32Bootloader/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

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

@@ -0,0 +1 @@
+f89b08c158eb8d0c5081cd65985a015f000ff36f

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

@@ -0,0 +1,5 @@
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.csprojAssemblyReference.cache
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader\obj\Release\PIC32Bootloader.Form1.resources
+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

src/main/PIC32Bootloader2/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

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

@@ -0,0 +1 @@
+c23516879186cef0154695ff8d193bcf13c122fd

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

@@ -0,0 +1,5 @@
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.csprojAssemblyReference.cache
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\main\PIC32Bootloader2\obj\Release\PIC32Bootloader2.Form1.resources
+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

src/test/PH.BootloaderTests/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

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

@@ -0,0 +1 @@
+f3420313b807970f4114f8c53e7276abe7cc77e4

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

@@ -0,0 +1,2 @@
+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

src/test/UnitTest_Bootloader.RS485/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs

@@ -0,0 +1,4 @@
+// <autogenerated />
+using System;
+using System.Reflection;
+[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]

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

@@ -0,0 +1 @@
+f89b08c158eb8d0c5081cd65985a015f000ff36f

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

@@ -0,0 +1,5 @@
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.csprojAssemblyReference.cache
+I:\project\Robert_Project\EVSoftware_FirmwareHeaderBuilder\EVSoftware_FirmwareHeaderBuilder\src\test\UnitTest_Bootloader.RS485\obj\Release\UnitTest_Bootloader.RS485.Form1.resources
+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