DEWA_300 : (1) component upgraded (6.3.2019), (2) Diverter: flowMtrNr4Cmd fixed, ver. 2.18.1159

This commit is contained in:
Milan Hanajik
2019-03-06 09:42:25 +01:00
parent b47f5e32d4
commit 75e5b75d4d
3 changed files with 6 additions and 3 deletions
+4 -1
View File
@@ -74,6 +74,7 @@ namespace TBF.BenchControl.Elde.Diverter
if (divertersSoFar != null) if (divertersSoFar != null)
{ {
for (int i = 0; i < divertersSoFar.Length; i++) Diverters[i] = divertersSoFar[i]; for (int i = 0; i < divertersSoFar.Length; i++) Diverters[i] = divertersSoFar[i];
} }
Diverters[nextIdx - 1] = this; Diverters[nextIdx - 1] = this;
@@ -97,7 +98,7 @@ namespace TBF.BenchControl.Elde.Diverter
{ {
divNrFromName = nextIdx; divNrFromName = nextIdx;
} }
#if GENESIS || PETERSBURG_50 || PETERSBURG_200 || DEWA_300 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300 #if GENESIS || PETERSBURG_50 || PETERSBURG_200 || FUZHOU_50 || FUZHOU_150 || FUZHOU_300
flowMtrNr4Cmd = divNrFromName + 1; flowMtrNr4Cmd = divNrFromName + 1;
#elif BADGER_STREDNA_TRAT #elif BADGER_STREDNA_TRAT
flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20); flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : ((divNrFromName == 2) ? 9 : 20);
@@ -107,6 +108,8 @@ namespace TBF.BenchControl.Elde.Diverter
flowMtrNr4Cmd = divNrFromName; flowMtrNr4Cmd = divNrFromName;
#elif CEVAK_200 #elif CEVAK_200
flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName; flowMtrNr4Cmd = (divNrFromName == 4) ? 5 : divNrFromName;
#elif DEWA_300
flowMtrNr4Cmd = divNrFromName + 2; /// Div1: 1,2,3, Div2: 4, Div3: 5, Div4: 6, Div5: 7
#else #else
flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3; flowMtrNr4Cmd = (divNrFromName == 1) ? 1 : 3;
#endif #endif
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.18.1158.0")] [assembly: AssemblyVersion("2.18.1159.0")]
[assembly: AssemblyFileVersion("2.18.1158.0")] [assembly: AssemblyFileVersion("2.18.1159.0")]