From b26f65dab4dbe2d134549606358062198fcdd0e4 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 15 Oct 2018 15:15:30 +0200 Subject: [PATCH] (1) Diverter : Fixed 'flowMtrNr4Cmd' for FUZHOU_100, (2) SendCalibData(..., MeretModbus=0xff), ver. 2.18.1029 --- TBF/BenchControl/Elde/ControlComWrap.cs | 4 ++-- TBF/BenchControl/Elde/Diverter/Diverter.cs | 2 ++ TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Elde/ControlComWrap.cs b/TBF/BenchControl/Elde/ControlComWrap.cs index c8dbf93dc..7ab3849e1 100644 --- a/TBF/BenchControl/Elde/ControlComWrap.cs +++ b/TBF/BenchControl/Elde/ControlComWrap.cs @@ -245,8 +245,8 @@ namespace TBF.BenchControl.Elde ctrlBrdComponent.ExternalCom = true; -#if SENTEC || CEVAK_200 - ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, (byte)123); +#if SENTEC || CEVAK_200 || FUZHOU_100 + ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange, (byte)0Xff); #else ctrlBrdComponent.SendCalibData(rvCalib, meretA, (byte)usedCom, tempCalib, etCalib, divEdge, balanceRange); #endif diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index 2d35dca00..40bcd42b6 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -103,6 +103,8 @@ namespace TBF.BenchControl.Elde.Diverter flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20); #elif BADGER_VELKA_TRAT flowMtrNr4Cmd = ((divNrFromName % 10) == 1) ? 0x11 : (((divNrFromName % 10) == 2) ? 0x22 : 0x33); +#elif FUZHOU_100 + flowMtrNr4Cmd = divNrFromName; #else flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3; #endif diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 403c974ea..d905b0b35 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.1027.0")] -[assembly: AssemblyFileVersion("2.18.1027.0")] +[assembly: AssemblyVersion("2.18.1029.0")] +[assembly: AssemblyFileVersion("2.18.1029.0")]