Skip to content

Merge into master #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patrick-dmxc merged 1 commit into from
Dec 30, 2023
Merged

Merge into master #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modbus-dmxc3-GUI-Plugin/Modbus-dmxc3-GUI-Plugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Modbus-dmxc3-GUI-Plugin/ModbusManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void IManager.shutdown()
this.shutdownManager();
}

ReadOnlyCollection<Type> IManager.ManagerDependencies
public IReadOnlyCollection<Type> ManagerDependencies
{
get
{
Expand Down
10 changes: 2 additions & 8 deletions Modbus-dmxc3-Plugin/src/ModbusManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -328,7 +322,7 @@ void IManager.shutdown()
this.shutdownManager();
}

ReadOnlyCollection<Type> IManager.ManagerDependencies
public IReadOnlyCollection<Type> ManagerDependencies
{
get
{
Expand All @@ -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)
{
Expand Down
Loading