ModbusPlugin fixes;

noant · Mar 22, 2019 · 7e2fdcd · 7e2fdcd
1 parent 5dadbbe
commit 7e2fdcd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 16 deletions.
diff --git a/LazuritePlugins/ModbusPlugin/ModbusPlugin/ModbusRegistersAction.cs b/LazuritePlugins/ModbusPlugin/ModbusPlugin/ModbusRegistersAction.cs
@@ -19,7 +19,7 @@ public class ModbusRegistersAction : IAction, IModbusRegistersAction
 
         public byte SlaveAddress { get; set; } = 1;
 
-        public byte RegisterAddress { get; set; } = 0;
+        public ushort RegisterAddress { get; set; } = 0;
 
         public ushort WriteReadLength { get; set; } = 1;
 

diff --git a/LazuritePlugins/ModbusPlugin/ModbusPlugin/ModbusSingleCoilAction.cs b/LazuritePlugins/ModbusPlugin/ModbusPlugin/ModbusSingleCoilAction.cs
@@ -18,7 +18,7 @@ public class ModbusSingleCoilAction : IAction, IModbusSingleCoilAction
 
         public byte SlaveAddress { get; set; } = 1;
 
-        public byte CoilAddress { get; set; } = 0;
+        public ushort CoilAddress { get; set; } = 0;
 
         public string Caption
         {

diff --git a/LazuritePlugins/ModbusPlugin/ModbusPluginUI/RegistersActionView.xaml.cs b/LazuritePlugins/ModbusPlugin/ModbusPluginUI/RegistersActionView.xaml.cs
@@ -15,12 +15,13 @@ public partial class RegistersActionView : UserControl
         public RegistersActionView()
         {
             InitializeComponent();
+
             tbAddress.Validation = EntryViewValidation.UShortValidation(max: 247);
             tbCoil.Validation = EntryViewValidation.UShortValidation();
 
             btOk.Click += (o, e) => {
                 _action.Manager.Transport = transportView.Transport;
-                _action.RegisterAddress = byte.Parse(tbCoil.Text);
+                _action.RegisterAddress = ushort.Parse(tbCoil.Text);
                 _action.SlaveAddress = byte.Parse(tbAddress.Text);
                 _action.ModbusValueType = valueTypeView.ValueType;
                 _action.WriteReadLength = valueTypeView.Length;

diff --git a/LazuritePlugins/ModbusPlugin/ModbusPluginUI/SingleCoilActionView.xaml.cs b/LazuritePlugins/ModbusPlugin/ModbusPluginUI/SingleCoilActionView.xaml.cs
@@ -18,7 +18,7 @@ public SingleCoilActionView()
 
             btOk.Click += (o, e) => {
                 _action.Manager.Transport = transportView.Transport;
-                _action.CoilAddress = byte.Parse(tbCoil.Text);
+                _action.CoilAddress = ushort.Parse(tbCoil.Text);
                 _action.SlaveAddress = byte.Parse(tbAddress.Text);
                 OkPressed?.Invoke(_action);
             };

diff --git a/LazuritePlugins/ModbusPlugin/NModbusWrapper/IModbusRegistersAction.cs b/LazuritePlugins/ModbusPlugin/NModbusWrapper/IModbusRegistersAction.cs
@@ -6,7 +6,7 @@ public interface IModbusRegistersAction
 
         byte SlaveAddress { get; set; }
 
-        byte RegisterAddress { get; set; }
+        ushort RegisterAddress { get; set; }
 
         ushort WriteReadLength { get; set; }
 
@@ -16,4 +16,4 @@ public interface IModbusRegistersAction
 
         Lazurite.ActionsDomain.ValueTypes.ValueTypeBase ValueType { get; set; }
     }
-}
+}
diff --git a/LazuritePlugins/ModbusPlugin/NModbusWrapper/IModbusSingleCoilAction.cs b/LazuritePlugins/ModbusPlugin/NModbusWrapper/IModbusSingleCoilAction.cs
@@ -6,6 +6,6 @@ public interface IModbusSingleCoilAction
 
         byte SlaveAddress { get; set; }
 
-        byte CoilAddress { get; set; }
+        ushort CoilAddress { get; set; }
     }
 }
diff --git a/LazuritePlugins/ModbusPlugin/TestProject/MainWindow.xaml.cs b/LazuritePlugins/ModbusPlugin/TestProject/MainWindow.xaml.cs
@@ -17,16 +17,8 @@ public MainWindow()
 
         public void Test()
         {
-            //ModbusPluginUI.ConfigureTransportView.Show((t) => {
-            //    var transport = t;
-            //    t = null;
-            //    Test();
-            //});
-
-            var action = new ModbusRegistersAction();
+            var action = new ModbusSingleCoilAction();
             var result = action.UserInitializeWith(null, false);
-
-            var a = 0;
         }
     }
 }
diff --git a/Releases/Plugins/ModbusPlugin.pyp b/Releases/Plugins/ModbusPlugin.pyp