diff --git a/Results/Entities/WaterMeter.cs b/Results/Entities/WaterMeter.cs index 53af86ced..181de24a3 100644 --- a/Results/Entities/WaterMeter.cs +++ b/Results/Entities/WaterMeter.cs @@ -8,7 +8,15 @@ using Config.Entities; namespace Results.Entities { - public class WaterMeter + + public enum ResultCodeBit + { + None = 0, + OptoComPort = (1 << 16), + RfidCommFailed = (1 << 17), + } + + public class WaterMeter { public virtual int Id { get; protected set; } public virtual string SerialNr { get; set; } /// Main s/n for compound meters, PCB Number for iPerl water meter diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs index 2973a15e3..067be32d8 100644 --- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs +++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs @@ -162,7 +162,7 @@ namespace TBF.BenchControl.Sequences break; } } - if (e.Contains(Event.TimerExpired)) + if (e.Contains(Event.Busy) && e.Contains(Event.TimerExpired)) { if (i == nrRetries) {