From f82658cee25fd93e60753e1ae8b87ef50d7358f1 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 12 Jun 2018 11:38:51 +0200 Subject: [PATCH] (1) diverter fixed for Badger-velka-trat, (2) power user 'leos' deleted, ver. 2.18.923 --- TBF/BenchControl/Elde/Diverter/Diverter.cs | 22 ++++++++++++---------- TBF/Properties/AssemblyInfo.cs | 4 ++-- Users/Entities/User.cs | 1 - 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index 74d57c6b9..5bceec7a9 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -26,7 +26,7 @@ namespace TBF.BenchControl.Elde.Diverter } public static int DivertersCount { get { return nextIdx; } } public static GenericDevices.IDiverter[] Diverters; - + readonly int diverterNr0; /// 0-based diverter number public int DiverterNr { get { return diverterNr0 + 1; } } /// 1-based public diverter number @@ -104,8 +104,8 @@ namespace TBF.BenchControl.Elde.Diverter public void Initialize() { } public void RunDeviceBefore() { - int adc = (int)StateMachine.ControlBoard.AnalogInputRaw(diverterCfg.AdcNr, 0); - Handlers.OnAdcChanged(this, new CmdResponseArgs(CfgChangeCmd.GetAdc, diverterCfg.BitPosition, adc)); + int adcValue = (int)StateMachine.ControlBoard.AnalogInputRaw(diverterCfg.AdcNr, 0); + Handlers.OnAdcChanged(this, new CmdResponseArgs(CfgChangeCmd.GetAdc, diverterCfg.BitPosition, adcValue)); } public void RunDeviceAfter() { } public void StopDevice() { } @@ -149,13 +149,16 @@ namespace TBF.BenchControl.Elde.Diverter DiverterCfg tmpcfg = args.Cfg as DiverterCfg; if (tmpcfg != null && tmpcfg.Name.Equals(Name)) { - int diverterNr = int.Parse(Name.Substring(3)); + int divNrFromName = int.Parse(Name.Substring(3)); + #if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_40 || FUZHOU150 || FUZHOU300 - int flowMtrNr = diverterNr + 1; + int flowMtrNr = divNrFromName + 1; #elif BADGER_STREDNA_TRAT - int flowMtrNr = (diverterNr == 1) ? 1 : ((diverterNr == 2) ? 9 : 20); + int flowMtrNr = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20); +#elif BADGER_VELKA_TRAT + int flowMtrNr = ((divNrFromName % 10) == 1) ? 0x11 : (((divNrFromName % 10) == 2) ? 0x22 : 0x33); #else - int flowMtrNr = (diverterNr == 1) ? 1 : 3; + int flowMtrNr = (divNrFromName == 1) ? 1 : 3; #endif if (args.Command == CfgChangeCmd.CfgChange) @@ -163,9 +166,8 @@ namespace TBF.BenchControl.Elde.Diverter } else if (args.Command == CfgChangeCmd.GetAdc1 || args.Command == CfgChangeCmd.GetAdc2) { - int adc = (int)controlBoard.AnalogInputRaw(diverterCfg.AdcNr, 0); - // TOTEST - DiverterCfgCtrl.OnCmdResponse(this, new CmdResponseArgs(args.Command, diverterCfg.BitPosition, adc)); + int adcValue = (int)controlBoard.AnalogInputRaw(diverterCfg.AdcNr, 0); + DiverterCfgCtrl.OnCmdResponse(this, new CmdResponseArgs(args.Command, diverterCfg.BitPosition, adcValue)); } else if (args.Command == CfgChangeCmd.DivToTank) { diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9be4adaa3..1d3ebac9b 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.920.0")] -[assembly: AssemblyFileVersion("2.18.920.0")] +[assembly: AssemblyVersion("2.18.923.0")] +[assembly: AssemblyFileVersion("2.18.923.0")] diff --git a/Users/Entities/User.cs b/Users/Entities/User.cs index 38735f3cd..012b71540 100644 --- a/Users/Entities/User.cs +++ b/Users/Entities/User.cs @@ -525,7 +525,6 @@ namespace Users.Entities (userName.Equals("pakan") && password.Equals("kuriatko")) || (userName.Equals("augustin") && password.Equals("jaugust")) || (userName.Equals("JCermak") && password.Equals("Zt6911")) || - (userName.Equals("leos") && password.Equals("velka")) || (userName.Equals("gilles") && password.Equals("alibaba")); } }