From dc3cf610c157dad50510b28e023b59ecd6fa8c52 Mon Sep 17 00:00:00 2001 From: JHCD Date: Sat, 4 Jul 2015 01:23:34 +0200 Subject: [PATCH 1/3] change testdata to utf8 (issue #43) --- testdata/testdata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testdata/testdata.txt b/testdata/testdata.txt index acd6c88..c22f460 100644 --- a/testdata/testdata.txt +++ b/testdata/testdata.txt @@ -1,4 +1,4 @@ -# Testdata for the BOSWatch Test Mode function +# Testdata for the BOSWatch Test Mode function # Data in Multimon-NG Raw Format # Data is alternately passed to the decoder to simulate an used Radio-Frequency From 4a5798b127f9d2d42bc6e74833058ad64a1ba62f Mon Sep 17 00:00:00 2001 From: JHCD Date: Sat, 4 Jul 2015 01:25:21 +0200 Subject: [PATCH 2/3] undo commit 02b5393 (see issue #43) --- plugins/firEmergency/firEmergency.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/firEmergency/firEmergency.py b/plugins/firEmergency/firEmergency.py index ef46938..a70d86e 100644 --- a/plugins/firEmergency/firEmergency.py +++ b/plugins/firEmergency/firEmergency.py @@ -91,7 +91,7 @@ def run(typ,freq,data): logging.debug("ZVEI to firEmergency") try: firXML = "\n
"+data["zvei"]+"
\n"+data["zvei"]+" alarmiert.\n\n" - firSocket.send(firXML.encode('utf-8')) + firSocket.send(firXML) except: logging.error("%s to firEmergency failed", typ) logging.debug("%s to firEmergency failed", typ, exc_info=True) @@ -102,7 +102,7 @@ def run(typ,freq,data): logging.debug("POC to firEmergency") try: firXML = "\n
"+data["ric"]+"
\n"+data["msg"]+"\n\n" - firSocket.send(firXML.encode('utf-8')) + firSocket.send(firXML) except: logging.error("%s to firEmergency failed", typ) logging.debug("%s to firEmergency failed", typ, exc_info=True) From 3150aed20600ddb59b45da36112631b9baed1b61 Mon Sep 17 00:00:00 2001 From: JHCD Date: Sat, 4 Jul 2015 01:33:47 +0200 Subject: [PATCH 3/3] add testdata for german special signs (issue #43 and #38) --- testdata/testdata.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testdata/testdata.txt b/testdata/testdata.txt index c22f460..6f121c7 100644 --- a/testdata/testdata.txt +++ b/testdata/testdata.txt @@ -21,7 +21,7 @@ # # bitrate -POCSAG512: Address: 1000512 Function: 1 Alpha: BOSWatch-Test: okay +POCSAG512: Address: 1000512 Function: 1 Alpha: BOSWatch-Test ÖÄÜß: okay POCSAG1200: Address: 1001200 Function: 1 Alpha: BOSWatch-Test: okay POCSAG2400: Address: 1002400 Function: 1 Alpha: BOSWatch-Test: okay @@ -31,6 +31,10 @@ POCSAG512: Address: 1000001 Function: 1 Alpha: BOSWatch-Test: okay POCSAG512: Address: 1000002 Function: 2 Alpha: BOSWatch-Test: okay POCSAG512: Address: 1000003 Function: 3 Alpha: BOSWatch-Test: okay +# german special sign +POCSAG512: Address: 1200001 Function: 1 Alpha: BOSWatch-Test ÖÄÜß: okay +POCSAG512: Address: 1200001 Function: 1 Alpha: BOSWatch-Test öäü: okay + # witch csv POCSAG512: Address: 1234567 Function: 1 Alpha: BOSWatch-Test: with csv