AddToAction List colours

V4.5
V4.4 with modified god mode and 211 at end of soak test.
2025-12-02 12:59:40 +00:00 · 2025-11-26 14:39:07 +00:00 · 2025-11-11 14:17:31 +00:00
21 changed files with 445 additions and 400 deletions
--- a/AiQ_GUI.cs
+++ b/AiQ_GUI.cs
@@ -5,6 +5,14 @@ using System.Reflection;

 namespace AiQ_GUI
 {
+    public enum Level
+    {
+        ERROR,
+        WARNING,
+        LOG,
+        Success
+    }
+
    public partial class MainForm : Form
    {
        // Classes
@@ -19,8 +27,6 @@ namespace AiQ_GUI
        private List<CancellationTokenSource> soakCtsList = [];
        private List<Task> soakTasks = [];

-        public const string GoogleDrivePath = @"G:\Shared drives\MAV Production GUI's\AiQ\GUI's\";
-
        // Colours
        public static readonly Color BtnColour = Color.FromArgb(70, 65, 80);
        public static readonly Color TxBxColour = Color.FromArgb(53, 51, 64);
@@ -36,8 +42,6 @@ namespace AiQ_GUI

        private async void AiQGUI_Load(object sender, EventArgs e)
        {
-            Stopwatch stopwatch = Stopwatch.StartNew();
-
            Task? closeProcessesTask = Windows.CloseProcesses(); // Fire and forget closing other apps
            Windows.UpdateFirewall();
            Task UniDataTask = Task.Run(() => Access.ReadUniData()); // Get universal data
@@ -49,7 +53,7 @@ namespace AiQ_GUI
            if (await Network.PingIP("8.8.8.8")) // Ping to check if we're online
            {
                if (!GoogleAPI.Setup())
-                    AddToActionsList("Cannot setup Google API");
+                    AddToActionsList("Cannot setup Google API", Level.WARNING);
            }
            else
            {
@@ -71,9 +75,10 @@ namespace AiQ_GUI
            // Load local data store
            localDataStore = await LDSWAIT;
            Logging.LogMessage("Opening GUI"); // Done after LDS to make sure directory exists.
+
            if (localDataStore == null)
            {
-                AddToActionsList("Could not deserialise LDS.json please help!");
+                AddToActionsList("Could not deserialise LDS.json please help!", Level.WARNING);
                return;
            }

@@ -89,9 +94,6 @@ namespace AiQ_GUI

            await CheckHWOnline;
            Flags.Start = false;
-
-            stopwatch.Stop();
-            Debug.WriteLine("RunTime " + stopwatch.Elapsed.ToString(@"hh\:mm\:ss\.ff"));
        }

        private void PopulateUIWithLDS(LocalDataStore lds)
@@ -137,7 +139,7 @@ namespace AiQ_GUI
                string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.SAFE); // Set LED's to safe (0x0E) to help with eye safety and trim check.

                if (!LEDreply.Contains("Power levels set successfully"))
-                    AddToActionsList($"LED level could not be set: {LEDreply}");
+                    AddToActionsList($"LED level could not be set: {LEDreply}", Level.ERROR);
            }
            else if (!await TestTube.CheckInTestTube(CamOnTest.IP)) // Sets LED's to medium power after checking it is in the test tube
                await TestFailed(BtnStartTest, "Camera not in test tube");
@@ -156,7 +158,7 @@ namespace AiQ_GUI

            string VISCAReply = await FlexiAPI.APIHTTPVISCA(CamOnTest.IP, "8101043903FF", true); // Manual mode to be able to manipulate the SIG settings. 
            if (VISCAReply != "9041FF9051FF")
-                AddToActionsList("Couldn't set to manual mode");
+                AddToActionsList("Couldn't set to manual mode",Level.ERROR);

            await CameraModules.SetSIG(CbBxShutter, CbBxIris, CbBxGain, CamOnTest.IP); // Set SIG according to the drop downs in settings for a good picture ready for image check
            await ImageProcessing.ImageCheck(PicBxOV, PicBxIRF2, PicBxIRF16, LblIRImageF2, LblIRImageF16, CamOnTest); // Populates the picture boxes and checks iris changes
@@ -199,7 +201,7 @@ namespace AiQ_GUI
                string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30)

                if (!LEDreply.Contains("Power levels set successfully"))
-                    AddToActionsList($"LED level could not be set: {LEDreply}");
+                    AddToActionsList($"LED level could not be set: {LEDreply}", Level.ERROR);
            }
            await FlexiAPI.SetVaxtorMinMaxPlate(CamOnTest.IP);

@@ -209,8 +211,8 @@ namespace AiQ_GUI
            await CheckDiagsAPIPt2(); // For only final test parts

            // Check module has gone to default config
-            CameraModules.CheckCamModule(DiagsAPI.IRmodule, LblIRModule); // IR
-            CameraModules.CheckCamModule(DiagsAPI.OVmodule, LblOVModule); // OV
+            CameraModules.CheckCamModule(DiagsAPI.IRmodule, LblIRModule, CamOnTest); // IR
+            CameraModules.CheckCamModule(DiagsAPI.OVmodule, LblOVModule, CamOnTest); // OV

            // Check voltage and current are OK.
            LED.CheckLEDs(DiagsAPI.LedVoltage, LblLEDV, "V", CameraAccessInfo.LED_V);  // Voltage
@@ -240,7 +242,7 @@ namespace AiQ_GUI
            string LEDreply = await FlexiAPI.APIHTTPLED(CamOnTest.IP, LEDPOWER.MID); // Set LED's to medium (0x30)

            if (!LEDreply.Contains("Power levels set successfully"))
-                AddToActionsList($"LED level could not be set: {LEDreply}");
+                AddToActionsList($"LED level could not be set: {LEDreply}", Level.ERROR);

            await CameraModules.FactoryResetModules(CamOnTest.IP); // Reset both modules and double check

@@ -253,8 +255,8 @@ namespace AiQ_GUI
            await CheckDiagsAPIPt1();

            // Check module has gone to default config
-            CameraModules.CheckCamModule(DiagsAPI.IRmodule, LblIRModule); // IR
-            CameraModules.CheckCamModule(DiagsAPI.OVmodule, LblOVModule); // OV
+            CameraModules.CheckCamModule(DiagsAPI.IRmodule, LblIRModule, CamOnTest); // IR
+            CameraModules.CheckCamModule(DiagsAPI.OVmodule, LblOVModule, CamOnTest); // OV

            // Check voltage and current are OK.
            LED.CheckLEDs(DiagsAPI.LedVoltage, LblLEDV, "V", CameraAccessInfo.LED_V);  // Voltage
@@ -272,7 +274,7 @@ namespace AiQ_GUI
                    if (await DisplayQuestion($"Would you like to allocate a serial number to this camera?"))
                        await AllocateSerial();
                    else if (GoogleAPI.UpdateSpreadSheetRePreTest(CameraAccessInfo.SpreadsheetID, Vers) != "OK") // If rerun might be different values so update SS
-                        AddToActionsList("Failed to write to spreadsheet, please check manually");
+                        AddToActionsList("Failed to write to spreadsheet, please check manually",Level.WARNING);
                    // else if (Excel.UpdateSpreadSheetPreTest(CameraAccessInfo.SpreadsheetID, Vers, CamOnTest.GetCamDesc(), CamOnTest.Model) != "OK")
                    //     AddToActionsList("Failed to write to spreadsheet, please check manually");
                }
@@ -286,8 +288,6 @@ namespace AiQ_GUI
            {
                await PreTestFailed("Diagnostic Failure");
            }
-
-
        }

        // ***** Pass/Fails *****
@@ -297,7 +297,7 @@ namespace AiQ_GUI
            string err = GoogleAPI.UpdateSpreadSheetFinalTest(CameraAccessInfo.SpreadsheetID, DiagsAPI, sshData, CamOnTest.RMANum);

            if (err != string.Empty) // If there is an error message, display it
-                AddToActionsList("Failed to write to spreadsheet " + err);
+                AddToActionsList("Failed to write to spreadsheet " + err, Level.ERROR);

            // Purge camera of all reads
            await FlexiAPI.APIHTTPRequest("/api/purge-all", CamOnTest.IP);
@@ -308,12 +308,12 @@ namespace AiQ_GUI
                string[,] GOD_JSON = { { "propGodMode", "false" } };
                string IntConf = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", CamOnTest.IP, GOD_JSON);
                if (!IntConf.Contains("\"propGodMode\": {\"value\": \"false\", \"datatype\": \"boolean\"},"))
-                    AddToActionsList("Could not turn off God mode");
+                    AddToActionsList("Could not turn off God mode", Level.WARNING);

                Thread Thr211 = new(async () =>
                {
                    if (!await FlexiAPI.ChangeNetwork211(CamOnTest.IP)) // Change camera IP to 192.168.1.211. Waits for camera to come back.
-                        AddToActionsList("Could not find camera at 192.168.1.211. Please check manually");
+                        AddToActionsList("Could not find camera at 192.168.1.211. Please check manually", Level.WARNING);
                });
                Thr211.IsBackground = true;
                Thr211.Start();
@@ -336,15 +336,11 @@ namespace AiQ_GUI
            BtnStartTest.Text = "Test Passed";
            PnlQuestion.Visible = false; // just in case this came from an override
            Logging.LogMessage("Final Test Passed");
-            if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
-            {
-                Access.Stats("Final Tests Passed", CamOnTest.Model);
-            }
-            else
-            {
-                Access.Stats("RMA Final Tests Passed", CamOnTest.Model);
-            }

+            if (CamOnTest.RMANum == 0) // Yap to check if it is not a RMA
+                Access.Stats("Final Tests Passed", CamOnTest.Model);
+            else
+                Access.Stats("RMA Final Tests Passed", CamOnTest.Model);
        }

        public async Task TestFailed(Button Btn, string ErrMssg)
@@ -354,14 +350,11 @@ namespace AiQ_GUI
            Btn.Text = "Test Failed";

            if (!(CamOnTest.RMANum != 0)) // Yap to check if it is not a RMA
-            {
                Access.Stats(["Final Tests Failed", ErrMssg], CamOnTest.Model);
-            }
            else
-            {
                Access.Stats("RMA Final Tests Failed", CamOnTest.Model);
-            }
-            AddToActionsList(ErrMssg);
+
+            AddToActionsList(ErrMssg, Level.ERROR);

            string RedLbls = string.Join(Environment.NewLine, PnlLbls.Controls
                    .OfType<Label>()
@@ -400,7 +393,6 @@ namespace AiQ_GUI
                    GoogleAPI.WriteToSS(oblistCD, "'Approval'!C" + nextRow + ":D" + nextRow, GoogleAPI.spreadsheetId_ModelInfo);

                    await Teams.SendMssg(Convert.ToString(nextRow), CbBxUserName.Text);
-                    //GoogleAPI.EmailApproval(Convert.ToString(nextRow), CbBxUserName.Text);

                    string Approved = "";

@@ -511,10 +503,13 @@ namespace AiQ_GUI
            else if (RegexCache.MACRegex().IsMatch(DiagsAPI.MAC)) // Is a valid MAC, but not NVIDIA
            {
                lblMac.ForeColor = Color.Red;
-                AddToActionsList($"{DiagsAPI.MAC} not recognised as NVIDIA MAC address");
+                AddToActionsList($"{DiagsAPI.MAC} not recognised as NVIDIA MAC address", Level.ERROR);
            }
            else
+            {
                lblMac.ForeColor = Color.Red;
+                AddToActionsList($"{DiagsAPI.MAC} not recognised as a MAC address", Level.ERROR);
+            }

            // Check timestamp
            DateTime dateTime = new(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
@@ -577,7 +572,7 @@ namespace AiQ_GUI

                    if (DiagsAPI.modelNumber != CamOnTest.Model)
                    {
-                        AddToActionsList("Model number in camera doesn't match what has been selected");
+                        AddToActionsList("Model number in camera doesn't match what has been selected", Level.WARNING);
                        lblModel.ForeColor = Color.Red;
                    }
                    else if (!GoogleAPI.CheckWIP(DiagsAPI.serialNumber, CameraAccessInfo.SpreadsheetID)) // Check WIP column in serial number register, if not ticked then RMA
@@ -597,15 +592,13 @@ namespace AiQ_GUI
                            CamOnTest.RMANum = Convert.ToInt32(await DisplayInput("What is the RMA number?"));

                            if (CamOnTest.RMANum == -1) // Means they chose the 'I don't know' option
-                            {
                                await TestFailed(BtnStartTest, "Please get RMA number from operations team before continuing");
                        }
                    }
                }
-                }
                else
                {
-                    AddToActionsList("Camera has not been given a valid serial and model number, suggest you run through pre test again and check serial number register for any issues.");
+                    AddToActionsList("Camera has not been given a valid serial and model number, suggest you run through pre test again and check serial number register for any issues.", Level.ERROR);
                }
            }
            catch { }
@@ -638,11 +631,7 @@ namespace AiQ_GUI
            double CPUround = Math.Round(DiagsAPI.CPUusage); // Check CPU usage isn't near max
            LblCPUusage.Text += CPUround + "%";

-            if (CPUround < 98 && CPUround > 50)
-            {
-                LblCPUusage.ForeColor = Color.LightGreen;
-            }
-            else if (CPUround <= 50)
+            if (CPUround <= 50)
            {
                LblCPUusage.Text += " Unexpectedly low CPU usage";
                LblCPUusage.ForeColor = Color.Red;
@@ -652,6 +641,10 @@ namespace AiQ_GUI
                LblCPUusage.Text += " Unexpectedly high CPU usage";
                LblCPUusage.ForeColor = Color.Red;
            }
+            else
+            {
+                LblCPUusage.ForeColor = Color.LightGreen;
+            }

            // Check Vaxtor if it doesn't need or have license OR has and wants one then pass
            if (CameraAccessInfo.VaxtorLic == false && DiagsAPI.licenses.raptorKeyID == "Not Licensed" || CameraAccessInfo.VaxtorLic == true && DiagsAPI.licenses.raptorKeyID != "Not Licensed")
@@ -701,12 +694,12 @@ namespace AiQ_GUI

            if (NewSerial.Contains("ERROR"))
            {
-                AddToActionsList(NewSerial + Environment.NewLine + "Please remove any information that was put into the serial number mistake, change the camera model/serial to 'N/A' and retry the test.");
+                AddToActionsList(NewSerial + Environment.NewLine + "Please remove any information that was put into the serial number mistake, change the camera model/serial to 'N/A' and retry the test.", Level.ERROR);
                return;
            }
            else if (NewSerial == "Last serial number not found")
            {
-                AddToActionsList("Last serial number not found in spreadsheet. Please check spreadsheet is in correct format before retrying.");
+                AddToActionsList("Last serial number not found in spreadsheet. Please check spreadsheet is in correct format before retrying.", Level.WARNING);
                return;
            }

@@ -716,7 +709,7 @@ namespace AiQ_GUI

            if (!JSONResponse.Contains(NewSerial) || !JSONResponse.Contains(CamOnTest.Model))
            {
-                AddToActionsList("Could not set model or serial numbers into camera.");
+                AddToActionsList("Could not set model or serial numbers into camera.",Level.ERROR);
                await PreTestFailed("Failed To Set Model Or Serial Number");
            }

@@ -727,7 +720,6 @@ namespace AiQ_GUI
            lblSerial.Text += DiagsAPI.serialNumber;

            Printer.ZebraIP = localDataStore.ZebraIP;
-
            Printer.PrintGBLbl(); // Print GB label
            Printer.PrintSerialLbl(CamOnTest.Model, NewSerial, CameraAccessInfo.Processor); // Print model/serial label
        }
@@ -804,7 +796,9 @@ namespace AiQ_GUI

            foreach (Camera soakInfo in soakCameraList)
            {
-                TabSoak.Controls.Add(SoakTest.MakeNewCheckbox(soakInfo, YLoc));
+                CheckBox chkBox = SoakTest.MakeNewCheckbox(soakInfo, YLoc);
+                TabSoak.Controls.Add(chkBox);
+                soakInfo.CheckBox = chkBox;
                YLoc += 24;
            }

@@ -869,7 +863,7 @@ namespace AiQ_GUI

                if (Vers == null) // If failed to get versions then return. Flexi most likely not running yet.
                {
-                    AddToActionsList("Failed to get API from camera. Flexi not running yet or not an AiQ");
+                    AddToActionsList("Failed to get API from camera. Flexi not running yet or not an AiQ", Level.WARNING);
                    return;
                }

@@ -932,20 +926,37 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                AddToActionsList($"Failed to set God mode for camera {CamOnTest.IP}. Reason: {ex.Message}");
+                AddToActionsList($"Failed to set God mode for camera {CamOnTest.IP}. Reason: {ex.Message}", Level.ERROR);
            }
        }

        // ***** Helper functions *****
-        public void AddToActionsList(string Mssg, bool IsErr = true)
+        public void AddToActionsList(string Mssg, Level Lvl = Level.LOG)
+        {
+            if (Lvl == Level.ERROR)
            {
-            if (IsErr)
                Logging.LogErrorMessage(Mssg);
-            else
+                RhTxBxActions.SelectionColor = Color.IndianRed;
+            }
+            else if (Lvl == Level.WARNING)
+            {
+                Logging.LogWarningMessage(Mssg);
+                RhTxBxActions.SelectionColor = Color.Orange;
+            }
+            else if (Lvl == Level.LOG)
+            {
                Logging.LogMessage(Mssg);
+                RhTxBxActions.SelectionColor = Color.White;
+            }
+            else if (Lvl == Level.Success)
+            {
+                Logging.LogMessage(Mssg);
+                RhTxBxActions.SelectionColor = Color.LightGreen;
+            }

                RhTxBxActions.AppendText(Mssg + Environment.NewLine);
            RhTxBxActions.SelectionStart = RhTxBxActions.Text.Length;
+            RhTxBxActions.SelectionColor = SystemColors.Control;
            RhTxBxActions.ScrollToCaret();
        }

@@ -1121,7 +1132,7 @@ namespace AiQ_GUI
                bool Online = await FlexiAPI.ChangeNetwork211(CamOnTest.IP); // Change camera IP to 192.168.1.211 and hardware reboot. Waits for camera to come back for 50s.

                if (!Online)
-                    AddToActionsList("Could not find camera at 192.168.1.211. Please check manually");
+                    AddToActionsList("Could not find camera at 192.168.1.211. Please check manually", Level.ERROR);
                else
                    BtnSet211.Text = "Set to DHCP";
            }
@@ -1146,11 +1157,11 @@ namespace AiQ_GUI
                    {
                        Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera
                        await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
-                        Instance.AddToActionsList($"Setting 211 for camera {SCL.IP}", false);
+                        Instance.AddToActionsList($"Setting 211 for camera {SCL.IP}", Level.LOG);
                    }
                    catch (Exception ex)
                    {
-                        AddToActionsList("Failed to set all cameras to 211. Reason: " + ex.Message); // In case non AiQ's get caught up
+                        AddToActionsList("Failed to set all cameras to 211. Reason: " + ex.Message, Level.ERROR); // In case non AiQ's get caught up
                    }
                }

@@ -1173,11 +1184,11 @@ namespace AiQ_GUI
                    {
                        Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera
                        string RESP = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON);
-                        Instance.AddToActionsList($"Setting God mode for camera {SCL.IP} to {newGodModeValue}", false);
+                        Instance.AddToActionsList($"Setting God mode for camera {SCL.IP} to {newGodModeValue}", Level.LOG);
                    }
                    catch (Exception ex)
                    {
-                        AddToActionsList($"Failed to set God mode for camera {SCL.IP}. Reason: {ex.Message}");
+                        AddToActionsList($"Failed to set God mode for camera {SCL.IP}. Reason: {ex.Message}", Level.ERROR);
                    }
                }

@@ -1305,7 +1316,7 @@ namespace AiQ_GUI
                    }
                    catch
                    {
-                        AddToActionsList("Failed to communicate with camera, please check network and try again.");
+                        AddToActionsList("Failed to communicate with camera, please check network and try again.", Level.ERROR);
                        return;
                    }

@@ -1313,12 +1324,16 @@ namespace AiQ_GUI
                    {
                        VaxtorLicResp = JsonConvert.DeserializeObject<VaxtorLic>(ALresponse);

-                        if (VaxtorLicResp.protectionKeyId != string.Empty)
+                        if (VaxtorLicResp.error != string.Empty)
+                        {
+                            AddToActionsList(VaxtorLicResp.error, Level.ERROR);
+                        }
+                        else if (VaxtorLicResp.protectionKeyId != string.Empty)
                        {
                            string err = GoogleAPI.UpdateSpreadSheetVaxtor(VaxtorLicResp, Vers.Serial, CamOnTest.Model);

                            if (err != string.Empty) // If there is an error message, display it
-                                AddToActionsList("Failed to update Vaxtor spreadsheet: " + err);
+                                AddToActionsList("Failed to update Vaxtor spreadsheet: " + err, Level.ERROR);

                            RhTxBxCode.AppendText("Licencing Success, Key ID: " + VaxtorLicResp.protectionKeyId + Environment.NewLine + "Waiting for files to save");

@@ -1327,18 +1342,14 @@ namespace AiQ_GUI

                            await DisplayOK("Please wait at least a minute before turning off the unit.");
                        }
-                        else if (VaxtorLicResp.error != string.Empty)
-                        {
-                            RhTxBxCode.AppendText(VaxtorLicResp.error);
-                        }
                        else
                        {
-                            AddToActionsList($"Error reading JSON - {ALresponse}");
+                            AddToActionsList($"Error reading JSON - {ALresponse}", Level.ERROR);
                        }
                    }
                    catch
                    {
-                        AddToActionsList($"Error reading JSON - {ALresponse}");
+                        AddToActionsList($"Error reading JSON - {ALresponse}", Level.ERROR);
                        return;
                    }
                }
@@ -1574,7 +1585,7 @@ namespace AiQ_GUI

                    CancellationTokenSource cts = new();
                    soakCtsList.Add(cts);
-                    soakTasks.Add(SoakTest.StartSoak(SCL, cts.Token));
+                    soakTasks.Add(SoakTest.StartSoak(SCL, SCL.CheckBox, cts.Token));
                    await Task.Delay(10000);
                }
            }
@@ -1596,38 +1607,41 @@ namespace AiQ_GUI
                        continue;
                    try
                    {
+                        AddToActionsList($"Setting 211 & God Mode off for camera {SCL.IP}", Level.LOG);
                        Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera
                        await CameraModules.FactoryResetModules(SCL.IP); // Reset camera modules                     
-                        await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON);
-                        await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
-                        AddToActionsList($"Setting 211 & God Mode off for camera {SCL.IP}", false);

-                        string[,] godJson = { { "propGodMode", "false" } }; // Set God mode explicitly off
-                        string GOD = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, godJson);
+                        string GOD = await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON);
                        if (GOD.Contains("Error"))
                            throw new Exception("Could not set God mode off");

                        // Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP
-                        string[,] TEST_JSON = { { "propDHCP", "false" }, { "propHost", "192.168.1.211" }, { "propNetmask", "255.255.255.0" }, { "propGateway", "192.168.1.1" } };
-                        await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, TEST_JSON);
+                        await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
                        i--; // Decriment count becuase they will stack into 211
                    }
                    catch (Exception ex)
                    {
-                        AddToActionsList("Failed to set all cameras to 211 and god mode off. Reason: " + ex.Message); // In case non AiQ's get caught up
+                        AddToActionsList("Failed to set all cameras to 211 and god mode off. Reason: " + ex.Message, Level.ERROR); // In case non AiQ's get caught up
+                    }
+
+                    if (SCL.CheckBox.ForeColor == Color.Red)
+                    {
+                        DialogResult DR = MessageBox.Show($"CAMERA {SCL.Serial} {SCL.Model} DID NOT PASS SOAK TEST. Check soak test report to see error. Do you want to open the test report", "SOAK TEST FAILED", MessageBoxButtons.YesNo, MessageBoxIcon.Warning);
+                        if (DR == DialogResult.Yes)
+                            File.Open(SCL.TestReportLoc, FileMode.Open);
                    }
                }

                await Task.Delay(5000); // Wait for 5 seconds to allow the camera to restart
                IList<string> FoundCams = await Network.SearchForCams(); // Have to check via broadcast becuase Ping sometimes fails across subnets

-                if (FoundCams.Count == i && FoundCams.Contains("192.168.1.211")) // Check the right number of cameras are seen
+                if ((FoundCams.Count == i && FoundCams.Contains("192.168.1.211")) || FoundCams.Count == 1)
                {
-                    // GOOD??
+                    AddToActionsList("All cameras successfully changed to 211.", Level.Success);
                }
                else
                {
-                    // BAD??
+                    AddToActionsList($"Some cameras failed: Found {FoundCams.Count}, expected {i}.", Level.ERROR);
                }
            }
        }
@@ -1675,59 +1689,7 @@ namespace AiQ_GUI
        private async void BtnUploadBlob_Click(object sender, EventArgs e)
        {
            BtnUploadBlob.BackColor = BtnColour;
-            const string networkFolderPath = @"G:\Shared drives\MAV Production\MAV_146_AiQ_Mk2\Flexi";
-            string fileToUpload = null;
-
-            if (await DisplayQuestion("Do you want the latest Flexi version from the MAV Production folder?"))
-            {
-                fileToUpload = Directory.GetFiles(networkFolderPath, "*.blob").OrderByDescending(File.GetLastWriteTime).FirstOrDefault();
-
-                if (fileToUpload == null)
-                {
-                    AddToActionsList("No .blob file found in the directory.", false);
-                    return;
-                }
-            }
-            else
-            {
-                using OpenFileDialog openFileDialog1 = new()
-                {
-                    InitialDirectory = networkFolderPath,
-                    Filter = "Blob files (*.blob)|*.blob",
-                    FilterIndex = 0
-                };
-
-                if (openFileDialog1.ShowDialog() == DialogResult.OK)
-                    fileToUpload = openFileDialog1.FileName;
-                else
-                {
-                    AddToActionsList("File selection cancelled.", false);
-                    return;
-                }
-            }
-
-            string fileName = Path.GetFileName(fileToUpload);
-            AddToActionsList($"Selected file to upload: {fileToUpload}", false);
-
-            foreach (Camera? cam in soakCameraList.Where(c => c.IsChecked))
-            {
-                string apiUrl = $"http://{cam.IP}/upload/software-update/2";
-                Network.Initialize("developer", cam.DevPass);
-                await Task.Delay(1000); // Gives extra time to allow for Network to initialize 
-                AddToActionsList($"Uploading to {cam.IP}...", false);
-                string result = await FlexiAPI.SendBlobFileUpload(apiUrl, fileToUpload, fileName);
-
-                // Retry once on transient errors
-                if (result.Contains("Error while copying content to a stream") || result.Contains("Timeout"))
-                {
-                    AddToActionsList($"Retrying upload to {cam.IP}...", false);
-                    await Task.Delay(1000);
-                    result = await FlexiAPI.SendBlobFileUpload(apiUrl, fileToUpload, fileName);
-                }
-
-                AddToActionsList($"Upload result for {cam.IP}: {result}", false);
-                await Task.Delay(500);
-            }
+            FlexiAPI.UploadBlob(soakCameraList);
            BtnUploadBlob.BackColor = Color.Green;
        }

@@ -1751,13 +1713,33 @@ namespace AiQ_GUI
        {
            Stopwatch stopWatchTest = Stopwatch.StartNew();

-            StatsExcel excelExporter = new();
-            excelExporter.ExportDatabaseToExcel();
+            //StatsExcel excelExporter = new();
+            //excelExporter.ExportDatabaseToExcel();

            // /api/config-ids - For getting all available config IDs

+            // Make every log file in the soak log directory into a soak test report PDF
+            //var files = from file in Directory.EnumerateFiles("C:\\ProgramData\\MAV\\AiQ_GUI") select file;
+
+            //foreach (var file in files)
+            //{
+            //    if (file.Contains("SoakLog"))
+            //    {
+            //        // File name: SoakLog_{Serial}_{Model}.log
+            //        string[] parts = file.Split('_', '.').Select(p => p.Trim()).ToArray();
+
+            //        Camera NewCam = new()
+            //        {
+            //            Model = parts[3],
+            //            Serial = parts[2],
+            //        };
+
+            //        PDF.CreateSoakTestReport(NewCam, "SoakTestRig", DateTime.Now, file);
+            //    }
+            //}
+
            stopWatchTest.Stop();
-            AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"));
+            AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"), Level.LOG);
        }
    }
 }
--- a/AiQ_GUI.resx
+++ b/AiQ_GUI.resx
@@ -123,11 +123,8 @@
  <metadata name="ToolTipClipboard.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>159, 17</value>
  </metadata>
-  <metadata name="ToolTipAvailable.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
  <metadata name="TimerDDC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>690, 19</value>
+    <value>531, 18</value>
  </metadata>
  <metadata name="timerTypeIP.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>305, 17</value>
--- a/AiQ_GUI_NET_Test.csproj
+++ b/AiQ_GUI_NET_Test.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>WinExe</OutputType>
-    <TargetFramework>net9.0-windows7.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
    <Nullable>enable</Nullable>
    <UseWindowsForms>true</UseWindowsForms>
    <ImplicitUsings>enable</ImplicitUsings>
@@ -16,7 +16,7 @@
    <Product>AiQ GUI</Product>
    <Authors>MAV Systems Ltd</Authors>
    <PackageId>AiQ GUI</PackageId>
-    <Version>4.4.0</Version>
+    <Version>4.5.0</Version>
    <Description>A GUI to control and test the AiQ</Description>
    <Copyright>MAV Systems Ltd 2025</Copyright>
    <PackageIcon>MAV - Plain - Blue.png</PackageIcon>
@@ -26,6 +26,7 @@
    <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <SignAssembly>False</SignAssembly>
+    <StartupObject>AiQ_GUI.Program</StartupObject>
  </PropertyGroup>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
--- a/Camera/CameraModules.cs
+++ b/Camera/CameraModules.cs
@@ -4,11 +4,11 @@ namespace AiQ_GUI
    internal class CameraModules
    {
        // Chack camera modules are in default state according to what the diagnostics API. 
-        public static void CheckCamModule(Module CamMod, Label Lbl)
+        public static void CheckCamModule(Module CamMod, Label Lbl, Camera CamOnTest)
        {
            if (CamMod == null || Lbl == null)
            {
-                MainForm.Instance.AddToActionsList("Camera module or label was null in CheckCamModule.");
+                MainForm.Instance.AddToActionsList("Camera module or label was null in CheckCamModule.", Level.ERROR);
                return;
            }

@@ -17,7 +17,21 @@ namespace AiQ_GUI
            if (CamMod.zoom != 0) // Check camera module is at full wide
                errMssg += $"Zoom not at 0 - {CamMod.zoom} ";

-            if (CamMod.firmwareVer != UniversalData.WonwooFirmware) // Check camera module firmware version is up to date.
+            bool LessTanOrEqualTo = false;
+
+            try
+            {
+                LessTanOrEqualTo = Convert.ToDouble(CamMod.firmwareVer) <= Convert.ToDouble(UniversalData.WonwooFirmware);
+            }
+            catch
+            {
+                MainForm.Instance.AddToActionsList($"{CamMod.firmwareVer} or {UniversalData.WonwooFirmware} could not be converted to a double", Level.ERROR);
+            }
+
+            if (CamOnTest.RMANum > 0 && LessTanOrEqualTo)
+                errMssg += $"Firmware: {CamMod.firmwareVer} should be less than or equal to {UniversalData.WonwooFirmware} for RMA {CamOnTest.RMANum}";
+
+            else if ((CamOnTest.RMANum == 0 || CamOnTest.RMANum == -1) && CamMod.firmwareVer != UniversalData.WonwooFirmware)
                errMssg += $"Firmware: {CamMod.firmwareVer} should be {UniversalData.WonwooFirmware} ";

            if (CamMod.expMode != 0) // Auto 0=0x00
@@ -41,7 +55,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Exception in CheckCamModule: " + ex.Message);
+                MainForm.Instance.AddToActionsList("Exception in CheckCamModule: " + ex.Message, Level.ERROR);
            }
        }

@@ -51,7 +65,7 @@ namespace AiQ_GUI
        {
            if (Shutter.SelectedIndex == -1 || Iris.SelectedIndex == -1 || Gain.SelectedIndex == -1)
            {
-                MainForm.Instance.AddToActionsList("Shutter, Iris and Gain need selecting in images tab.");
+                MainForm.Instance.AddToActionsList("Shutter, Iris and Gain need selecting in images tab.", Level.WARNING);
                return;
            }

@@ -61,7 +75,7 @@ namespace AiQ_GUI

            if (ShutterVISCA.Contains("ERROR") || IrisVISCA.Contains("ERROR") || GainVISCA.Contains("ERROR"))
            {
-                MainForm.Instance.AddToActionsList("Problem with selected SIG values");
+                MainForm.Instance.AddToActionsList("Problem with selected SIG values", Level.ERROR);
                return;
            }

@@ -71,7 +85,7 @@ namespace AiQ_GUI
            string OneshotReply = await FlexiAPI.APIHTTPVISCA(IPAddress, "8101041801FF", true); // Oneshot auto focus

            if (!ShutterReply.Contains("41") || !IrisReply.Contains("41") || !GainReply.Contains("41") || !OneshotReply.Contains("41"))
-                MainForm.Instance.AddToActionsList("Could not set Shutter, Iris, Gain correctly" + Environment.NewLine + "Shutter: " + ShutterReply + Environment.NewLine + "Iris: " + IrisReply + Environment.NewLine + "Gain: " + GainReply + Environment.NewLine + "Oneshot: " + OneshotReply);
+                MainForm.Instance.AddToActionsList("Could not set Shutter, Iris, Gain correctly" + Environment.NewLine + "Shutter: " + ShutterReply + Environment.NewLine + "Iris: " + IrisReply + Environment.NewLine + "Gain: " + GainReply + Environment.NewLine + "Oneshot: " + OneshotReply, Level.ERROR);
        }

        // Sets back to the latest factory defaults CSV that is in Flexi. 
@@ -83,7 +97,7 @@ namespace AiQ_GUI
            await Task.WhenAll(IRReply, OVReply);

            if (IRReply.Result != "Factory reset OK." || OVReply.Result != "Factory reset OK.")
-                MainForm.Instance.AddToActionsList($"Could not reset camera modules to factory default.{Environment.NewLine}{IRReply}{Environment.NewLine}{OVReply}");
+                MainForm.Instance.AddToActionsList($"Could not reset camera modules to factory default.{Environment.NewLine}{IRReply}{Environment.NewLine}{OVReply}", Level.ERROR);
        }

        public static string BuildVISCACommand(string command, int hexValue)
--- a/Camera/FlexiAPI.cs
+++ b/Camera/FlexiAPI.cs
@@ -24,7 +24,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                return $"Error during GET request: {ex.Message}";
+                return $"Error during GET request: {ex.Message}{Level.ERROR}";
            }
        }

@@ -42,7 +42,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                return $"Error in HTTP_Update: {ex.Message}";
+                return $"Error in HTTP_Update: {ex.Message}{Level.ERROR}";
            }
        }

@@ -56,7 +56,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                return $"Error in HTTP_Fetch: {ex.Message}";
+                return $"Error in HTTP_Fetch: {ex.Message}{Level.ERROR}";
            }
        }

@@ -101,21 +101,22 @@ namespace AiQ_GUI
                string responseBody = await response.Content.ReadAsStringAsync();

                if (!response.IsSuccessStatusCode)
-                    return $"Server returned {(int)response.StatusCode}: {response.ReasonPhrase}. Details: {responseBody}";
+                    return $"Server returned {(int)response.StatusCode}: {response.ReasonPhrase}. Details: {responseBody}{Level.ERROR}";

                return responseBody;
            }
            catch (TaskCanceledException)
            {
-                return $"Timeout uploading to {url}.";
+                return $"Timeout uploading to {url}.{Level.ERROR}";
            }
            catch (HttpRequestException ex)
            {
-                return $"HTTP error uploading to {url}: {ex.Message}";
+                return $"HTTP error uploading to {url}: {ex.Message}{Level.ERROR}";
+                 
            }
            catch (Exception ex)
            {
-                return $"Unexpected error uploading to {url}: {ex.Message} {(ex.InnerException?.Message ?? "")}";
+                return $"Unexpected error uploading to {url}: {ex.Message} {(ex.InnerException?.Message ?? string.Empty)} {Level.ERROR}";
            }
        }

@@ -145,7 +146,7 @@ namespace AiQ_GUI

            if (JSON == null || JSON.Contains("Error") || JSON.Contains("Timeout"))
            {
-                MainForm.Instance.AddToActionsList("Error talking to Flexi, are you sure this is an AiQ?" + Environment.NewLine + JSON);
+                MainForm.Instance.AddToActionsList($"Error talking to Flexi, are you sure this is an AiQ?{Level.WARNING}" + Environment.NewLine + JSON);
                return null;
            }

@@ -173,13 +174,13 @@ namespace AiQ_GUI
                // Treat "operation was canceled" as a successful apply
                if (response.Contains("The operation was canceled", StringComparison.OrdinalIgnoreCase))
                {
-                    Logging.LogMessage("SetVaxtorMinMaxPlate: Camera applied config but closed connection early (safe to ignore).");
+                    Logging.LogMessage($"SetVaxtorMinMaxPlate: Camera applied config but closed connection early (safe to ignore).{Level.WARNING}");
                    return true;
                }

                if (response.Contains("error", StringComparison.OrdinalIgnoreCase))
                {
-                    MainForm.Instance.DisplayQuestion($"SetVaxtorMinMaxPlate: failed - Please set manually");
+                    MainForm.Instance.DisplayQuestion($"SetVaxtorMinMaxPlate: failed - Please set manually{Level.WARNING}");
                    return false;
                }

@@ -187,7 +188,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Could not set Vaxtor Plate height and min confidence: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Could not set Vaxtor Plate height and min confidence: {ex.Message}{Level.ERROR}");
                return false;
            }
        }
@@ -196,7 +197,7 @@ namespace AiQ_GUI
        {
            // Set Zoomlock on and if it fails ask user to set it manually
            if (!(await APIHTTPRequest("/api/zoomLock?enable=true", IP)).Contains("Zoom lock enabled.")
-                && !await MainForm.Instance.DisplayQuestion("Could not set zoomlock on" + Environment.NewLine + "Set Zoomlock to on then click YES. Click NO to restart."))
+                && !await MainForm.Instance.DisplayQuestion($"Could not set zoomlock on{Level.WARNING}" + Environment.NewLine + $"Set Zoomlock to on then click YES. Click NO to restart. {Level.WARNING}"))
            {
                return false;
            }
@@ -232,7 +233,7 @@ namespace AiQ_GUI
            }
            catch
            {
-                MainForm.Instance.AddToActionsList("Error reading trim JSON - " + trimData);
+                MainForm.Instance.AddToActionsList($"Error reading trim JSON - {Level.ERROR}" + trimData);
                return;
            }

@@ -241,7 +242,7 @@ namespace AiQ_GUI
            {
                if (RetryCount >= 3)
                {
-                    await MainForm.Instance.DisplayOK("Please align trim in webpage then click OK."); // Awaited till OK has been clicked
+                    await MainForm.Instance.DisplayOK($"Please align trim in webpage then click OK.{Level.WARNING}"); // Awaited till OK has been clicked
                    return;
                }

@@ -269,11 +270,11 @@ namespace AiQ_GUI
                }
                else // Ask user to centre the plate in the field of view
                {
-                    await MainForm.Instance.DisplayOK("Please centralise plate in view THEN press OK"); // Awaited till OK has been clicked
+                    await MainForm.Instance.DisplayOK($"Please centralise plate in view THEN press OK {Level.WARNING}"); // Awaited till OK has been clicked

                    if (RetryCount >= 3)
                    {
-                        await MainForm.Instance.DisplayOK("Please align trim in webpage then click OK."); // Awaited till OK has been clicked
+                        await MainForm.Instance.DisplayOK($"Please align trim in webpage then click OK. {Level.WARNING}"); // Awaited till OK has been clicked
                        return;
                    }
                    await Task.Delay(5000); // Give 5 second delay for it to see a plate
@@ -290,7 +291,7 @@ namespace AiQ_GUI
            string TrimResp = await HTTP_Update("SightingCreator", IPAddress, Trim_JSON);

            if (!TrimResp.Contains($"\"propInterCameraOffsetX\": {{\"value\": \"{Convert.ToString(TrimX)}\", \"datatype\": \"int\"}}, \"propInterCameraOffsetY\": {{\"value\": \"{Convert.ToString(TrimY)}\", \"datatype\": \"int\"}},"))
-                MainForm.Instance.AddToActionsList("Could not set camera trim");
+                MainForm.Instance.AddToActionsList($"Could not set camera trim{Level.ERROR}");
        }

        // Processes the network config from the camera and returns a string indicating the status
@@ -308,7 +309,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error in getting network config from camera: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error in getting network config from camera: {ex.Message}{Level.ERROR}");
                return null; // Return empty string if there is an error
            }
        }
@@ -364,11 +365,11 @@ namespace AiQ_GUI

            if (FoundCams.Contains("192.168.1.211"))
            {
-                MainForm.Instance.AddToActionsList("Could not set camera to DHCP please check camera.");
+                MainForm.Instance.AddToActionsList($"Could not set camera to DHCP please check camera.{Level.ERROR}");
                return false;
            }

-            MainForm.Instance.AddToActionsList("Camera successfully set to DHCP.");
+            MainForm.Instance.AddToActionsList($"Camera successfully set to DHCP.{Level.Success}");
            return true;
        }

@@ -378,7 +379,7 @@ namespace AiQ_GUI

            using OpenFileDialog openFileDialog1 = new()
            {
-                InitialDirectory = MainForm.GoogleDrivePath,
+                InitialDirectory = GoogleAPI.GoogleDrivePath,
                Filter = "CSV files (*.csv)|*.csv",
                FilterIndex = 0
            };
@@ -387,7 +388,7 @@ namespace AiQ_GUI
                fileToUpload = openFileDialog1.FileName;
            else
            {
-                MainForm.Instance.AddToActionsList("File selection cancelled.", false);
+                MainForm.Instance.AddToActionsList("File selection cancelled.", Level.WARNING);
                return;
            }

@@ -396,7 +397,7 @@ namespace AiQ_GUI

            if ((isIR && !filename.Contains("IR")) || (!isIR && !filename.Contains("OV")))
            {
-                MainForm.Instance.AddToActionsList($"Incorrect file selected. Expected {(isIR ? "IR" : "OV")} file", false);
+                MainForm.Instance.AddToActionsList($"Incorrect file selected. Expected {(isIR ? "IR" : "OV")} file", Level.WARNING);
                return;
            }

@@ -408,7 +409,7 @@ namespace AiQ_GUI

                if (parts.Length < 3)
                {
-                    MainForm.Instance.AddToActionsList($"Invalid row format at line {i + 1}", false);
+                    MainForm.Instance.AddToActionsList($"Invalid row format at line {i + 1}", Level.WARNING);
                    continue;
                }

@@ -419,21 +420,78 @@ namespace AiQ_GUI
                // VISCA format check
                if (!RegexCache.VISCAAPIRegex().IsMatch(command))
                {
-                    MainForm.Instance.AddToActionsList($"{name}: Invalid VISCA command ({command})", false);
+                    MainForm.Instance.AddToActionsList($"{name}: Invalid VISCA command ({command})", Level.WARNING);
                    continue; // do not send it if bad
                }

                string result = await APIHTTPVISCA(ipAddress, command, isIR);

                if (result.Contains(expectedResponse))
-                    MainForm.Instance.AddToActionsList($"{name}: Success ({(isIR ? "IR" : "Colour")})", true);
+                    MainForm.Instance.AddToActionsList($"{name}: Success ({(isIR ? "IR" : "Colour")})", Level.Success);
                else
-                    MainForm.Instance.AddToActionsList($"{name}: Unexpected response ({result})", false);
+                    MainForm.Instance.AddToActionsList($"{name}: Unexpected response ({result})", Level.ERROR);

                await Task.Delay(150);
            }

-            MainForm.Instance.AddToActionsList($"Upload complete ({(isIR ? "IR" : "Colour")}).", true);
+            MainForm.Instance.AddToActionsList($"Upload complete ({(isIR ? "IR" : "Colour")}).", Level.Success);
+        }
+
+        public static async void UploadBlob(List<Camera> soakCameraList)
+        {
+            const string networkFolderPath = @"G:\Shared drives\MAV Production\MAV_146_AiQ_Mk2\Flexi";
+            string fileToUpload = null;
+
+            if (await MainForm.Instance.DisplayQuestion("Do you want the latest Flexi version from the MAV Production folder?"))
+            {
+                fileToUpload = Directory.GetFiles(networkFolderPath, "*.blob").OrderByDescending(File.GetLastWriteTime).FirstOrDefault();
+
+                if (fileToUpload == null)
+                {
+                    MainForm.Instance.AddToActionsList("No .blob file found in the directory.", Level.WARNING);
+                    return;
+                }
+            }
+            else
+            {
+                using OpenFileDialog openFileDialog1 = new()
+                {
+                    InitialDirectory = networkFolderPath,
+                    Filter = "Blob files (*.blob)|*.blob",
+                    FilterIndex = 0
+                };
+
+                if (openFileDialog1.ShowDialog() == DialogResult.OK)
+                    fileToUpload = openFileDialog1.FileName;
+                else
+                {
+                    MainForm.Instance.AddToActionsList("File selection cancelled.", Level.WARNING);
+                    return;
+                }
+            }
+
+            string fileName = Path.GetFileName(fileToUpload);
+            MainForm.Instance.AddToActionsList($"Selected file to upload: {fileToUpload}", Level.LOG);
+
+            foreach (Camera? cam in soakCameraList.Where(c => c.IsChecked))
+            {
+                string apiUrl = $"http://{cam.IP}/upload/software-update/2";
+                Network.Initialize("developer", cam.DevPass);
+                await Task.Delay(1000); // Gives extra time to allow for Network to initialize 
+                MainForm.Instance.AddToActionsList($"Uploading to {cam.IP}...", Level.LOG);
+                string result = await SendBlobFileUpload(apiUrl, fileToUpload, fileName);
+
+                // Retry once on transient errors
+                if (result.Contains("Error while copying content to a stream") || result.Contains("Timeout"))
+                {
+                    MainForm.Instance.AddToActionsList($"Retrying upload to {cam.IP}...", Level.WARNING);
+                    await Task.Delay(1000);
+                    result = await SendBlobFileUpload(apiUrl, fileToUpload, fileName);
+                }
+
+                MainForm.Instance.AddToActionsList($"Upload result for {cam.IP}: {result}");
+                await Task.Delay(500);
+            }
        }
    }

@@ -443,10 +501,8 @@ namespace AiQ_GUI
        public string version { get; set; } = string.Empty;
        public string revision { get; set; } = string.Empty;
        public string buildtime { get; set; } = string.Empty;
-        public string appname { get; set; } = string.Empty;
        public string MAC { get; set; } = string.Empty;
        public int timeStamp { get; set; }
-        public string UUID { get; set; } = string.Empty;
        public string proquint { get; set; } = string.Empty;

        [JsonProperty("Serial No.")]
@@ -510,13 +566,5 @@ namespace AiQ_GUI
    public class Property
    {
        public string Value { get; set; } = string.Empty;
-        public string datatype { get; set; }
-    }
-    public class VaxtorConfig
-    {
-        public string id { get; set; }
-        public long configHash { get; set; }
-        public Property propMinCharHeight { get; set; }
-        public Property propMinGlobalConfidence { get; set; }
    }
 }
--- a/Camera/ImageProcessing.cs
+++ b/Camera/ImageProcessing.cs
@@ -26,7 +26,7 @@ namespace AiQ_GUI
                HttpResponseMessage response = await httpClient.GetAsync(requestUrl);
                if (!response.IsSuccessStatusCode)
                {
-                    MainForm.Instance.AddToActionsList($"No success from {requestUrl} replied {response.StatusCode}");
+                    MainForm.Instance.AddToActionsList($"No success from {requestUrl} replied {response.StatusCode}{Level.ERROR}");
                    return null;
                }

@@ -34,7 +34,7 @@ namespace AiQ_GUI

                if (imageBytes.Length == 0) // Check if the imageBytes is empty
                {
-                    MainForm.Instance.AddToActionsList($"No image data received from {requestUrl}");
+                    MainForm.Instance.AddToActionsList($"No image data received from {requestUrl}{Level.ERROR}");
                    return null;
                }

@@ -43,7 +43,7 @@ namespace AiQ_GUI
                CvInvoke.Imdecode(imageBytes, ImreadModes.AnyColor, mat);
                if (mat.IsEmpty)
                {
-                    MainForm.Instance.AddToActionsList("Failed to decode image with Emgu CV.");
+                    MainForm.Instance.AddToActionsList($"Failed to decode image with Emgu CV.{Level.ERROR}");
                    return null;
                }

@@ -70,12 +70,12 @@ namespace AiQ_GUI
            }
            catch (HttpRequestException ex)
            {
-                MainForm.Instance.AddToActionsList($"HTTP error: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"HTTP error: {ex.Message}{Level.ERROR}");
                return null;
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error processing image: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error processing image: {ex.Message} {Level.ERROR}");
                return null;
            }
        }
@@ -123,7 +123,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error awaiting Colour snapshot: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error awaiting Colour snapshot: {ex.Message} {Level.ERROR}");
                return;
            }

@@ -146,7 +146,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error calculating luminance: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error calculating luminance: {ex.Message} {Level.ERROR}");
                return;
            }
        }
--- a/Camera/LED.cs
+++ b/Camera/LED.cs
@@ -45,7 +45,7 @@
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error checking LEDs: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error checking LEDs: {ex.Message} {Level.ERROR}");
            }
        }
    }
--- a/Camera/Licences.cs
+++ b/Camera/Licences.cs
@@ -25,13 +25,13 @@ namespace AiQ_GUI
            else if (Type == "Audit")
                salt = Auditsalt;
            else
-                return "Unrecognised challenge type: " + Type;
+                return $"Unrecognised challenge type:{Level.ERROR}" + Type;

            if (string.IsNullOrEmpty(challenge) || challenge.Length != 6) // Check challenge format
-                return "Invalid challenge format. Challenge must be 6 characters.";
+                return $"Invalid challenge format. Challenge must be 6 characters.{Level.ERROR}";

            if (string.IsNullOrEmpty(salt) || salt.Length != 32) // Check salt format
-                return "Invalid salt format. Salt must be 32 characters.";
+                return $"Invalid salt format. Salt must be 32 characters.{Level.ERROR}";

            // Hash computation using SHA256 algorithm
            byte[] inputBytes = Encoding.UTF8.GetBytes(challenge + " " + salt); // SHA hash format challenge and salt with space between
@@ -60,7 +60,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                return "Error: Could not generate password " + ex.Message;
+                return $"Error: Could not generate password{Level.ERROR}" + ex.Message;
            }
        }

@@ -85,7 +85,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Exception in FetchDevPassword: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"Exception in FetchDevPassword: {Level.ERROR}" + ex.Message);
                return null;
            }
        }
--- a/Camera/Router.cs
+++ b/Camera/Router.cs
@@ -32,7 +32,7 @@ namespace AiQ_GUI
            }
            catch
            {
-                MainForm.Instance.AddToActionsList("Is the router on the network? Has the MAV Config file been applied?");
+                MainForm.Instance.AddToActionsList($"Is the router on the network? Has the MAV Config file been applied?{Level.WARNING}");
            }

            return null;
@@ -48,31 +48,31 @@ namespace AiQ_GUI

            if (Strength < 25.0)
            {
-                MainForm.Instance.AddToActionsList($"Router signal strength is {Strength} which is below 25%. Please check the router connection.");
+                MainForm.Instance.AddToActionsList($"Router signal strength is {Strength} which is below 25%. Please check the router connection.{Level.WARNING}");
                PassTest = false;
            }

            if (!Router.SimStatus.Contains("SIM Ready"))
            {
-                MainForm.Instance.AddToActionsList($"SIM card is not ready. {Router.SimStatus} Please check the SIM card status.");
+                MainForm.Instance.AddToActionsList($"SIM card is not ready. {Router.SimStatus} Please check the SIM card status.{Level.WARNING}");
                PassTest = false;
            }

            if (!Router.Port3Status.Contains("port:3 link:up speed:100baseT full-duplex"))
            {
-                MainForm.Instance.AddToActionsList($"Port 3 is not connected properly. {Router.Port3Status} Please check the connection.");
+                MainForm.Instance.AddToActionsList($"Port 3 is not connected properly. {Router.Port3Status} Please check the connection. {Level.WARNING}");
                PassTest = false;
            }

            if (!Router.Port4Status.Contains("port:4 link:up speed:100baseT full-duplex"))
            {
-                MainForm.Instance.AddToActionsList($"Port 4 is not connected properly. {Router.Port4Status} Please check the connection.");
+                MainForm.Instance.AddToActionsList($"Port 4 is not connected properly. {Router.Port4Status} Please check the connection. {Level.WARNING}");
                PassTest = false;
            }

            if (!Router.GoodPing)
            {
-                MainForm.Instance.AddToActionsList("Router could not ping 8.8.8.8. Please check the online connection.");
+                MainForm.Instance.AddToActionsList($"Router could not ping 8.8.8.8. Please check the online connection.{Level.WARNING}");
                PassTest = false;
            }

--- a/Camera/SSH.cs
+++ b/Camera/SSH.cs
@@ -25,7 +25,7 @@ namespace AiQ_GUI
            }
            catch (Exception Ex)
            {
-                MainForm.Instance.AddToActionsList($"SSH connection failed: {Ex.Message}. Check password or network.");
+                MainForm.Instance.AddToActionsList($"SSH connection failed: {Ex.Message}. Check password or network. {Level.WARNING}");
            }

            return null;
@@ -75,7 +75,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network.");
+                MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network. {Level.WARNING}");
            }

            string LogMssg = string.Join(" | ", typeof(SSHData).GetProperties().Select(p => $"{p.Name}: {p.GetValue(Data)}"));
@@ -170,7 +170,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network.");
+                MainForm.Instance.AddToActionsList($"SSH connection failed: {ex.Message}. Check password or network. {Level.WARNING}");
            }

            return (string.Empty, string.Empty);
@@ -323,7 +323,7 @@ namespace AiQ_GUI

                if (checkDevice.Result.Trim() != "OK") // Device not found
                {
-                    MainForm.Instance.AddToActionsList($"Block device {device} not found.");
+                    MainForm.Instance.AddToActionsList($"Block device {device} not found. {Level.WARNING}");
                    return false;
                }

@@ -378,7 +378,7 @@ namespace AiQ_GUI

                if (checkDevice.Result.Trim().Length > 1) // Device not found
                {
-                    MainForm.Instance.AddToActionsList($"Cannot sync files to disk. Replied: {checkDevice.Result}. DO NOT TURN OFF, GET SUPERVISOR");
+                    MainForm.Instance.AddToActionsList($"Cannot sync files to disk. Replied: {checkDevice.Result}. DO NOT TURN OFF, GET SUPERVISOR {Level.ERROR}");
                    return;
                }

@@ -387,7 +387,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Cannot sync becuase: {ex.Message}. DO NOT TURN OFF, GET SUPERVISOR");
+                MainForm.Instance.AddToActionsList($"Cannot sync becuase: {ex.Message}. DO NOT TURN OFF, GET SUPERVISOR {Level.ERROR}");
            }
        }
    }
--- a/GoogleAPI.cs
+++ b/GoogleAPI.cs
@@ -1,12 +1,12 @@
 using Google.Apis.Auth.OAuth2;
-using Google.Apis.Gmail.v1;
+//using Google.Apis.Gmail.v1;
 using Google.Apis.Services;
 using Google.Apis.Sheets.v4;
 using Google.Apis.Sheets.v4.Data;
 using Google.Apis.Util.Store;
-using System.Net.Mail;
-using System.Net.Mime;
-using System.Reflection;
+//using System.Net.Mail;
+//using System.Net.Mime;
+//using System.Reflection;

 namespace AiQ_GUI
 {
@@ -18,6 +18,7 @@ namespace AiQ_GUI
        static readonly string credPath = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
        public const string spreadsheetId_ModelInfo = "1bCcCr4OYqfjmydt6UqtmN4FQETezXmZRSStJdCCcqZM";
        public const string DrivePath = @"G:\Shared drives\MAV Production GUI's\"; // Path to google shared drive
+        public const string GoogleDrivePath = @"G:\Shared drives\MAV Production GUI's\AiQ\GUI's\";

        // Startup and make necessary connections to Google servers and make sure user is logged in
        public static bool Setup()
@@ -106,12 +107,12 @@ namespace AiQ_GUI
                }
                else
                {
-                    return "Last serial number not found";
+                    return $"Last serial number not found{Level.ERROR}";
                }
            }
            catch (Exception ex)
            {
-                return $"ERROR: {ex.Message}";
+                return $"ERROR: {ex.Message}{Level.ERROR}";
            }
        }

@@ -147,12 +148,12 @@ namespace AiQ_GUI
                }
                else
                {
-                    return "Serial number not found";
+                    return $"Serial number not found{Level.ERROR}";
                }
            }
            catch (Exception ex)
            {
-                return $"ERROR: {ex.Message}";
+                return $"ERROR: {ex.Message}{Level.ERROR}";
            }
        }

@@ -195,7 +196,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                return "Failed to update spreadsheet data, please check manually" + ex.Message;
+                return $"Failed to update spreadsheet data, please check manually{Level.ERROR}" + ex.Message;
            }
        }

@@ -224,7 +225,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                return "Failed to update spreadsheet data, please check manually" + ex.Message;
+                return $"Failed to update spreadsheet data, please check manually{Level.WARNING}" + ex.Message;
            }
        }

@@ -284,75 +285,76 @@ namespace AiQ_GUI
            return valuesRMA.Count + 2; // Gets the amount of rows, offsets for start from 1 error and adds one to be next row 
        }

-        public static void EmailApproval(string ApprovalRow, string User)
-        {
-            FileStream GmailStream = new($"{DrivePath}R50IQ\\creds.json", FileMode.Open, FileAccess.Read);
-            string[] ScopesGmail = [GmailService.Scope.GmailSend];
+        // DEPRECATED
+        //public static void EmailApproval(string ApprovalRow, string User)
+        //{
+        //    FileStream GmailStream = new($"{DrivePath}R50IQ\\creds.json", FileMode.Open, FileAccess.Read);
+        //    string[] ScopesGmail = [GmailService.Scope.GmailSend];

-            using (GmailStream)
-            {
-                string credPathGmail = Path.Combine(credPath, ".credentials/gmail-dotnet-quickstart.json");
-                credential = GoogleWebAuthorizationBroker.AuthorizeAsync(GoogleClientSecrets.FromStream(GmailStream).Secrets, ScopesGmail, "user", CancellationToken.None, new FileDataStore(credPathGmail, true)).Result;
-                GmailStream.Close();
-            }
+        //    using (GmailStream)
+        //    {
+        //        string credPathGmail = Path.Combine(credPath, ".credentials/gmail-dotnet-quickstart.json");
+        //        credential = GoogleWebAuthorizationBroker.AuthorizeAsync(GoogleClientSecrets.FromStream(GmailStream).Secrets, ScopesGmail, "user", CancellationToken.None, new FileDataStore(credPathGmail, true)).Result;
+        //        GmailStream.Close();
+        //    }

-            // Build the MIME message with attachment
-            using MailMessage mail = new();
-            mail.From = new MailAddress("me");
-            mail.To.Add("richard.porter@mav-systems.com");
-            mail.To.Add("bradley.relyea@mav-systems.com");
-            mail.To.Add("bradley.born@mav-systems.com");
-            mail.Subject = "Approval required";
-            mail.Body = $"Dear Rich,<br><br>Camera needs approval<br>" +
-                        $"https://docs.google.com/spreadsheets/d/1bCcCr4OYqfjmydt6UqtmN4FQETezXmZRSStJdCCcqZM/edit#gid=1931079354&range=A{ApprovalRow}" +
-                        $"<br><br><br>Thanks,<br><br>{User}";
-            mail.IsBodyHtml = true;
+        //    // Build the MIME message with attachment
+        //    using MailMessage mail = new();
+        //    mail.From = new MailAddress("me");
+        //    mail.To.Add("richard.porter@mav-systems.com");
+        //    mail.To.Add("bradley.relyea@mav-systems.com");
+        //    mail.To.Add("bradley.born@mav-systems.com");
+        //    mail.Subject = "Approval required";
+        //    mail.Body = $"Dear Rich,<br><br>Camera needs approval<br>" +
+        //                $"https://docs.google.com/spreadsheets/d/1bCcCr4OYqfjmydt6UqtmN4FQETezXmZRSStJdCCcqZM/edit#gid=1931079354&range=A{ApprovalRow}" +
+        //                $"<br><br><br>Thanks,<br><br>{User}";
+        //    mail.IsBodyHtml = true;

-            // Attach the log file if it exists
-            string logFilePath = LDS.MAVPath + Logging.LogFileName;
-            if (File.Exists(logFilePath))
-            {
-                Attachment logAttachment = new(logFilePath, MediaTypeNames.Text.Plain);
-                logAttachment.Name = Logging.LogFileName;
-                mail.Attachments.Add(logAttachment);
-            }
+        //    // Attach the log file if it exists
+        //    string logFilePath = LDS.MAVPath + Logging.LogFileName;
+        //    if (File.Exists(logFilePath))
+        //    {
+        //        Attachment logAttachment = new(logFilePath, MediaTypeNames.Text.Plain);
+        //        logAttachment.Name = Logging.LogFileName;
+        //        mail.Attachments.Add(logAttachment);
+        //    }

-            // Save the MIME message to a stream
-            using MemoryStream ms = new();
-            SmtpClient smtpClient = new(); // Only used to access the internal Write method
-            Type mailWriterType = typeof(SmtpClient).Assembly.GetType("System.Net.Mail.MailWriter");
-            object? mailWriter = Activator.CreateInstance(
-                mailWriterType,
-                BindingFlags.Instance | BindingFlags.NonPublic,
-                null,
-                [ms, true],
-                null);
+        //    // Save the MIME message to a stream
+        //    using MemoryStream ms = new();
+        //    SmtpClient smtpClient = new(); // Only used to access the internal Write method
+        //    Type mailWriterType = typeof(SmtpClient).Assembly.GetType("System.Net.Mail.MailWriter");
+        //    object? mailWriter = Activator.CreateInstance(
+        //        mailWriterType,
+        //        BindingFlags.Instance | BindingFlags.NonPublic,
+        //        null,
+        //        [ms, true],
+        //        null);

-            typeof(MailMessage).InvokeMember(
-                "Send",
-                BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.InvokeMethod,
-                null,
-                mail,
-                [mailWriter, true, true]);
+        //    typeof(MailMessage).InvokeMember(
+        //        "Send",
+        //        BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.InvokeMethod,
+        //        null,
+        //        mail,
+        //        [mailWriter, true, true]);

-            ms.Position = 0;
-            byte[] rawBytes = ms.ToArray();
+        //    ms.Position = 0;
+        //    byte[] rawBytes = ms.ToArray();

-            GmailService service = new(new BaseClientService.Initializer()
-            {
-                HttpClientInitializer = credential,
-                ApplicationName = ApplicationName,
-            });
+        //    GmailService service = new(new BaseClientService.Initializer()
+        //    {
+        //        HttpClientInitializer = credential,
+        //        ApplicationName = ApplicationName,
+        //    });

-            Google.Apis.Gmail.v1.Data.Message newMsg = new()
-            {
-                Raw = Convert.ToBase64String(rawBytes)
-                .Replace("+", "-")
-                .Replace("/", "_")
-                .Replace("=", "")
-            };
+        //    Google.Apis.Gmail.v1.Data.Message newMsg = new()
+        //    {
+        //        Raw = Convert.ToBase64String(rawBytes)
+        //        .Replace("+", "-")
+        //        .Replace("/", "_")
+        //        .Replace("=", "")
+        //    };

-            service.Users.Messages.Send(newMsg, "me").Execute();
-        }
+        //    service.Users.Messages.Send(newMsg, "me").Execute();
+        //}
    }
 }
--- a/Helper.cs
+++ b/Helper.cs
@@ -83,26 +83,26 @@ namespace AiQ_GUI
                    case 0:
                        if (!await MainForm.Instance.DisplayQuestion("Is the sleeve aligned correctly?"))
                        {
-                            await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Sleeve not aligned");
+                            await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Sleeve not aligned{Level.ERROR}");

                        }
                        break;
                    case 1:
                        if (!await MainForm.Instance.DisplayQuestion("Are all the screws fitted in the front?"))
                        {
-                            await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Not all front screws fitted");
+                            await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Not all front screws fitted{Level.ERROR}");
                        }
                        break;
                    case 2:
                        if (!await MainForm.Instance.DisplayQuestion("Are all the screws fitted in the rear?"))
                        {
-                            await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Not all rear screws fitted");
+                            await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Not all rear screws fitted{Level.ERROR}");
                        }
                        break;
                    case 3:
                        if (await MainForm.Instance.DisplayQuestion("Shake unit, does it rattle?"))
                        {
-                            await MainForm.Instance.TestFailed(Btn, "Visual Test Fail - Unit rattles");
+                            await MainForm.Instance.TestFailed(Btn, $"Visual Test Fail - Unit rattles{Level.ERROR}");
                        }
                        break;
                    default:
@@ -123,7 +123,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error fetching versions for {IPAddress}: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error fetching versions for {IPAddress}: {ex.Message}{Level.ERROR}");
                return null;
            }

@@ -184,9 +184,9 @@ namespace AiQ_GUI
        public string IP { get; set; } = string.Empty;
        public int RMANum { get; set; } = 0;
        public string FlexiVersion { get; set; } = string.Empty; // Flexi version
-        public string Processor { get; set; } = string.Empty; // Nano, Xavier, Orin or Pi?
-        public string ModuleManufacturer { get; set; } = string.Empty; // KT&C or Wonwoo
        public bool IsChecked { get; set; } // Is it checked for soak test?
+        public CheckBox CheckBox { get; set; } = new CheckBox();
+        public string TestReportLoc { get; set; } = string.Empty; // Location of test report file
    }

    // Static class for global flags
--- a/LDS.cs
+++ b/LDS.cs
@@ -17,15 +17,10 @@ namespace AiQ_GUI
            try
            {
                if (!Directory.Exists(MAVPath)) // Check the AiQ folder exists in ProgramData and if it doesn't then create it  
-                {
                    Directory.CreateDirectory(MAVPath);
-                }

                if (!File.Exists(MAVPath + LDSFileName)) // Check the LDS file exists and if it doesn't then create it  
-                {
-                    // Save a blank version of the JSON
-                    File.WriteAllText(MAVPath + LDSFileName, DefaultJSON);
-                }
+                    File.WriteAllText(MAVPath + LDSFileName, DefaultJSON); // Save a blank version of the JSON

                StreamReader file = new(MAVPath + LDSFileName);
                string Content = file.ReadToEnd();
@@ -35,9 +30,8 @@ namespace AiQ_GUI
            }
            catch // If file can't deserialise
            {
-                MainForm.Instance.AddToActionsList("Error loading Local Data Store");
+                MainForm.Instance.AddToActionsList($"Error loading Local Data Store{Level.WARNING}");
                return null; // Return null to indicate failure
-
            }
        }

@@ -51,7 +45,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList($"Error saving Local Data Store: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error saving Local Data Store: {ex.Message}{Level.WARNING}");
            }
        }
    }
--- a/Logging.cs
+++ b/Logging.cs
@@ -43,7 +43,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                Debug.WriteLine($"Error logging message: {ex.Message}");
+                MainForm.Instance.AddToActionsList($"Error logging message: {ex.Message}{Level.ERROR}");
            }
        }
    }
--- a/Microsoft/Access.cs
+++ b/Microsoft/Access.cs
@@ -122,16 +122,14 @@ namespace AiQ_GUI

                    int rowsAffected = cmd.ExecuteNonQuery();
                    // Execute the command and get the number of rows affected
-                    //if (rowsAffected > 0) // If one or more rows were updated
-                    //    AddToActionsList($"Updated {TypeOfTest} for {modelNumber}");
-                    //else
-                    //    AddToActionsList($"No rows found for {modelNumber}");
+                    if (rowsAffected == 0) // If one or more rows were updated
+                        MainForm.Instance.AddToActionsList($"No rows affected for {modelNumber}{Level.ERROR}");
                }
                conn.Close();
            }
            catch
            {
-                MainForm.Instance.AddToActionsList("Could not access Access in Google Drive. Is it running?");
+                MainForm.Instance.AddToActionsList($"Could not access Access in Google Drive. Is it running?{Level.WARNING}");
                return;
            }
        }
@@ -162,10 +160,8 @@ namespace AiQ_GUI
            int rows = cmd.ExecuteNonQuery();
            conn.Close();

-            //if (rows > 0)
-            //    AddToActionsList($"DiagsStats inserted ({rows} row) for model '{model}' on {DateTime.Now:yyyy-MM-dd}");
-            //else
-            //    AddToActionsList("No rows inserted into DiagsStats (unexpected).");
+            if (rows == 0)
+                MainForm.Instance.AddToActionsList($"No rows inserted into DiagsStats (unexpected).{Level.ERROR}");
        }
    }

--- a/Microsoft/Excel.cs
+++ b/Microsoft/Excel.cs
@@ -17,7 +17,7 @@ namespace AiQ_GUI
            }
            else
            {
-                MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
            }
        }

@@ -31,7 +31,7 @@ namespace AiQ_GUI
            }
            else
            {
-                MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
            }
            return null;
        }
@@ -40,7 +40,7 @@ namespace AiQ_GUI
        {
            if (!File.Exists(FilePath))
            {
-                MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
                return -1;
            }

@@ -62,7 +62,7 @@ namespace AiQ_GUI
            {
                if (!File.Exists(FilePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                    MainForm.Instance.AddToActionsList($"Could not find spreadsheet :(  {Level.ERROR}");
                    return "Spreadsheet not found";
                }

@@ -114,7 +114,7 @@ namespace AiQ_GUI
            {
                if (!File.Exists(filePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                    MainForm.Instance.AddToActionsList($"Could not find spreadsheet :) {Level.ERROR}");
                    return "Spreadsheet not found";
                }

@@ -150,7 +150,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Error updating spreadsheet: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"Error updating spreadsheet:{Level.ERROR} " + ex.Message);
                return $"ERROR: {ex.Message}";
            }
        }
@@ -161,7 +161,7 @@ namespace AiQ_GUI
            {
                if (!File.Exists(FilePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                    MainForm.Instance.AddToActionsList($"Could not find spreadsheet :(  {Level.ERROR}");
                    return "Spreadsheet not found";
                }

@@ -202,8 +202,8 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Error updating spreadsheet: " + ex.Message);
-                return "Failed to update spreadsheet data, please check manually: " + ex.Message;
+                MainForm.Instance.AddToActionsList($"Error updating spreadsheet: {Level.WARNING}" + ex.Message);
+                return $"Failed to update spreadsheet data, please check manually: {Level.WARNING}" + ex.Message;
            }
        }

@@ -213,8 +213,9 @@ namespace AiQ_GUI
            {
                if (!File.Exists(FilePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
-                    return "Spreadsheet not found";
+                    MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
+                    return $"Spreadsheet not found{ Level.ERROR}"
+                    ;
                }

                using XLWorkbook workbook = new(FilePath);
@@ -239,8 +240,8 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Error updating Vaxtor spreadsheet: " + ex.Message);
-                return "Failed to update spreadsheet data, please check manually: " + ex.Message;
+                MainForm.Instance.AddToActionsList($"Error updating Vaxtor spreadsheet: {Level.WARNING}" + ex.Message);
+                return $"Failed to update spreadsheet data, please check manually: {Level.WARNING}" + ex.Message;
            }
        }

@@ -250,7 +251,7 @@ namespace AiQ_GUI
            {
                if (!File.Exists(filePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find RMA Control spreadsheet :(");
+                    MainForm.Instance.AddToActionsList($"Could not find RMA Control spreadsheet :({Level.ERROR}");
                    return 0;
                }

@@ -280,7 +281,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Error reading RMA Control spreadsheet: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"Error reading RMA Control spreadsheet: {Level.ERROR}" + ex.Message);
            }

            return 0; // Default if not found
@@ -292,7 +293,7 @@ namespace AiQ_GUI
            {
                if (!File.Exists(filePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                    MainForm.Instance.AddToActionsList($"Could not find spreadsheet :( {Level.ERROR}");
                    return 0;
                }

@@ -316,7 +317,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Error checking serial number row: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"Error checking serial number row: {Level.ERROR}" + ex.Message);
            }

            return 0;
@@ -328,7 +329,7 @@ namespace AiQ_GUI
            {
                if (!File.Exists(filePath))
                {
-                    MainForm.Instance.AddToActionsList("Could not find spreadsheet :(");
+                    MainForm.Instance.AddToActionsList($"Could not find spreadsheet :({Level.ERROR}");
                    return -1;
                }

@@ -343,7 +344,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Error checking next free row: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"Error checking next free row: {Level.ERROR}" + ex.Message);
                return -1;
            }
        }
--- a/Microsoft/StatsExcel.cs
+++ b/Microsoft/StatsExcel.cs
@@ -23,7 +23,7 @@ namespace AiQ_GUI
                DateTime? lastStatsRun = null;
                try
                {
-                    using (OleDbCommand cmdPeriod = new OleDbCommand("SELECT LastStatsRun FROM UniversalData", conn))
+                    using (OleDbCommand cmdPeriod = new("SELECT LastStatsRun FROM UniversalData", conn))
                    {
                        object res = cmdPeriod.ExecuteScalar();
                        if (res != null && res != DBNull.Value)
@@ -37,7 +37,7 @@ namespace AiQ_GUI
                }

                // ==================== MAIN STATS EXPORT ====================
-                string selectColumns = @"
+                const string selectColumns = @"
                                ModelNumber,
                                [Total Tests Run],
                                [Pre Tests Passed],
@@ -125,7 +125,7 @@ namespace AiQ_GUI
                DateTime monthStart = new(now.Year, now.Month, 1);
                DateTime nextMonth = monthStart.AddMonths(1);

-                string diagsQuery = @"
+                const string diagsQuery = @"
                        SELECT 
                            [Date],
                            [Model],
@@ -136,13 +136,12 @@ namespace AiQ_GUI
                        FROM DiagsStats
                        WHERE [Date] >= ? AND [Date] < ?";

-                using (OleDbCommand diagsCmd = new OleDbCommand(diagsQuery, conn))
+                using (OleDbCommand diagsCmd = new(diagsQuery, conn))
                {
                    diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = monthStart });
                    diagsCmd.Parameters.Add(new OleDbParameter { OleDbType = OleDbType.Date, Value = nextMonth });

-                    using (OleDbDataAdapter diagsAdapter = new OleDbDataAdapter(diagsCmd))
-                    {
+                    using OleDbDataAdapter diagsAdapter = new(diagsCmd);
                    DataTable diagsTable = new();
                    diagsAdapter.Fill(diagsTable);

@@ -160,12 +159,10 @@ namespace AiQ_GUI
                        MainForm.Instance.AddToActionsList($"Added DiagsStats ({diagsTable.Rows.Count} rows) starting at row {startRow}.");
                    }
                }
-                }

                // ==================== SAVE MAIN SHEET ====================
                workbook.SaveAs(exportPath);
                MainForm.Instance.AddToActionsList($"Added {sheetName} to workbook: {exportPath}");
-
                workbook.Dispose();

                // ==================== BACKUP TABLE (ALWAYS, BEFORE RESET) ====================
@@ -199,7 +196,7 @@ namespace AiQ_GUI
                {
                    try
                    {
-                        string resetSql = @"
+                        const string resetSql = @"
                                UPDATE AiQ SET
                                    [Total Tests Run] = 0,
                                    [Pre Tests Passed] = 0,
--- a/Network.cs
+++ b/Network.cs
@@ -32,10 +32,8 @@ namespace AiQ_GUI
                UP = await PingIP("10.10.10.137");
                await Task.Delay(500);
                if (i >= 5)
-                {
-                    //MainForm.Instance.AddToActionsList($"Could not initialise new network with USER: {username} & PSWD: {password}"); 
                    return; // Try 5 times max
-                }
+
                i++;
            }
        }
@@ -73,15 +71,15 @@ namespace AiQ_GUI
            }
            catch (TaskCanceledException ex)
            {
-                return $"HTTP error calling {url}: {ex.Message}";
+                return $"HTTP error calling {url}: {ex.Message}{Level.ERROR}";
            }
            catch (HttpRequestException ex)
            {
-                return $"HTTP error calling {url}: {ex.Message}";
+                return $"HTTP error calling {url}: {ex.Message}{Level.ERROR}";
            }
            catch (Exception ex)
            {
-                return $"Unexpected error calling {url}: {ex.Message}";
+                return $"Unexpected error calling {url}: {ex.Message}{Level.ERROR}";
            }
        }

@@ -159,9 +157,9 @@ namespace AiQ_GUI
                    PingReply reply = await myPing.SendPingAsync(ipAddress, 1000); // Timeout is 1s
                    return reply.Status == IPStatus.Success;
                }
-                catch (PingException ex) { MainForm.Instance.AddToActionsList($"PingException: Unable to ping {ipAddress}. Reason: {ex.Message}"); }
-                catch (SocketException ex) { MainForm.Instance.AddToActionsList($"SocketException: Network error while pinging {ipAddress}. Reason: {ex.Message}"); }
-                catch (Exception ex) { MainForm.Instance.AddToActionsList($"Unexpected error while pinging {ipAddress}: {ex.Message}"); }
+                catch (PingException ex) { MainForm.Instance.AddToActionsList($"PingException: Unable to ping {ipAddress}. Reason: {ex.Message}{Level.WARNING}"); }
+                catch (SocketException ex) { MainForm.Instance.AddToActionsList($"SocketException: Network error while pinging {ipAddress}. Reason: {ex.Message}{Level.ERROR}"); }
+                catch (Exception ex) { MainForm.Instance.AddToActionsList($"Unexpected error while pinging {ipAddress}: {ex.Message}{Level.ERROR}"); }
            }

            return false;
--- a/PDF.cs
+++ b/PDF.cs
@@ -167,7 +167,6 @@ namespace AiQ_GUI
            }

            List<string> logLines = File.Exists(logFilePath) ? File.ReadAllLines(logFilePath).ToList() : new List<string>();
-
            List<string> errorLines = logLines.Where(l => l.Contains("[ERROR]")).ToList();
            List<string> warningLines = logLines.Where(l => l.Contains("[WARNING]")).ToList();

@@ -337,7 +336,17 @@ namespace AiQ_GUI
                renderer.PdfDocument.Options.Layout = PdfWriterLayout.Compact;

                // Construct save path
-                string fullPath = TestRecordDir + CamSoak.Model + $"\\SoakTestReport_{CamSoak.Model}_{CamSoak.Serial}_{pcTime:dd-MM-yyyy_HH-mm-ss}" + (CamSoak.RMANum != 0 ? $" RMA{CamSoak.RMANum}" : "") + ".pdf";
+                string SaveDir = TestRecordDir + CamSoak.Model;
+
+                if (!Directory.Exists(TestRecordDir))
+                {
+                    SaveDir = Path.Combine(LDS.MAVPath, "SoakTestRecords"); // Gets local folder if the main TestRecordDir is not found (no google drive).
+                    if (!Directory.Exists(SaveDir))
+                        Directory.CreateDirectory(SaveDir);
+                }
+
+                string fullPath = Path.Combine(SaveDir, $"SoakTestReport_{CamSoak.Model}_{CamSoak.Serial}_{pcTime:dd-MM-yyyy_HH-mm-ss}" + (CamSoak.RMANum != 0 ? $" RMA{CamSoak.RMANum}" : "") + ".pdf");
+                //string fullPath = TestRecordDir + CamSoak.Model + $"\\SoakTestReport_{CamSoak.Model}_{CamSoak.Serial}_{pcTime:dd-MM-yyyy_HH-mm-ss}" + (CamSoak.RMANum != 0 ? $" RMA{CamSoak.RMANum}" : "") + ".pdf";

                renderer.PdfDocument.Save(fullPath);
                Logging.LogMessage("Soak Test PDF saved to " + fullPath);
--- a/Soak/Selenium.cs
+++ b/Soak/Selenium.cs
@@ -19,7 +19,7 @@ namespace AiQ_GUI
            }
            catch (WebDriverTimeoutException)
            {
-                MainForm.Instance.AddToActionsList("Could not load web page " + url + "1. Check camera has no password set. " + Environment.NewLine + "2. If unable to fix speak to supervisor.");
+                MainForm.Instance.AddToActionsList($"Could not load web page {Level.ERROR}" + url + $"1. Check camera has no password set. {Level.ERROR}" + Environment.NewLine + $"2. If unable to fix speak to supervisor.{Level.ERROR}");
            }
        }

@@ -71,11 +71,11 @@ namespace AiQ_GUI

                loginBtn.Click();

-                MainForm.Instance.AddToActionsList("Switched user and logged in.");
+                MainForm.Instance.AddToActionsList($"Switched user and logged in.{Level.Success}");
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("SwitchUser failed: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"SwitchUser failed: {Level.ERROR}" + ex.Message);
            }
        }

@@ -99,7 +99,7 @@ namespace AiQ_GUI
                    ClickElementByID(elementID, driver, false);
                }

-                MainForm.Instance.AddToActionsList("Could not click " + elementID);
+                MainForm.Instance.AddToActionsList($"Could not click {Level.WARNING}" + elementID);
            }
        }

@@ -136,7 +136,7 @@ namespace AiQ_GUI
            }
            catch (Exception ex)
            {
-                MainForm.Instance.AddToActionsList("Failed to create ChromeDriver: " + ex.Message);
+                MainForm.Instance.AddToActionsList($"Failed to create ChromeDriver: {Level.ERROR}" + ex.Message);
                throw;
            }
        }
@@ -159,10 +159,7 @@ namespace AiQ_GUI
            await Task.Delay(500); // Wait for the change to take effect

            if (!await Checkflashline(driver, CamAct))
-            {
                Logging.LogWarningMessage("Bad flashline after changing: " + fullId, SoakLogFile);
-                MainForm.Instance.AddToActionsList("Bad flashline after changing: " + fullId);
-            }
        }

        // Monitors the flashline element's color to determine success (green) or failure (red) of a camera 
--- a/Soak/SoakTest.cs
+++ b/Soak/SoakTest.cs
@@ -7,7 +7,7 @@ namespace AiQ_GUI
    internal class SoakTest
    {
        // Main soak test loop: Randomise dropdowns, run luminance test every hour, power cycle at 7am
-        public static async Task StartSoak(Camera CamInfo, CancellationToken token)
+        public static async Task StartSoak(Camera CamInfo, CheckBox CkBx, CancellationToken token)
        {
            if (CamInfo.Serial == "N/A")
                CamInfo.Serial = "UNKNOWN"; // If serial is not set, set it to UNKNOWN. Cannot have N/A in file names.
@@ -34,8 +34,8 @@ namespace AiQ_GUI
                    }
                    catch (Exception ex)
                    {
-                        Logging.LogErrorMessage($"Initial connection failed: {ex.Message}", SoakLogFile);
-                        MainForm.Instance.AddToActionsList($"[{CamInfo.IP}] Initial connection failed: {ex.Message}");
+                        SoakError($"Initial connection failed: {ex.Message}", SoakLogFile, CamInfo.CheckBox);
+                        MainForm.Instance.AddToActionsList($"[{CamInfo.IP}] Initial connection failed: {Level.ERROR}{ex.Message}");

                        // Wait 10 seconds before trying again
                        await Task.Delay(TimeSpan.FromSeconds(10), token);
@@ -50,7 +50,7 @@ namespace AiQ_GUI
                }
                catch (Exception ex)
                {
-                    Logging.LogErrorMessage($"Failed to get element IDs: {ex.Message}", SoakLogFile);
+                    SoakError($"Failed to get element IDs: {Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
                    return;
                }

@@ -72,7 +72,7 @@ namespace AiQ_GUI
                            // Retry ping until camera responds or cancelled
                            while (!await Network.PingIP(CamInfo.IP) && !token.IsCancellationRequested)
                            {
-                                Logging.LogErrorMessage($"Camera did not respond after restart.", SoakLogFile);
+                                SoakError($"Camera did not respond after restart.{Level.ERROR}", SoakLogFile, CamInfo.CheckBox);
                                await Task.Delay(TimeSpan.FromMinutes(1), token); // Retry after delay of 1 minute
                            }

@@ -86,7 +86,7 @@ namespace AiQ_GUI
                        }
                        catch (Exception ex)
                        {
-                            Logging.LogErrorMessage($"Error during power cycle: {ex.Message}", SoakLogFile);
+                            SoakError($"Error during power cycle: {Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
                        }
                    }

@@ -96,11 +96,11 @@ namespace AiQ_GUI
                        Logging.LogMessage($"Hour changed to {currentHour}, running ImageCheck.", SoakLogFile);
                        try
                        {
-                            ImageCheck(driver, SoakLogFile, CamInfo.IP, CamInfo.DevPass, elementID);
+                            ImageCheck(driver, SoakLogFile, CamInfo, elementID);
                        }
                        catch (Exception ex)
                        {
-                            Logging.LogErrorMessage($"ImageCheck failed: {ex.Message}", SoakLogFile);
+                            SoakError($"ImageCheck failed: {Level.ERROR}{Level.ERROR} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
                        }
                        lastHour = currentHour;
                    }
@@ -119,7 +119,7 @@ namespace AiQ_GUI
                    }
                    catch (Exception ex)
                    {
-                        Logging.LogErrorMessage($"ChangeRandomDropdown failed: {ex.Message}", SoakLogFile);
+                        SoakError($"ChangeRandomDropdown failed: {Level.WARNING} {ex.Message}", SoakLogFile, CamInfo.CheckBox);
                    }

                    try
@@ -144,6 +144,8 @@ namespace AiQ_GUI

                if (SoakTestPath != null)
                {
+                    CamInfo.TestReportLoc = SoakTestPath;
+
                    // Delete the soak test log file if the report was created successfully
                    try
                    {
@@ -152,7 +154,7 @@ namespace AiQ_GUI
                    }
                    catch (Exception ex)
                    {
-                        Logging.LogErrorMessage($"Failed to delete soak log file: {ex.Message}{Environment.NewLine}Please delete if you find this.", SoakLogFile);
+                        SoakError($"Failed to delete soak log file: {ex.Message}{Environment.NewLine}Please delete if you find this.", SoakLogFile, CamInfo.CheckBox);
                    }

                    // Find the final test report PDF for this camera
@@ -170,13 +172,13 @@ namespace AiQ_GUI
                    }
                    catch (Exception ex)
                    {
-                        MainForm.Instance.AddToActionsList($"Failed to find final test report: {ex.Message}");
+                        MainForm.Instance.AddToActionsList($"Failed to find final test report: {Level.ERROR}{ex.Message}");
                    }

                    // Link PDFs if both exist
                    if (!string.IsNullOrEmpty(finalTestPath) && File.Exists(finalTestPath) && !string.IsNullOrEmpty(SoakTestPath) && File.Exists(SoakTestPath))
                    {
-                        string outputPath = finalTestDir + $"Final&SoakTestReport_{CamInfo.Model}_{CamInfo.Serial}_{DateTime.Now.ToString("dd-MM-yyyy_HH-mm-ss")}.pdf";
+                        string outputPath = finalTestDir + $"Final&SoakTestReport_{CamInfo.Model}_{CamInfo.Serial}_{DateTime.Now.ToString("dd-MM-yyyy_HH-mm-ss")}.pdf{Level.Success}";
                        try
                        {
                            if (PDF.LinkPDFs(finalTestPath, SoakTestPath, outputPath)) // Delete the separate soak and final test reports if Linking was successful
@@ -186,7 +188,7 @@ namespace AiQ_GUI
                                File.Delete(SoakTestPath);
                            }
                            else
-                                MainForm.Instance.AddToActionsList($"Failed to link or delete PDFs");
+                                MainForm.Instance.AddToActionsList($"Failed to link or delete PDFs {Level.ERROR}");
                        }
                        catch (Exception ex)
                        {
@@ -198,7 +200,7 @@ namespace AiQ_GUI
        }

        // Capture's bright and dark images, then compares their luminance to verify sufficient contrast and adds results to the log
-        public static async Task LuminescenceMean(string FullID, ChromeDriver driver, string[] SettingMinMax, string SoakLogFile, string IP, string DevPass, string CamAct)
+        public static async Task LuminescenceMean(string FullID, ChromeDriver driver, string[] SettingMinMax, string SoakLogFile, Camera CamInfo, string CamAct)
        {
            string controlType = FullID.Split('_')[0]; // Extract control type from FullID (e.g. "Shutter_1234" → "Shutter")

@@ -208,11 +210,11 @@ namespace AiQ_GUI
            await Task.Delay(500);

            // Take bright image
-            Image ImageBright = await ImageProcessing.GetProcessedImage("Infrared", IP, DevPass);
+            Image ImageBright = await ImageProcessing.GetProcessedImage("Infrared", CamInfo.IP, CamInfo.DevPass);
            if (ImageBright == null)
            {
                Logging.LogWarningMessage($"Bright image is null for {controlType} at setting {SettingMinMax[0]}", SoakLogFile);
-                MainForm.Instance.AddToActionsList($"Bright image is null for {controlType} at setting {SettingMinMax[0]}");
+                MainForm.Instance.AddToActionsList($"Bright image is null for {controlType} at setting {SettingMinMax[0]}{Level.WARNING}");
                return;
            }

@@ -222,11 +224,11 @@ namespace AiQ_GUI
            await Task.Delay(500);

            // Take dark image
-            Image ImageDark = await ImageProcessing.GetProcessedImage("Infrared", IP, DevPass);
+            Image ImageDark = await ImageProcessing.GetProcessedImage("Infrared", CamInfo.IP, CamInfo.DevPass);
            if (ImageDark == null)
            {
                Logging.LogWarningMessage($"Dark image is null for {controlType} at setting {SettingMinMax[1]}", SoakLogFile);
-                MainForm.Instance.AddToActionsList($"Dark image is null for {controlType} at setting {SettingMinMax[1]}");
+                MainForm.Instance.AddToActionsList($"Dark image is null for {controlType} at setting {SettingMinMax[1]}{Level.WARNING}");
                return;
            }

@@ -236,9 +238,10 @@ namespace AiQ_GUI

            if (Bright_Lum < Dark_Lum * 1.01)
            {
-                Logging.LogErrorMessage(
-                    $"Insufficient luminance contrast. Bright: {Bright_Lum:F2}, Dark: {Dark_Lum:F2} | Type: {controlType} | Bright Setting: {SettingMinMax[0]}, Dark Setting: {SettingMinMax[1]}",
-                    SoakLogFile
+                SoakError(
+                    $"Insufficient luminance contrast. Bright: {Bright_Lum:F2}, Dark: {Dark_Lum:F2} | Type: {controlType} | Bright Setting: {SettingMinMax[0]}, Dark Setting: {SettingMinMax[1]}{Level.WARNING}",
+                    SoakLogFile,
+                    CamInfo.CheckBox
                );
            }
            else
@@ -251,7 +254,7 @@ namespace AiQ_GUI
        }

        // Performs a series of camera control adjustments and luminance checks to verify image settings functionality
-        public async static void ImageCheck(ChromeDriver driver, string SoakLogFile, string IP, string DevPass, ElementID elementID)
+        public async static void ImageCheck(ChromeDriver driver, string SoakLogFile, Camera CamInfo, ElementID elementID)
        {
            await Selenium.Dropdown_Change(elementID.modeId, "Manual", driver, SoakLogFile, elementID.CamAct);
            await Selenium.Dropdown_Change(elementID.shutterId, "1/1000", driver, SoakLogFile, elementID.CamAct);
@@ -259,11 +262,11 @@ namespace AiQ_GUI
            await Selenium.Dropdown_Change(elementID.irisId, "F4.0", driver, SoakLogFile, elementID.CamAct);
            await Selenium.Dropdown_Change(elementID.irLevelId, "Safe", driver, SoakLogFile, elementID.CamAct);

-            await LuminescenceMean(elementID.shutterId, driver, ["1/100", "1/10000"], SoakLogFile, IP, DevPass, elementID.CamAct); // Check Shutter goes from min to max
+            await LuminescenceMean(elementID.shutterId, driver, ["1/100", "1/10000"], SoakLogFile, CamInfo, elementID.CamAct); // Check Shutter goes from min to max
            await Selenium.Dropdown_Change(elementID.shutterId, "1/1000", driver, SoakLogFile, elementID.CamAct); // Reset to default
-            await LuminescenceMean(elementID.irisId, driver, ["F2.0", "F16"], SoakLogFile, IP, DevPass, elementID.CamAct); // Check iris goes from min to max
+            await LuminescenceMean(elementID.irisId, driver, ["F2.0", "F16"], SoakLogFile, CamInfo, elementID.CamAct); // Check iris goes from min to max
            await Selenium.Dropdown_Change(elementID.irisId, "F4.0", driver, SoakLogFile, elementID.CamAct); // Reset to default
-            await LuminescenceMean(elementID.gainId, driver, ["20dB", "0dB"], SoakLogFile, IP, DevPass, elementID.CamAct); // Check gain goes from min to max
+            await LuminescenceMean(elementID.gainId, driver, ["20dB", "0dB"], SoakLogFile, CamInfo, elementID.CamAct); // Check gain goes from min to max
        }

        public async static Task ChangeRandomDropdown(ChromeDriver driver, string SoakLogFile, ElementID elementID)
@@ -319,6 +322,12 @@ namespace AiQ_GUI

            return dynamicButton;
        }
+
+        private static void SoakError(string ErrMssg, string LogFile, CheckBox CkBx)
+        {
+            Logging.LogErrorMessage(ErrMssg, LogFile);
+            CkBx.ForeColor = Color.Red;
+        }
    }

    public class ElementID
Author	SHA1	Message	Date
Bradley Born	30bd2fe73c	AddToAction List colours	2025-12-02 12:59:40 +00:00
Bradley Relyea	e29d104d47	V4.5	2025-11-26 14:39:07 +00:00
Bradley Relyea	791cee91d2	V4.4 with modified god mode and 211 at end of soak test.	2025-11-11 14:17:31 +00:00