michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(1) diverter fixed for Badger-velka-trat, (2) power user 'leos' deleted, ver. 2.18.923

Browse Source
This commit is contained in:
Milan Hanajik
2018-06-13 07:35:47 +02:00
parent 7c2135a8fe
commit f82658cee2
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Elde/Diverter/Diverter.cs
+12 -10
View File
@@ -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)
{