From 9b6135f8b0733db736249e29348675dbb05ad22e Mon Sep 17 00:00:00 2001 From: Cees Bassa Date: Tue, 25 Jun 2019 12:55:16 +0200 Subject: [PATCH] Log transmitter modes in cache for easy identification --- schedule_single_station.py | 4 ++-- utils.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/schedule_single_station.py b/schedule_single_station.py index c010143..d7775f3 100755 --- a/schedule_single_station.py +++ b/schedule_single_station.py @@ -211,9 +211,9 @@ def main(): continue fp.write( - "%05d %s %d %d %d\n" % + "%05d %s %d %d %d %s\n" % (transmitters[uuid]["norad_cat_id"], uuid, transmitter["stats"]["success_rate"], - transmitter["stats"]["good_count"], transmitter["stats"]["total_count"])) + transmitter["stats"]["good_count"], transmitter["stats"]["total_count"], transmitters[uuid]["mode"])) logging.info("Transmitter success rates received!") fp.close() diff --git a/utils.py b/utils.py index f495ad1..84fa074 100644 --- a/utils.py +++ b/utils.py @@ -38,6 +38,8 @@ def read_priorities_transmitters(filename): sattrans = {} lines = fp.readlines() for line in lines: + if line[0]=="#": + continue parts = line.strip().split(" ") sat = parts[0] prio = parts[1] @@ -75,7 +77,7 @@ def get_active_transmitter_info(fmin, fmax): for o in r.json(): if o["downlink_low"]: if o["status"] == "active" and o["downlink_low"] > fmin and o["downlink_low"] <= fmax: - transmitter = {"norad_cat_id": o["norad_cat_id"], "uuid": o["uuid"]} + transmitter = {"norad_cat_id": o["norad_cat_id"], "uuid": o["uuid"], "mode": o["mode"]} transmitters.append(transmitter) logging.info("Transmitters filtered based on ground station capability.") return transmitters