BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2026-04-21 06:03:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

some edits

Browse source
This commit is contained in:
Bastian Schroll 2018-01-08 08:09:23 +01:00
parent b5b5562a5d
commit f6094618d8
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
boswatch/decoder/fms.py
View file

@ -51,7 +51,7 @@ class Fms:
tacticalInfo = data[114:117] tacticalInfo = data[114:117]
fms_id = service + country + location + vehicle + status + direction fms_id = service + country + location + vehicle + status + direction
if re.search("[0-9a-f]{8}[0-9a-f]{1}[01]{1}", fms_id): if re.search("[0-9a-f]{8}[0-9a-f][01]", fms_id):
logging.debug("found valid FMS") logging.debug("found valid FMS")
bwPacket = packet.Packet() bwPacket = packet.Packet()

4
boswatch/decoder/pocsag.py
View file

@ -42,10 +42,10 @@ class Pocsag:
@return BOSWatch POCSAG packet or None""" @return BOSWatch POCSAG packet or None"""
bitrate, ric, subric = Pocsag._getBitrateRicSubric(data) bitrate, ric, subric = Pocsag._getBitrateRicSubric(data)
if re.search("[0-9]{7}", ric) and re.search("[1-4]{1}", subric): if re.search("[0-9]{7}", ric) and re.search("[1-4]", subric):
if "Alpha:" in data: if "Alpha:" in data:
message = data.split('Alpha: ')[1].strip() message = data.split('Alpha: ')[1].strip()
message = message.replace('<NUL><NUL>', '').replace('<NUL>', '').replace('<NUL', '').replace('< NUL>', '').replace('<EOT>', '').strip() message = message.replace('<NUL>', '').replace('<NUL', '').replace('< NUL>', '').replace('<EOT>', '').strip()
else: else:
message = "" message = ""
subricText = subric.replace("1", "a").replace("2", "b").replace("3", "c").replace("4", "d") subricText = subric.replace("1", "a").replace("2", "b").replace("3", "c").replace("4", "d")

2
boswatch/descriptor/descriptor.py
View file

@ -12,7 +12,7 @@
@file: descriptor.py @file: descriptor.py
@date: 07.01.2018 @date: 07.01.2018
@author: Bastian Schroll @author: Bastian Schroll
@description: @description: Descriptor to load Descriptions from csv files
""" """
import logging import logging
import csv import csv

3
boswatch/network/server.py
View file

@ -108,6 +108,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
logging.exception("cannot stop the server") logging.exception("cannot stop the server")
return False return False
@staticmethod
def clientsConnected(self): # pragma: no cover def clientsConnected(self): # pragma: no cover
"""!Number of currently connected Clients """!Number of currently connected Clients
@ -119,6 +120,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
else: else:
return 0 return 0
@staticmethod
def getData(self): def getData(self):
"""!Function to get the data packages from server """!Function to get the data packages from server
must be polled by main program must be polled by main program
@ -130,6 +132,7 @@ class TCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
return message return message
return None return None
@staticmethod
def flushData(self): def flushData(self):
"""!To flush all existing data in queue""" """!To flush all existing data in queue"""
logging.debug("Flush client data queue") logging.debug("Flush client data queue")