Merge branch 'develop' of https://github.com/Schrolli91/BOSWatch into develop

This commit is contained in:
Bastian Schroll 2015-07-04 08:16:13 +02:00
commit 7c06a78a2f
2 changed files with 8 additions and 4 deletions

View file

@ -91,7 +91,7 @@ def run(typ,freq,data):
logging.debug("ZVEI to firEmergency")
try:
firXML = "<event>\n<address>"+data["zvei"]+"</address>\n<message>"+data["zvei"]+" alarmiert.</message>\n</event>\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 = "<event>\n<address>"+data["ric"]+"</address>\n<message>"+data["msg"]+"</message>\n</event>\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)

View file

@ -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
@ -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