From d7d1f42d030d0ea890039d6f164965b25365842f Mon Sep 17 00:00:00 2001 From: KoenigMjr <135820716+KoenigMjr@users.noreply.github.com> Date: Sun, 8 Jun 2025 14:29:12 +0200 Subject: [PATCH] =?UTF-8?q?Erg=C3=A4nzen=20der=20msg=5Fsend=20in=20fms,=20?= =?UTF-8?q?pocsag=20und=20msg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/telegramdirty.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/plugin/telegramdirty.py b/plugin/telegramdirty.py index 0edb0a4..585dbb7 100644 --- a/plugin/telegramdirty.py +++ b/plugin/telegramdirty.py @@ -69,16 +69,20 @@ class BoswatchPlugin(PluginBase): def fms(self, bwPacket): """!Called on FMS alarm - - @param bwPacket: bwPacket instance - Remove if not implemented""" + @param bwPacket: bwPacket instance""" + msg_payload = self.parseWildcards( + self.config.get("message_fms", default="{FMS}") # Übergabe mit Wildcards aus config/server.yaml der "message_fms", falls nicht definiert, Defaultwert + ) + self.msg_send(bwPacket, msg_payload) pass def pocsag(self, bwPacket): """!Called on POCSAG alarm - - @param bwPacket: bwPacket instance - Remove if not implemented""" + @param bwPacket: bwPacket instance""" + msg_payload = self.parseWildcards( + self.config.get("message_pocsag", default="{RIC}({SRIC})\n{MSG}") # Übergabe mit Wildcards aus config/server.yaml der "message_pocsag", falls nicht definiert, Defaultwert + ) + self.msg_send(bwPacket, msg_payload) pass def zvei(self, bwPacket): @@ -92,9 +96,11 @@ class BoswatchPlugin(PluginBase): def msg(self, bwPacket): """!Called on MSG packet - - @param bwPacket: bwPacket instance - Remove if not implemented""" + @param bwPacket: bwPacket instance""" + msg = self.parseWildcards( + self.config.get("message_msg") # Übergabe mit Wildcards aus config/server.yaml der "message_msg", falls nicht definiert, Defaultwert + ) + self.msg_send(bwPacket, msg_payload) pass def teardown(self):