More ControlComWrap logging as in iPerlST ver.2.4.292
This commit is contained in:
parent
483218ef02
commit
ef824531b8
@ -9,11 +9,15 @@ namespace TBF.BenchControl.Elde
|
||||
public class ControlComWrap : IControlCom
|
||||
{
|
||||
private static readonly ILog log = LogManager.GetLogger(typeof(ControlComWrap));
|
||||
/// Fatal: SendCalibData(), DoSendCalibData()
|
||||
/// Info: SendCommand(), ValveMove(), StatusP
|
||||
/// Debug: Weight[ix]
|
||||
|
||||
///
|
||||
/// Properties
|
||||
///
|
||||
public StatusP StatusP { get { return (StatusP)ctrlBrdComponent.StatusP; } }
|
||||
private StatusP lastStatusP;
|
||||
#if DN100 || MUNICH || FUZHOU150
|
||||
public float ReferenceFreq { get { return 1000.0f * ctrlBrdComponent.referenceFreq; } } /// In [Hz] 0..2500, nom.=2000
|
||||
#else /// all newer benches
|
||||
@ -65,7 +69,7 @@ namespace TBF.BenchControl.Elde
|
||||
public void SetWeight(int pos, float mass)
|
||||
{
|
||||
ctrlBrdComponent.Weight[pos] = mass;
|
||||
log.DebugFormat("ControlComWrap . . . . . Weight[{0}] = {1}", pos, mass);
|
||||
log.DebugFormat("ControlComWrap.SetWeight(pos={0}, mass={1}", pos, mass);
|
||||
}
|
||||
|
||||
|
||||
@ -143,7 +147,7 @@ namespace TBF.BenchControl.Elde
|
||||
//TBF.UiBridge.Bridge.OnLog(this, string.Format("{0} SendCalibData(COM{1}) rvCalib[0,0]={2} rvCalib[0,1]={3} rvCalib[1,0]={4} rvCalib[1,1]={5}\r\n",
|
||||
// DateTime.Now.ToLongTimeString(), usedCom,
|
||||
// rvCalib[0,0], rvCalib[0,1], rvCalib[1,0], rvCalib[1,1]));
|
||||
log.Fatal("SendCalibData(...)");
|
||||
log.Fatal("ControlComWrap.SendCalibData(...)");
|
||||
for (int i = 0; i < rvCalib.GetLength(0); i++)
|
||||
for (int j = 0; j < rvCalib.GetLength(1); j++)
|
||||
log.FatalFormat(" rvCalib[{0},{1}] = {2}", i, j, rvCalib[i,j]);
|
||||
@ -195,7 +199,7 @@ namespace TBF.BenchControl.Elde
|
||||
// valveMode,
|
||||
// valveValue[0],
|
||||
// valveValue[1]));
|
||||
log.InfoFormat("ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
|
||||
log.InfoFormat("ControlComWrap.ValveMove(#={0}, md={1}, [{2}, {3}])", valveNo, valveMode, valveValue[0], valveValue[1]);
|
||||
#if DN100 || MUNICH || FUZHOU150
|
||||
ctrlBrdComponent.ValveMove((byte)valveNo, (byte)valveMode, valveValue);
|
||||
#else /// all newer benches
|
||||
@ -269,7 +273,7 @@ namespace TBF.BenchControl.Elde
|
||||
if (bit39) route = route | 0x0000008000000000;
|
||||
log.DebugFormat("SendCommand route = {0}", Utils.ShowRoute(route));
|
||||
#endif
|
||||
log.InfoFormat("SendCommand(Cmd={0},Ref#={1},Route={2} {3} {4} {5},TotalPls={6},MassPls={7},TstM={8},filt={9},FM=[{10}{11}{12}{13}{14}{15}],Reg={16},ShrtImp={17},Stop={18})",
|
||||
log.InfoFormat("ControlComWrap.SendCommand(Cmd={0},Ref#={1},Route={2} {3} {4} {5},TotalPls={6},MassPls={7},TstM={8},filt={9},FM=[{10}{11}{12}{13}{14}{15}],Reg={16},ShrtImp={17},Stop={18})",
|
||||
cmd, refFlowMeterNr, /// 0, 1
|
||||
((route >> 48) & 0xFFFF).ToString("X4"), /// 2
|
||||
((route >> 32) & 0xFFFF).ToString("X4"), /// 3
|
||||
@ -309,6 +313,13 @@ namespace TBF.BenchControl.Elde
|
||||
object[] args = new object[] { CommType.Rx };
|
||||
MakeCommDlgt dlgt = MakeComm;
|
||||
Program.MainWnd.Invoke(dlgt, args); /// Invoke MakeExtComm(.) in the UI thread
|
||||
|
||||
StatusP statusP = StatusP;
|
||||
if (lastStatusP != statusP)
|
||||
{
|
||||
log.InfoFormat("ControlComWrap.RunDeviceBefore() StatusP = {0:x16}", (ulong)statusP);
|
||||
lastStatusP = statusP;
|
||||
}
|
||||
}
|
||||
|
||||
public void RunDeviceAfter()
|
||||
@ -316,6 +327,13 @@ namespace TBF.BenchControl.Elde
|
||||
object[] args = new object[] { CommType.TxRx };
|
||||
MakeCommDlgt dlgt = MakeComm;
|
||||
Program.MainWnd.Invoke(dlgt, args); /// Invoke MakeExtComm(.) in the UI thread
|
||||
|
||||
StatusP statusP = StatusP;
|
||||
if (lastStatusP != statusP)
|
||||
{
|
||||
log.InfoFormat("ControlComWrap.RunDeviceAfter() StatusP = {0:x16}", (ulong)statusP);
|
||||
lastStatusP = statusP;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user