From 2e76d595c0e36c2b271df1a12e5612e80a9440bd Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 6 Mar 2019 10:14:51 +0100 Subject: [PATCH] Quido RS 4-4 support added, ver. 2.18.1160. --- TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs | 6 +++++- TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs | 1 + TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs index 8a0317d4a..f4592e44c 100644 --- a/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs +++ b/TBF/BenchControl/Modbus/QuidoRS/QuidoRS.cs @@ -147,7 +147,11 @@ namespace TBF.BenchControl.Modbus.QuidoRS { modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 16, 2, dataLo, dataHi, 0, 0 }); } - else if (quidoRSCfg.Variant == QuidoVariant.QuidoRS_8_8) + else if (quidoRSCfg.Variant == QuidoVariant.QuidoRS_4_4) + { + modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 4, 1, dataLo, 0, 0 }); + } + else if (quidoRSCfg.Variant == QuidoVariant.QuidoRS_8_8) { modbus.SendMessage(new byte[] { addr, cmd, 0, 0, 0, 8, 1, dataLo, 0, 0 }); } diff --git a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs index 1f932276e..6cc7e49f8 100644 --- a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs +++ b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs @@ -12,6 +12,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS public enum QuidoVariant { QuidoRS_2_16, + QuidoRS_4_4, QuidoRS_8_8, Count } diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 0b86c5fce..e4aeb2a55 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1159.0")] -[assembly: AssemblyFileVersion("2.18.1159.0")] +[assembly: AssemblyVersion("2.18.1160.0")] +[assembly: AssemblyFileVersion("2.18.1160.0")]