God mode non optional on final test
This commit is contained in:
27
AiQ_GUI.cs
27
AiQ_GUI.cs
@@ -304,14 +304,14 @@ namespace AiQ_GUI
|
||||
// Purge camera of all reads
|
||||
await FlexiAPI.APIHTTPRequest("/api/purge-all", CamOnTest.IP);
|
||||
|
||||
if (await DisplayQuestion("Do you want to set this camera to 211 and God mode off?"))
|
||||
{
|
||||
// Turn off God mode
|
||||
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", Level.WARNING);
|
||||
// Turn off God mode
|
||||
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", Level.WARNING);
|
||||
|
||||
if (await DisplayQuestion("Do you want to set this camera to 211?"))
|
||||
{
|
||||
Thread Thr211 = new(async () =>
|
||||
{
|
||||
if (!await FlexiAPI.ChangeNetwork211(CamOnTest.IP)) // Change camera IP to 192.168.1.211. Waits for camera to come back.
|
||||
@@ -1617,14 +1617,16 @@ namespace AiQ_GUI
|
||||
}
|
||||
else
|
||||
{
|
||||
BtnSoak.BackColor = BtnColour; // Reset button colour
|
||||
BtnSoak.Text = "Start Soak";
|
||||
BtnSoak.BackColor = Color.Red;
|
||||
BtnSoak.Text = "Please Wait";
|
||||
foreach (CancellationTokenSource cts in soakCtsList)
|
||||
cts.Cancel();
|
||||
soakCtsList.Clear();
|
||||
soakTasks.Clear();
|
||||
int i = soakCameraList.Count + 1; // Add 1 for 211 itself staying in the list
|
||||
|
||||
RhTxBxActions.Clear();
|
||||
|
||||
string[,] Network_JSON = { { "propDHCP", "false" }, { "propHost", "192.168.1.211" }, { "propNetmask", "255.255.255.0" }, { "propGateway", "192.168.1.1" } };
|
||||
string[,] GOD_JSON = { { "propGodMode", "false" } };
|
||||
foreach (Camera SCL in soakCameraList.Where(c => c.IsChecked)) // only checked cameras
|
||||
@@ -1641,8 +1643,8 @@ namespace AiQ_GUI
|
||||
if (GOD.Contains("Error"))
|
||||
throw new Exception("Could not set God mode off");
|
||||
|
||||
// Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP
|
||||
await FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
|
||||
// Update GLOBAL--NetworkConfig with fixed IP and turn off DHCP. Don't await to save time.
|
||||
FlexiAPI.HTTP_Update("GLOBAL--NetworkConfig", SCL.IP, Network_JSON);
|
||||
i--; // Decriment count becuase they will stack into 211
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1669,6 +1671,9 @@ namespace AiQ_GUI
|
||||
{
|
||||
AddToActionsList($"Some cameras failed: Found {FoundCams.Count}, expected {i}.", Level.ERROR);
|
||||
}
|
||||
|
||||
BtnSoak.BackColor = BtnColour; // Reset button colour
|
||||
BtnSoak.Text = "Start Soak";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user