Use 'MULTI-Module' everywhere.

benlye · Jan 14, 2020 · 2014f15 · 2014f15
1 parent 8374118
commit 2014f15
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 20 deletions.
diff --git a/src/flash-multi/DfuRecoveryDialog.Designer.cs b/src/flash-multi/DfuRecoveryDialog.Designer.cs
diff --git a/src/flash-multi/FlashMulti.Designer.cs b/src/flash-multi/FlashMulti.Designer.cs
diff --git a/src/flash-multi/FlashMulti.cs b/src/flash-multi/FlashMulti.cs
@@ -664,7 +664,7 @@ private async void ButtonUpload_Click(object sender, EventArgs e)
             // Error if flashing non-USB firmware via native USB port
             if (mapleResult.DeviceFound && !firmwareSupportsUsb)
             {
-                string msgBoxMessage = "The selected firmware file was compiled without USB support.\r\n\r\nFlashing this firmware would prevent the Multiprotocol module from functioning correctly.\r\n\r\nPlease select a different firmware file.";
+                string msgBoxMessage = "The selected firmware file was compiled without USB support.\r\n\r\nFlashing this firmware would prevent the MULTI-Module from functioning correctly.\r\n\r\nPlease select a different firmware file.";
                 MessageBox.Show(msgBoxMessage, "Incompatible Firmware", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 this.EnableControls(true);
                 return;

diff --git a/src/flash-multi/MapleDevice.cs b/src/flash-multi/MapleDevice.cs
@@ -147,7 +147,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
             string commandArgs;
             int returnCode = -1;
 
-            flashMulti.AppendLog("Starting Multimodule update via native USB\r\n");
+            flashMulti.AppendLog("Starting MULTI-Module update via native USB\r\n");
 
             // Stop the serial monitor if it's active
             SerialMonitor serialMonitor = null;
@@ -183,7 +183,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
 
             if (mapleMode == "USB")
             {
-                flashMulti.AppendLog("Switching Multimodule into DFU mode ...");
+                flashMulti.AppendLog("Switching MULTI-Module into DFU mode ...");
                 command = ".\\tools\\maple-reset.exe";
                 commandArgs = $"{comPort} 2000";
                 await Task.Run(() => { returnCode = RunCommand.Run(flashMulti, command, commandArgs); });
@@ -226,7 +226,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
             }
 
             // First attempt to flash the firmware
-            flashMulti.AppendLog("Writing firmware to Multimodule ...");
+            flashMulti.AppendLog("Writing firmware to MULTI-Module ...");
             command = ".\\tools\\dfu-util.exe";
             commandArgs = string.Format("-R -a 2 -d 1EAF:0003 -D \"{0}\"", fileName, comPort);
 
@@ -247,7 +247,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
                 if (recoveryResult == DialogResult.OK)
                 {
                     // Run the recovery flash command
-                    flashMulti.AppendLog("Writing firmware to Multimodule ...");
+                    flashMulti.AppendLog("Writing firmware to MULTI-Module ...");
                     await Task.Run(() => { returnCode = RunCommand.Run(flashMulti, command, commandArgs); });
                     if (returnCode != 0)
                     {
@@ -272,7 +272,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
             }
 
             flashMulti.AppendLog(" done\r\n");
-            flashMulti.AppendLog("\r\nMultimodule updated successfully");
+            flashMulti.AppendLog("\r\nMULTI-Module updated successfully");
 
             // Reconnect the serial monitor
             if (serialMonitor != null && reconnectSerialMonitor)
@@ -281,7 +281,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
                 serialMonitor.SerialConnect(comPort);
             }
 
-            MessageBox.Show("Multimodule updated successfully.", "Firmware Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            MessageBox.Show("MULTI-Module updated successfully.", "Firmware Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
             flashMulti.EnableControls(true);
         }
     }

diff --git a/src/flash-multi/SerialDevice.cs b/src/flash-multi/SerialDevice.cs
@@ -75,12 +75,12 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
                 // The bootloader occupies the first 8 pages (0-7), so start writing after it
                 flashStart = 8;
 
-                // Start execution at the Multiprotocol code rather than the bootloader
+                // Start execution at the MULTI-Module code rather than the bootloader
                 executionAddress = "0x8002000";
             }
 
             // Write to the log
-            flashMulti.AppendLog("Starting Multimodule update via serial\r\n");
+            flashMulti.AppendLog("Starting MULTI-Module update via serial\r\n");
 
             // Stop the serial monitor if it's active
             SerialMonitor serialMonitor = null;
@@ -160,7 +160,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
 
             // Increment the step counter and write to the log
             flashStep++;
-            flashMulti.AppendLog($"[{flashStep}/{flashSteps}] Writing Multimodule firmware...");
+            flashMulti.AppendLog($"[{flashStep}/{flashSteps}] Writing MULTI-Module firmware...");
 
             // Prepare the command line arguments for writing the firmware
             commandArgs = $"-v -s {flashStart} -e 0 -g {executionAddress} -b {serialBaud} -w \"{fileName}\" {comPort}";
@@ -185,10 +185,10 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, stri
 
             // Write a success message to the log
             flashMulti.AppendLog(" done\r\n");
-            flashMulti.AppendLog("\r\nMultimodule updated successfully");
+            flashMulti.AppendLog("\r\nMULTI-Module updated successfully");
 
             // Show a success message box
-            MessageBox.Show("Multimodule updated successfully.", "Firmware Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            MessageBox.Show("MULTI-Module updated successfully.", "Firmware Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
 
             // Re-enable the form controls
             flashMulti.EnableControls(true);

diff --git a/src/flash-multi/UsbAspDevice.cs b/src/flash-multi/UsbAspDevice.cs
@@ -119,7 +119,7 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, bool
             }
 
             // Write to the log
-            flashMulti.AppendLog("Starting Multimodule update via USBasp\r\n");
+            flashMulti.AppendLog("Starting MULTI-Module update via USBasp\r\n");
 
             // Run the command asynchronously and wait for it to finish
             await Task.Run(() => { returnCode = RunCommand.Run(flashMulti, command, commandArgs); });
@@ -134,9 +134,9 @@ public static async Task WriteFlash(FlashMulti flashMulti, string fileName, bool
             }
 
             flashMulti.AppendLog("\r\nDone.");
-            flashMulti.AppendLog("\r\nMultimodule updated successfully");
+            flashMulti.AppendLog("\r\nMULTI-Module updated successfully");
 
-            MessageBox.Show("Multimodule updated successfully.", "Firmware Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            MessageBox.Show("MULTI-Module updated successfully.", "Firmware Update", MessageBoxButtons.OK, MessageBoxIcon.Information);
 
             flashMulti.EnableControls(true);
         }