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

Event.BalanceDone --> Event.ScaleDone, EmergencyStop is route bit #81, ver. 3.1.1608

Browse Source
This commit is contained in:
Milan Hanajik
2021-03-24 09:32:42 +01:00
parent 9bfa70d5c1
commit ebf7c97bc6
29 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Rig/ControlBoard/Uni/UniCB.cs
+6 -1
View File
@@ -138,7 +138,7 @@ namespace TBF.Rig.ControlBoard.Uni
public bool IsUIBlocked { get; set; }
/// Measured values valid during a test
public double RefFrequency { get { return Data.ReferenceFreq[0]; } }
public double RefFrequency { get { return Data.ReferenceFreq[0]; } }
public double RefFrequency1 { get { return Data.ReferenceFreq[1]; } }
public double RefFrequency2 { get { return Data.ReferenceFreq[2]; } }
public double RefFrequency3 { get { return Data.ReferenceFreq[3]; } }
@@ -355,6 +355,11 @@ namespace TBF.Rig.ControlBoard.Uni
/// No connection to control board ... set indicator bit
route += ((UInt128)1) << cbCfg.BitNr;
}
if ((State & (ulong)StatusP.EmgcyStopActive) != 0)
{
/// No connection to control board ... set indicator bit
route += ((UInt128)1) << (cbCfg.BitNr + 1);
}
}
log.DebugFormat("Route synced with RRoute and UI changes, new route = {0}", Utils.RouteToStr(route));
}
TBF/Rig/ControlBoard/Uni/UniCBCfg.cs
+1 -1
View File
@@ -51,7 +51,7 @@ namespace TBF.Rig.ControlBoard.Uni
public double MsrdValLimLo { get; set; }
public double MsrdValLimHi { get; set; }
public int BitNr { get { return 64; } } /// Bit-position
public int BitNr { get { return 80; } } /// Bit-position
public bool Inverted { get { return false; } } /// When true the valve function is inverted: 0 = open, 1 = closed
[XmlIgnore]