Skip to content

Commit 1f51db2

Browse files
Added Safety Monitor count set
1 parent 9763a5c commit 1f51db2

File tree

4 files changed

+33
-3
lines changed

4 files changed

+33
-3
lines changed

ASCOM.Alpaca.Simulators/DriverManager.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,14 @@ internal static void LoadSafetyMonitor(int DeviceID)
8686
DeviceManager.LoadSafetyMonitor(DeviceID, dev, dev.DeviceName, dev.UniqueID);
8787
}
8888

89+
internal static void LoadSafetyMonitors()
90+
{
91+
for (int i = 0; i < ServerSettings.NumberOfSafetyMonitors; i++)
92+
{
93+
LoadSafetyMonitor(i);
94+
}
95+
}
96+
8997
internal static void LoadSwitch(int DeviceID)
9098
{
9199
var dev = new ASCOM.Simulators.Switch(DeviceID, Logging.Log, new XMLProfile(ServerSettings.SettingsFolderName, DeviceManager.Switch, (uint)DeviceID));

ASCOM.Alpaca.Simulators/Pages/SafetyMonitorSetup.razor

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
else
1414
{
1515
<fieldset>
16-
<legend>SafetyMonitor @InstanceID Settings</legend>
16+
@if (InstanceID == 0)
17+
{
18+
<legend>Safety Monitor</legend>
19+
}
20+
else
21+
{
22+
<legend>Safety Monitor @InstanceID</legend>
23+
}
1724
<div class="grid-container-two">
1825
<div class="grid-item-left">
1926
<svg width="30" height="30">

ASCOM.Alpaca.Simulators/Pages/Setup.razor

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,12 @@
146146
<div class="grid-item-left">
147147
<input type="number" @bind="NRotators" min="1" max="4" style="width:20ch;">
148148
</div>
149+
<div class="grid-item-right">
150+
<span>Number of Safety Monitors:</span>
151+
</div>
152+
<div class="grid-item-left">
153+
<input type="number" @bind="NSafetyMonitors" min="1" max="4" style="width:20ch;">
154+
</div>
149155
<div class="grid-item-right">
150156
<button @onclick="SaveDriverSettings" style="min-width:12ch; vertical-align:middle;">Save</button>
151157
</div>
@@ -356,6 +362,12 @@
356362
set;
357363
} = ServerSettings.NumberOfRotators;
358364

365+
UInt16 NSafetyMonitors
366+
{
367+
get;
368+
set;
369+
} = ServerSettings.NumberOfSafetyMonitors;
370+
359371
bool StrictAPIMode
360372
{
361373
get;
@@ -583,6 +595,9 @@
583595
ServerSettings.NumberOfRotators = NRotators;
584596
DriverManager.LoadRotators();
585597

598+
ServerSettings.NumberOfSafetyMonitors = NSafetyMonitors;
599+
DriverManager.LoadSafetyMonitors();
600+
586601
DisplaySuccess("Driver Settings Saved");
587602
}
588603
catch (Exception ex)

ASCOM.Alpaca.Simulators/Program.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ private static Task InitServers(string[] args)
215215
DriverManager.LoadFocusers();
216216
DriverManager.LoadObservingConditions(0);
217217
DriverManager.LoadRotators();
218-
DriverManager.LoadSafetyMonitor(0);
218+
DriverManager.LoadSafetyMonitors();
219219
DriverManager.LoadSwitch(0);
220220
DriverManager.LoadTelescope(0);
221221

@@ -319,7 +319,7 @@ private static bool ProcessArgs(string[] args, bool existing_instance)
319319
DriverManager.LoadFocusers();
320320
DriverManager.LoadObservingConditions(0);
321321
DriverManager.LoadRotators();
322-
DriverManager.LoadSafetyMonitor(0);
322+
DriverManager.LoadSafetyMonitors();
323323
DriverManager.LoadSwitch(0);
324324
DriverManager.LoadTelescope(0);
325325

0 commit comments

Comments
 (0)