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

iPerlComm logging/display modifications: real PCB# shown, etc. Preparation for "Q2 corrected from ..." activity, version 1.5.99.

Browse Source
This commit is contained in:
Milan Hanajik
2015-08-25 11:47:21 +02:00
parent 08aed03cef
commit fcf4f6bdcf
4 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/WaterMeters/iPerl/ConfigStruct.cs
+5 -5
View File
@@ -191,14 +191,14 @@ namespace TBF.BenchControl.WaterMeters.iPerl
public override string ToString()
{
return string.Format("Config: V{0} State={1} VLoBattT={2}s LoBattT={3}s TestModeT={4}s EPThld={5} PCBNr={6} TestModeCfg={7} RadioAddr={8} TempCalib={9} AlarmMask={10} CfgCheckSum={11}",
return string.Format("Config: V{0} State={1} VLoBattT={2}s LoBattT={3}s TestModeT={4}s EPThld={5} PCB#={6} TMCfg={7} RadioAddr={8} TempCalib={9} AlarmMask={10} CfgCheckSum={11}",
Version,
MeterState,
TargetTimeVeryLowBatt,
TargetTimeLowBatt,
TestModeTime,
EmptyPipeThreshold,
PCBNumber[0].ToString("X2") + PCBNumber[1].ToString("X2") + PCBNumber[2].ToString("X2") + PCBNumber[3].ToString("X2") + PCBNumber[4].ToString("X2"),
PCBNumber2String(),
TestModeConfig.ToString("X2"),
RadioAddress,
TempCalibration,
@@ -208,15 +208,15 @@ namespace TBF.BenchControl.WaterMeters.iPerl
public string ToString(int sel)
{
return string.Format("{1} PCBNr={6} TestModeCfg={7}",
return string.Format("{1} PCB#={6} TMCfg={7}",
Version,
MeterState,
TargetTimeVeryLowBatt,
TargetTimeLowBatt,
TestModeTime,
EmptyPipeThreshold,
PCBNumber[0].ToString("X2") + PCBNumber[1].ToString("X2") + PCBNumber[2].ToString("X2") + PCBNumber[3].ToString("X2") + PCBNumber[4].ToString("X2"),
TestModeConfig.ToString("X2"),
PCBNumber2String(),
TestModeConfig.ToString("X2"),
RadioAddress,
TempCalibration,
AlarmMask.ToString("X4"),