diff --git a/Common/CommonConsole/Program.cs b/Common/CommonConsole/Program.cs index 5af5701f..8df134d9 100644 --- a/Common/CommonConsole/Program.cs +++ b/Common/CommonConsole/Program.cs @@ -10,7 +10,14 @@ namespace CommonConsole // Console.WriteLine(BitConverter.ToInt32(new byte[] { 0xEC, 0xFF, 0xFF, 0xFF }, 0)); SIRTServer.StartServer(Console.WriteLine, Console.WriteLine, 6, 8); + // SIRTServer.StartProgramming(433, 412013081, "7B5F2F606155C670BD9891231A598EF3"); + // SIRTServer.StartProgramming(433, 412013082, "A10BB3C32B71894BD8BB17884973E616"); + // SIRTServer.StartProgramming(433, 412013083, "15EEC94741740FB1EA736CF6468A4790"); + // SIRTServer.StartProgramming(433, 412013084, "6E742330A56149E8CF94ABD70576573D"); + // SIRTServer.StartProgramming(433, 412013087, "C4D1DC170D7E219C26FDE76F9B2DC89A"); + // SIRTServer.StartProgramming(433, 412013078, "4E788CF5F57FF977C85F458049D00387"); SIRTServer.StartProgramming(868, 402001154, "0E9FACC6A0E1EF1C3B27A49BAC216535"); + // SIRTServer.StartProgramming(433, 412012695, "867DD2A34C382B7D1190DD563E6B52C4"); // SIRTServer.StartProgramming(433, 412013356, "80D46C00E1BED73FE0DA85D95CA4BEE3"); } diff --git a/Common/CommonConsole/RFTelegrams/RFTask.cs b/Common/CommonConsole/RFTelegrams/RFTask.cs index 759a940d..a19fb4c3 100644 --- a/Common/CommonConsole/RFTelegrams/RFTask.cs +++ b/Common/CommonConsole/RFTelegrams/RFTask.cs @@ -79,5 +79,14 @@ } } } + + public override Byte[] Start() + { + this.SetPending(); + + this.SEMI = default(SIRTMessage); + + return base.Start(); + } } } diff --git a/Common/CommonConsole/RFTelegrams/SIRTServer.cs b/Common/CommonConsole/RFTelegrams/SIRTServer.cs index 6d40df17..b2fcf13d 100644 --- a/Common/CommonConsole/RFTelegrams/SIRTServer.cs +++ b/Common/CommonConsole/RFTelegrams/SIRTServer.cs @@ -65,7 +65,6 @@ { succeeded = SendPAM(task => { - task.Timeout = 5_000; task.WakeUpCmd = true; task.DelPamSemi = true; task.WakeUpModul = true; @@ -82,7 +81,6 @@ { succeeded = SendPAM(task => { - task.Timeout = 5_000; task.DelPamSemi = true; task.IsEncrypted = true; task.Frequency = frequency; @@ -97,7 +95,6 @@ { succeeded = SendPAM(task => { - task.Timeout = 5_000; task.DelPamSemi = true; task.IsEncrypted = true; task.Frequency = frequency; @@ -155,7 +152,8 @@ if (cordonelTask.State == SIRTTaskState.Completed) { succeeded = true; - + + messageCallback?.Invoke($"{"Address",20}: {cordonelTask.RequestAddress}"); messageCallback?.Invoke($"{"CMD",20}: {cordonelTask}"); messageCallback?.Invoke($"{"State",20}: {cordonelTask.State}"); @@ -169,7 +167,18 @@ } else { - errorMessageCallback?.Invoke($"{cordonelTask.State} - CMD|{cordonelTask}"); + succeeded = true; + + errorMessageCallback?.Invoke($"{"Address",20}: {cordonelTask.RequestAddress}"); + errorMessageCallback?.Invoke($"{"CMD",20}: {cordonelTask}"); + errorMessageCallback?.Invoke($"{"State",20}: {cordonelTask.State}"); + + var pam = new PAMStatus(cordonelTask.SEMI.Payload[11]); + errorMessageCallback?.Invoke($"{"PAM Status",20}: {pam}"); + + var alarm = new AlarmMask(cordonelTask.SEMI.Payload[10]); + errorMessageCallback?.Invoke(alarm.ToString()); + errorMessageCallback?.Invoke(new string('-', 100)); }