From 9ab78cf8240286934b81f6812eb7c2fd5ec1aa10 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 7 Mar 2018 13:01:53 +0100 Subject: [PATCH] Changes for Badger: (1) numerical keys passed to Elde component, (2) Diverter# for Badger stredna trat, ver. 2.18.828 --- TBF/BenchControl/Elde/Diverter/Diverter.cs | 7 +++++-- TBF/MainWnd.cs | 2 ++ TBF/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/TBF/BenchControl/Elde/Diverter/Diverter.cs b/TBF/BenchControl/Elde/Diverter/Diverter.cs index bc8226208..6bcde88d8 100644 --- a/TBF/BenchControl/Elde/Diverter/Diverter.cs +++ b/TBF/BenchControl/Elde/Diverter/Diverter.cs @@ -161,10 +161,13 @@ 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)); #if GENESIS || PETERSBURG_200 - int flowMtrNr = int.Parse(Name.Substring(3)) + 1; + int flowMtrNr = diverterNr + 1; +#elif BADGER_STREDNA_TRAT + int flowMtrNr = (diverterNr == 1) ? 1 : ((diverterNr == 2) ? 9 : 20); #else /// PETERSBURG_50 - int flowMtrNr = Name.Contains("1") ? 1 : 3; + int flowMtrNr = (diverterNr == 1) ? 1 : 3; #endif if (args.Command == CfgChangeCmd.CfgChange) diff --git a/TBF/MainWnd.cs b/TBF/MainWnd.cs index 616d6c49b..1edb123e0 100644 --- a/TBF/MainWnd.cs +++ b/TBF/MainWnd.cs @@ -315,6 +315,7 @@ namespace TBF /// private void MainWnd_KeyPress(object sender, KeyPressEventArgs e) { +#if !BADGER_MALA_TRAT && !BADGER_STREDNA_TRAT && !BADGER_VELKA_TRAT if (BenchControlPanel != null && BenchControlPanel.ProcessKey(e.KeyChar)) { e.Handled = true; @@ -324,6 +325,7 @@ namespace TBF { log.WarnFormat("'{0}' key pressed, not handled", e.KeyChar); } +#endif } /// diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 6357431e8..4d86ec483 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.827.0")] -[assembly: AssemblyFileVersion("2.18.827.0")] +[assembly: AssemblyVersion("2.18.828.0")] +[assembly: AssemblyFileVersion("2.18.828.0")]