BradleyRelyea/AiQ_GUI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: BradleyRelyea:a91c3b846f68518178604c26a5fc50bc4ebfde8e
Branches Tags
BradleyRelyea:master BradleyRelyea:ExcelStats
..
compare: BradleyRelyea:00b225a3db2f9aed474f6ebaa69bc54678d405ec
Branches Tags
BradleyRelyea:master BradleyRelyea:ExcelStats

2 Commits
a91c3b846f ... 00b225a3db

Author SHA1 Message Date
Bradley Relyea
00b225a3db V4.4 merged 2025-11-11 13:58:29 +00:00
Bradley Relyea
e94a1f1f5c Find cams timeout extended 2025-11-11 13:49:42 +00:00
7 changed files with 74 additions and 45 deletions
Expand all files Collapse all files

72
AiQ_GUI.Designer.cs generated
View File

@@ -144,8 +144,8 @@ namespace AiQ_GUI
BtnZoom8000 = new Button(); BtnZoom8000 = new Button();
BtnZoomWide = new Button(); BtnZoomWide = new Button();
TabSettings = new TabPage(); TabSettings = new TabPage();
UploadWonwooSetIR = new Button(); BtnUploadWonwooSetIR = new Button();
UploadWonwooSetOV = new Button(); BtnUploadWonwooSetOV = new Button();
BtnAdminStart = new Button(); BtnAdminStart = new Button();
BtnFirewall = new Button(); BtnFirewall = new Button();
TabImages = new TabPage(); TabImages = new TabPage();
@@ -1838,8 +1838,8 @@ namespace AiQ_GUI
// TabSettings // TabSettings
// //
TabSettings.BackColor = Color.FromArgb(39, 37, 55); TabSettings.BackColor = Color.FromArgb(39, 37, 55);
TabSettings.Controls.Add(UploadWonwooSetIR); TabSettings.Controls.Add(BtnUploadWonwooSetIR);
TabSettings.Controls.Add(UploadWonwooSetOV); TabSettings.Controls.Add(BtnUploadWonwooSetOV);
TabSettings.Controls.Add(BtnAdminStart); TabSettings.Controls.Add(BtnAdminStart);
TabSettings.Controls.Add(BtnFirewall); TabSettings.Controls.Add(BtnFirewall);
TabSettings.Controls.Add(PanelSettings); TabSettings.Controls.Add(PanelSettings);
@@ -1850,39 +1850,39 @@ namespace AiQ_GUI
TabSettings.TabIndex = 3; TabSettings.TabIndex = 3;
TabSettings.Text = "Settings"; TabSettings.Text = "Settings";
// //
// UploadWonwooSetIR // BtnUploadWonwooSetIR
// //
UploadWonwooSetIR.BackColor = Color.FromArgb(70, 65, 80); BtnUploadWonwooSetIR.BackColor = Color.FromArgb(70, 65, 80);
UploadWonwooSetIR.FlatAppearance.BorderColor = Color.FromArgb(70, 65, 80); BtnUploadWonwooSetIR.FlatAppearance.BorderColor = Color.FromArgb(70, 65, 80);
UploadWonwooSetIR.FlatAppearance.BorderSize = 0; BtnUploadWonwooSetIR.FlatAppearance.BorderSize = 0;
UploadWonwooSetIR.FlatStyle = FlatStyle.Flat; BtnUploadWonwooSetIR.FlatStyle = FlatStyle.Flat;
UploadWonwooSetIR.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold); BtnUploadWonwooSetIR.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
UploadWonwooSetIR.ForeColor = SystemColors.Control; BtnUploadWonwooSetIR.ForeColor = SystemColors.Control;
UploadWonwooSetIR.Location = new Point(210, 304); BtnUploadWonwooSetIR.Location = new Point(210, 304);
UploadWonwooSetIR.Margin = new Padding(4, 3, 4, 3); BtnUploadWonwooSetIR.Margin = new Padding(4, 3, 4, 3);
UploadWonwooSetIR.Name = "UploadWonwooSetIR"; BtnUploadWonwooSetIR.Name = "BtnUploadWonwooSetIR";
UploadWonwooSetIR.Size = new Size(180, 49); BtnUploadWonwooSetIR.Size = new Size(180, 49);
UploadWonwooSetIR.TabIndex = 244; BtnUploadWonwooSetIR.TabIndex = 244;
UploadWonwooSetIR.Text = "Upload Wonwoo Settings IR"; BtnUploadWonwooSetIR.Text = "Upload Wonwoo Settings IR";
UploadWonwooSetIR.UseVisualStyleBackColor = false; BtnUploadWonwooSetIR.UseVisualStyleBackColor = false;
UploadWonwooSetIR.Click += UploadWonwooSetIR_Click; BtnUploadWonwooSetIR.Click += UploadWonwooSetIR_Click;
// //
// UploadWonwooSetOV // BtnUploadWonwooSetOV
// //
UploadWonwooSetOV.BackColor = Color.FromArgb(70, 65, 80); BtnUploadWonwooSetOV.BackColor = Color.FromArgb(70, 65, 80);
UploadWonwooSetOV.FlatAppearance.BorderColor = Color.FromArgb(70, 65, 80); BtnUploadWonwooSetOV.FlatAppearance.BorderColor = Color.FromArgb(70, 65, 80);
UploadWonwooSetOV.FlatAppearance.BorderSize = 0; BtnUploadWonwooSetOV.FlatAppearance.BorderSize = 0;
UploadWonwooSetOV.FlatStyle = FlatStyle.Flat; BtnUploadWonwooSetOV.FlatStyle = FlatStyle.Flat;
UploadWonwooSetOV.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold); BtnUploadWonwooSetOV.Font = new Font("Segoe UI Semibold", 10F, FontStyle.Bold);
UploadWonwooSetOV.ForeColor = SystemColors.Control; BtnUploadWonwooSetOV.ForeColor = SystemColors.Control;
UploadWonwooSetOV.Location = new Point(19, 304); BtnUploadWonwooSetOV.Location = new Point(19, 304);
UploadWonwooSetOV.Margin = new Padding(4, 3, 4, 3); BtnUploadWonwooSetOV.Margin = new Padding(4, 3, 4, 3);
UploadWonwooSetOV.Name = "UploadWonwooSetOV"; BtnUploadWonwooSetOV.Name = "BtnUploadWonwooSetOV";
UploadWonwooSetOV.Size = new Size(181, 49); BtnUploadWonwooSetOV.Size = new Size(181, 49);
UploadWonwooSetOV.TabIndex = 243; BtnUploadWonwooSetOV.TabIndex = 243;
UploadWonwooSetOV.Text = "Upload Wonwoo Settings OV"; BtnUploadWonwooSetOV.Text = "Upload Wonwoo Settings OV";
UploadWonwooSetOV.UseVisualStyleBackColor = false; BtnUploadWonwooSetOV.UseVisualStyleBackColor = false;
UploadWonwooSetOV.Click += UploadWonwooSetOV_Click; BtnUploadWonwooSetOV.Click += UploadWonwooSetOV_Click;
// //
// BtnAdminStart // BtnAdminStart
// //
@@ -2249,7 +2249,7 @@ namespace AiQ_GUI
private Button BtnAdminStart; private Button BtnAdminStart;
private Button SetGodModeAll; private Button SetGodModeAll;
private Button BtnFactoryDefault; private Button BtnFactoryDefault;
private Button UploadWonwooSetOV; private Button BtnUploadWonwooSetOV;
private Button UploadWonwooSetIR; private Button BtnUploadWonwooSetIR;
} }
} }

31
AiQ_GUI.cs
View File

@@ -771,7 +771,7 @@ namespace AiQ_GUI
private async void BtnFindCams_Click(object sender, EventArgs e) private async void BtnFindCams_Click(object sender, EventArgs e)
{ {
CbBxFoundCams.Text = "Searching"; CbBxFoundCams.Text = "Searching";
BtnFindCams.Enabled = BtnSetAll211.Enabled = BtnSoak.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnUploadBlob.Enabled = SetGodModeAll.Enabled = BtnFactoryDefault.Enabled = false; BtnFindCams.Enabled = BtnSetAll211.Enabled = BtnSoak.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnUploadBlob.Enabled = SetGodModeAll.Enabled = BtnFactoryDefault.Enabled = BtnUploadWonwooSetIR.Enabled = BtnUploadWonwooSetOV.Enabled = false;
BtnSetGodMode.BackColor = BtnUploadBlob.BackColor = BtnFactoryDefault.BackColor = BtnSetAll211.BackColor = BtnColour; BtnSetGodMode.BackColor = BtnUploadBlob.BackColor = BtnFactoryDefault.BackColor = BtnSetAll211.BackColor = BtnColour;
CbBxFoundCams.Items.Clear(); CbBxFoundCams.Items.Clear();
soakCameraList.Clear(); soakCameraList.Clear();
@@ -887,7 +887,7 @@ namespace AiQ_GUI
else else
{ {
CbBxFoundCams.BackColor = Color.Red; CbBxFoundCams.BackColor = Color.Red;
BtnSecret.Enabled = BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = false; BtnSecret.Enabled = BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnUploadWonwooSetIR.Enabled = BtnUploadWonwooSetOV.Enabled = false;
} }
TestStartConditions(); TestStartConditions();
@@ -972,7 +972,7 @@ namespace AiQ_GUI
if (CbBxFoundCams.BackColor != BtnColour || CbBxFoundCams.Text.Contains("Found")) if (CbBxFoundCams.BackColor != BtnColour || CbBxFoundCams.Text.Contains("Found"))
TSC = SetInvalid("Select camera IP address."); TSC = SetInvalid("Select camera IP address.");
else else
BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnZoom8000.Enabled = BtnZoomWide.Enabled = true; // Allow user to go to camera webpage & change DHCP/211 BtnOpenWebpage.Enabled = BtnSet211.Enabled = BtnSetGodMode.Enabled = BtnZoom8000.Enabled = BtnZoomWide.Enabled = BtnUploadWonwooSetIR.Enabled = BtnUploadWonwooSetOV.Enabled = true; // Allow user to go to camera webpage & change DHCP/211
// Name chosen // Name chosen
if (CbBxUserName.Text == "Select Operator to Begin Test" || CbBxUserName.Text.Length < 2) if (CbBxUserName.Text == "Select Operator to Begin Test" || CbBxUserName.Text.Length < 2)
@@ -1592,6 +1592,8 @@ namespace AiQ_GUI
string[,] GOD_JSON = { { "propGodMode", "false" } }; string[,] GOD_JSON = { { "propGodMode", "false" } };
foreach (Camera SCL in soakCameraList.Where(c => c.IsChecked)) // only checked cameras foreach (Camera SCL in soakCameraList.Where(c => c.IsChecked)) // only checked cameras
{ {
if (!SCL.IsChecked)
continue;
try try
{ {
Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera Network.Initialize("developer", SCL.DevPass); // Ensure network is initialized to the right camera
@@ -1599,12 +1601,34 @@ namespace AiQ_GUI
await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON); await FlexiAPI.HTTP_Update("GLOBAL--FlexiApplication", SCL.IP, GOD_JSON);
await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON); await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
AddToActionsList($"Setting 211 & God Mode off for camera {SCL.IP}", false); 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);
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);
i--; // Decriment count becuase they will stack into 211
} }
catch (Exception ex) 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); // In case non AiQ's get caught up
} }
} }
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
{
// GOOD??
}
else
{
// BAD??
}
} }
} }
@@ -1734,7 +1758,6 @@ namespace AiQ_GUI
stopWatchTest.Stop(); stopWatchTest.Stop();
AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff")); AddToActionsList("RunTime " + stopWatchTest.Elapsed.ToString(@"hh\:mm\:ss\.ff"));
} }
} }
} }

3
AiQ_GUI.resx
View File

@@ -123,6 +123,9 @@
<metadata name="ToolTipClipboard.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolTipClipboard.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>159, 17</value> <value>159, 17</value>
</metadata> </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"> <metadata name="TimerDDC.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>690, 19</value> <value>690, 19</value>
</metadata> </metadata>

4
AiQ_GUI_NET_Test.csproj
View File

@@ -16,7 +16,7 @@
<Product>AiQ GUI</Product> <Product>AiQ GUI</Product>
<Authors>MAV Systems Ltd</Authors> <Authors>MAV Systems Ltd</Authors>
<PackageId>AiQ GUI</PackageId> <PackageId>AiQ GUI</PackageId>
<Version>4.3.0</Version> <Version>4.4.0</Version>
<Description>A GUI to control and test the AiQ</Description> <Description>A GUI to control and test the AiQ</Description>
<Copyright>MAV Systems Ltd 2025</Copyright> <Copyright>MAV Systems Ltd 2025</Copyright>
<PackageIcon>MAV - Plain - Blue.png</PackageIcon> <PackageIcon>MAV - Plain - Blue.png</PackageIcon>
@@ -63,7 +63,7 @@
<PackageReference Include="Selenium.WebDriver" Version="4.38.0" /> <PackageReference Include="Selenium.WebDriver" Version="4.38.0" />
<PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="142.0.7444.6100" /> <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="142.0.7444.6100" />
<PackageReference Include="SSH.NET" Version="2025.1.0" /> <PackageReference Include="SSH.NET" Version="2025.1.0" />
<PackageReference Include="System.Data.OleDb" Version="9.0.10" /> <PackageReference Include="System.Data.OleDb" Version="10.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
Camera/FlexiAPI.cs
View File

@@ -394,7 +394,7 @@ namespace AiQ_GUI
//Filename validation //Filename validation
string filename = Path.GetFileName(fileToUpload).ToUpper(); string filename = Path.GetFileName(fileToUpload).ToUpper();
if ((!isIR && filename.Contains("IR")) || (isIR && filename.Contains("OV"))) 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", false);
return; return;

5
Network.cs
View File

@@ -89,6 +89,7 @@ namespace AiQ_GUI
{ {
const int sendPort = 6666; const int sendPort = 6666;
const int receivePort = 6667; const int receivePort = 6667;
const int discoveryTimeoutMs = 1000;
IList<string> FoundCams = []; IList<string> FoundCams = [];
byte[] discoveryPacket = [0x50, 0x4f, 0x4c, 0x4c, 0xaf, 0xb0, 0xb3, 0xb3, 0xb6, 0x01, 0xa8, 0xc0, 0x0b, 0x1a, 0x00, 0x00]; byte[] discoveryPacket = [0x50, 0x4f, 0x4c, 0x4c, 0xaf, 0xb0, 0xb3, 0xb3, 0xb6, 0x01, 0xa8, 0xc0, 0x0b, 0x1a, 0x00, 0x00];
@@ -103,9 +104,9 @@ namespace AiQ_GUI
} }
using UdpClient receiver = new(receivePort); // Listen for replies on fixed port using UdpClient receiver = new(receivePort); // Listen for replies on fixed port
receiver.Client.ReceiveTimeout = 750; receiver.Client.ReceiveTimeout = discoveryTimeoutMs;
DateTime timeout = DateTime.Now.AddMilliseconds(750); DateTime timeout = DateTime.Now.AddMilliseconds(discoveryTimeoutMs);
try try
{ {
while (DateTime.Now < timeout) while (DateTime.Now < timeout)

2
Soak/SoakTest.cs
View File

@@ -18,6 +18,8 @@ namespace AiQ_GUI
try try
{ {
driver = Selenium.OpenDriver(); driver = Selenium.OpenDriver();
await Task.Delay(1000); // Small delay to ensure driver is ready
// Keep retrying until connected or cancelled // Keep retrying until connected or cancelled
bool connected = false; bool connected = false;
while (!connected && !token.IsCancellationRequested) while (!connected && !token.IsCancellationRequested)