From d653e0e6e6bbf4e2ff1cb76fea271e8259ce257e Mon Sep 17 00:00:00 2001 From: Stoyan Zlatev Date: Mon, 20 Oct 2025 12:34:26 +0200 Subject: [PATCH] eregister WUP modul in check task --- Common/.vs/Common/config/applicationhost.config | 2 +- .../Common.Hardware.WaterMeter.eRegister/Eregister.cs | 1 - .../EregisterCheckInitializationTask.cs | 8 ++++++++ .../Common.Hardware.WaterMeter.eRegister/EregisterTask.cs | 3 --- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Common/.vs/Common/config/applicationhost.config b/Common/.vs/Common/config/applicationhost.config index 8f2db308..5616ab8b 100644 --- a/Common/.vs/Common/config/applicationhost.config +++ b/Common/.vs/Common/config/applicationhost.config @@ -171,7 +171,7 @@ - + diff --git a/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/Eregister.cs b/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/Eregister.cs index 7725c240..691a8841 100644 --- a/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/Eregister.cs +++ b/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/Eregister.cs @@ -283,7 +283,6 @@ this.runningTasks.Enqueue(new EregisterCheckInitializationTask(this.parameters, frequency) { - WakeUpCmd = true, SlotNr = features.SlotNr, PoNr = features.PoNr, SerialNr = features.SerialNr, diff --git a/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterCheckInitializationTask.cs b/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterCheckInitializationTask.cs index c4f3234a..630090ae 100644 --- a/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterCheckInitializationTask.cs +++ b/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterCheckInitializationTask.cs @@ -16,6 +16,7 @@ { this.parameters = parameters; this.Name = "Check state"; + this.WakeUpCmd = true; this.Data = new OpticalTelegram { Minutes = 1 @@ -26,6 +27,13 @@ }); } + public override byte[] Start() + { + this.WakeUpModul = !this.AnyTelegramReceived; + + return base.Start(); + } + public override void Push(SIRTMessage response) { base.Push(response); diff --git a/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterTask.cs b/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterTask.cs index d414217c..0f0a92bd 100644 --- a/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterTask.cs +++ b/Common/Hardware/WaterMeter/eRegister/Common.Hardware.WaterMeter.eRegister/EregisterTask.cs @@ -77,9 +77,6 @@ public override byte[] Start() { - //this.WakeUpCmd = !this.AnyTelegramReceived; - //this.WakeUpModul = !this.AnyTelegramReceived; - var payloadL = this.request.Payload.Length; this.payload = new byte[payloadL];