Schrolli91/BOSWatch
1
0
Fork 0
mirror of https://github.com/Schrolli91/BOSWatch.git synced 2026-01-23 08:30:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adaption for changes in ZVEI

Browse source 
Due to changes from ZVEI2 to ZVEI1 there were 2 major changes:
- String from multimon-ng contains more information, so l. 60 had to be adapted
- Repeated tone signal is changed from F to E
This commit is contained in:
Florian 2017-03-06 22:36:38 +01:00 committed by GitHub
parent 98b50110a0
commit 88a4ae57ce
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
includes/decoders/zvei.py
View file

@ -17,24 +17,24 @@ from includes import doubleFilter # double alarm filter
##
#
# Local function to remove the 'F'
# Local function to remove the 'E'
#
def removeF(zvei):
def removeE(zvei):
"""
Resolve the F from the repeat Tone
Resolve the E from the repeat Tone
@type zvei: string
@param zvei: ZVEI Information
@return: ZVEI without F
@return: ZVEI without E
@exception: none
"""
if "F" in zvei:
if "E" in zvei:
zvei_old = zvei
for i in range(1, len(zvei_old)):
if zvei[i] == "F":
zvei = zvei.replace("F",zvei[i-1],1)
logging.debug("resolve F: %s -> %s", zvei_old, zvei)
if zvei[i] == "E":
zvei = zvei.replace("E",zvei[i-1],1)
logging.debug("remove E: %s -> %s", zvei_old, zvei)
return zvei
##
@ -57,8 +57,8 @@ def decode(freq, decoded):
@exception: Exception if ZVEI decode failed
"""
try:
zvei_id = decoded[7:12] # ZVEI Code
zvei_id = removeF(zvei_id) # resolve F
zvei_id = decoded[14:19] # ZVEI Code
zvei_id = removeE(zvei_id) # remove E (repeated tone)
if re.search("[0-9]{5}", zvei_id): # if ZVEI is valid
# check for double alarm
if doubleFilter.checkID("ZVEI", zvei_id):