From 5d58044c2ed889de0376a82400db1d69fc34a296 Mon Sep 17 00:00:00 2001 From: JHCD Date: Thu, 4 Jun 2015 20:13:37 +0200 Subject: [PATCH] add fms direction as Text-String to plugin interface 0 = FZG->LST 1 = LST->FZG --- includes/decoders/fms.py | 17 +++++++++-------- plugins/interface.txt | 1 + 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/includes/decoders/fms.py b/includes/decoders/fms.py index 1f7dfa1..737b158 100644 --- a/includes/decoders/fms.py +++ b/includes/decoders/fms.py @@ -36,13 +36,14 @@ def decode(freq, decoded): """ timestamp = int(time.time())#Get Timestamp - fms_service = decoded[19] #Organisation - fms_country = decoded[36] #Bundesland - fms_location = decoded[65:67] #Ort - fms_vehicle = decoded[72:76] #Fahrzeug - fms_status = decoded[84] #Status - fms_direction = decoded[101] #Richtung - fms_tsi = decoded[114:117] #Taktische Kruzinformation + fms_service = decoded[19] #Organisation + fms_country = decoded[36] #Bundesland + fms_location = decoded[65:67] #Ort + fms_vehicle = decoded[72:76] #Fahrzeug + fms_status = decoded[84] #Status + fms_direction = decoded[101] #Richtung + fms_directionText = decoded[103:110] #Richtung (Text) + fms_tsi = decoded[114:117] #Taktische Kruzinformation if "CRC correct" in decoded: #check CRC is correct fms_id = fms_service+fms_country+fms_location+fms_vehicle+fms_status+fms_direction #build FMS id @@ -52,7 +53,7 @@ def decode(freq, decoded): globals.fms_time_old = timestamp #in case of double alarm, fms_double_ignore_time set new else: logging.info("FMS:%s Status:%s Richtung:%s TSI:%s", fms_id[0:8], fms_status, fms_direction, fms_tsi) - data = {"fms":fms_id[0:8], "status":fms_status, "direction":fms_direction, "tsi":fms_tsi} + data = {"fms":fms_id[0:8], "status":fms_status, "direction":fms_direction, "directionText":fms_directionText, "tsi":fms_tsi} from includes import alarmHandler alarmHandler.processAlarm("FMS",freq,data) diff --git a/plugins/interface.txt b/plugins/interface.txt index 3000604..e6da24b 100644 --- a/plugins/interface.txt +++ b/plugins/interface.txt @@ -14,6 +14,7 @@ FMS: - fms - status - direction +- directionText - tsi POCSAG: