Merge pull request #1 from DMXControl/3.3

patrick-dmxc · web-flow · commit c2e1c35076bb · 2023-12-31T00:44:14.000+01:00
Merge into master
diff --git a/Modbus-dmxc3-GUI-Plugin/Modbus-dmxc3-GUI-Plugin.csproj b/Modbus-dmxc3-GUI-Plugin/Modbus-dmxc3-GUI-Plugin.csproj
@@ -16,7 +16,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<Reference Include="LumosGUI">
-			<HintPath Condition="Exists('..\..\Lumos\3.3\Lumos\bin\Debug\net6.0')">..\..\Lumos\3.3\Lumos\bin\Debug\net6.0\LumosGUI.exe</HintPath>
+			<HintPath Condition="Exists('..\..\Lumos\3.3\LumosGUI\bin\Debug')">..\..\Lumos\3.3\LumosGUI\bin\Debug\LumosGUI.exe</HintPath>
 			<HintPath Condition="Exists('..\..\Lumos\LumosGUI\bin\Debug')">..\..\Lumos\LumosGUI\bin\Debug\LumosGUI.exe</HintPath>
 			<HintPath Condition="Exists('..\dep')">..\dep\LumosGUI.exe</HintPath>
 			<Private>True</Private>
diff --git a/Modbus-dmxc3-GUI-Plugin/ModbusManager.cs b/Modbus-dmxc3-GUI-Plugin/ModbusManager.cs
@@ -47,7 +47,7 @@ void IManager.shutdown()
             this.shutdownManager();
         }
 
-        ReadOnlyCollection<Type> IManager.ManagerDependencies
+        public IReadOnlyCollection<Type> ManagerDependencies
         {
             get
             {
diff --git a/Modbus-dmxc3-Plugin/src/ModbusManager.cs b/Modbus-dmxc3-Plugin/src/ModbusManager.cs
@@ -23,8 +23,6 @@ public sealed class ModbusManager : AbstractManagerAndService, ILumosProjectMana
         private List<AbstractModbusMaster> modbusMastersRemoteDevices = new List<AbstractModbusMaster>();
         private ModbusServer server;
 
-        private Timer timer;
-
         private ushort _lastShownAddresses = 0;
 
         private ModbusManager()
@@ -68,10 +66,6 @@ void IManager.initialize()
                 this.ShowInInputAssignment();
             else
                 this.RemoveFromInputAssignment();
-
-
-            timer = new Timer(new TimerCallback(autoRefresh), null, 5000, 500);
-
         }
 
         private void ModbusManager_SettingChanged(object sender, SettingChangedEventArgs args)
@@ -328,7 +322,7 @@ void IManager.shutdown()
             this.shutdownManager();
         }
 
-        ReadOnlyCollection<Type> IManager.ManagerDependencies
+        public IReadOnlyCollection<Type> ManagerDependencies
         {
             get
             {
@@ -345,7 +339,7 @@ ReadOnlyCollection<Type> IManager.ManagerDependencies
 
         ELoadTime ILumosProjectManager.LoadTime => ELoadTime.BEFORE_CONTAINERS;
 
-        public string Name => throw new NotImplementedException();
+        public string Name => nameof(ModbusManager);
 
         void ILumosProjectManager.closeProject(LumosIOContext context)
         {

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void IManager.shutdown()`
`47`	`47`	`this.shutdownManager();`
`48`	`48`	`}`
`49`	`49`
`50`		`- ReadOnlyCollection<Type> IManager.ManagerDependencies`
	`50`	`+ public IReadOnlyCollection<Type> ManagerDependencies`
`51`	`51`	`{`
`52`	`52`	`get`
`53`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@ public sealed class ModbusManager : AbstractManagerAndService, ILumosProjectMana`
`23`	`23`	`private List<AbstractModbusMaster> modbusMastersRemoteDevices = new List<AbstractModbusMaster>();`
`24`	`24`	`private ModbusServer server;`
`25`	`25`
`26`		`- private Timer timer;`
`27`		`-`
`28`	`26`	`private ushort _lastShownAddresses = 0;`
`29`	`27`
`30`	`28`	`private ModbusManager()`
`@@ -68,10 +66,6 @@ void IManager.initialize()`
`68`	`66`	`this.ShowInInputAssignment();`
`69`	`67`	`else`
`70`	`68`	`this.RemoveFromInputAssignment();`
`71`		`-`
`72`		`-`
`73`		`- timer = new Timer(new TimerCallback(autoRefresh), null, 5000, 500);`
`74`		`-`
`75`	`69`	`}`
`76`	`70`
`77`	`71`	`private void ModbusManager_SettingChanged(object sender, SettingChangedEventArgs args)`
`@@ -328,7 +322,7 @@ void IManager.shutdown()`
`328`	`322`	`this.shutdownManager();`
`329`	`323`	`}`
`330`	`324`
`331`		`- ReadOnlyCollection<Type> IManager.ManagerDependencies`
	`325`	`+ public IReadOnlyCollection<Type> ManagerDependencies`
`332`	`326`	`{`
`333`	`327`	`get`
`334`	`328`	`{`
`@@ -345,7 +339,7 @@ ReadOnlyCollection<Type> IManager.ManagerDependencies`
`345`	`339`
`346`	`340`	`ELoadTime ILumosProjectManager.LoadTime => ELoadTime.BEFORE_CONTAINERS;`
`347`	`341`
`348`		`- public string Name => throw new NotImplementedException();`
	`342`	`+ public string Name => nameof(ModbusManager);`
`349`	`343`
`350`	`344`	`void ILumosProjectManager.closeProject(LumosIOContext context)`
`351`	`345`	`{`