From 5ce144cad115b15a0ed33460244a27dee5c88625 Mon Sep 17 00:00:00 2001 From: madrigal Date: Fri, 19 Sep 2025 10:24:01 -0400 Subject: [PATCH] linting --- communication.py | 22 ++++++++++++++-------- helper_functions.py | 2 +- plots.py | 15 ++++++++++----- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/communication.py b/communication.py index 18c6f24..a842487 100644 --- a/communication.py +++ b/communication.py @@ -19,7 +19,12 @@ from at_commands import ( get_modem_sinr, set_configs, ) -from helper_functions import calculate_distance, normalize, parse_lat_lon, save_data_to_json +from helper_functions import ( + calculate_distance, + normalize, + parse_lat_lon, + save_data_to_json, +) from sierra_commands import get_modem_nr_info, get_modem_status # Globals @@ -139,15 +144,16 @@ def ping_basestation( if match: time_value = match.group(1) - dictionary["ping_time"] = time_value - dictionary["ping_stats"] = result.stdout - return dictionary + dictionary[f"{address}_ping_time"] = time_value else: - dictionary["ping_time"] = "Not found" - dictionary["ping_stats"] = result.stdout - return dictionary + dictionary[f"{address}_ping_time"] = "Not found" + + dictionary[f"{address}_ping_stats"] = result.stdout + except Exception as e: - return {"error": str(e)} + dictionary["ping error"] = f"{e}" + + return dictionary # Run iperf test diff --git a/helper_functions.py b/helper_functions.py index 85aca06..61402ea 100644 --- a/helper_functions.py +++ b/helper_functions.py @@ -187,7 +187,7 @@ if __name__ == "__main__": filenames = [ "/home/madrigal/repos/range-testing/data/boat_relay_sept_18/test_1758215714_copy.json", "/home/madrigal/repos/range-testing/data/boat_relay_sept_18/test_1758217711_copy.json", - "/home/madrigal/repos/range-testing/data/boat_relay_sept_18/test_1758219350_copy.json" + "/home/madrigal/repos/range-testing/data/boat_relay_sept_18/test_1758219350_copy.json", ] base_location = { "latitude": 43.656328, diff --git a/plots.py b/plots.py index c3febfd..f1e3be0 100644 --- a/plots.py +++ b/plots.py @@ -2,7 +2,6 @@ import json import re import matplotlib.pyplot as plt -import numpy as np def plot_rsrp(filename): @@ -100,7 +99,7 @@ def plot_median_rsrp(filename): if min(antennas) == -169 and max(antennas) != -169: avg_rsrp = max(antennas) else: - avg_rsrp = sum(antennas)/len(antennas) + avg_rsrp = sum(antennas) / len(antennas) rsrps.append(avg_rsrp) distances.append(int(float(entry["distance"]))) except (ValueError, KeyError): @@ -108,7 +107,13 @@ def plot_median_rsrp(filename): # Plot the data plt.figure(figsize=(10, 6)) - plt.plot(distances, rsrps, label="RSRP PRX", marker="o", color="blue",) + plt.plot( + distances, + rsrps, + label="RSRP Avg RX", + marker="o", + color="blue", + ) plt.title("RSRP vs Distance") plt.xlabel("Distance (m)") @@ -216,7 +221,7 @@ def plot_median_rsrq(filename): if min(antennas) == -169 and max(antennas) != -20: avg_rsrq = max(antennas) else: - avg_rsrq = sum(antennas)/len(antennas) + avg_rsrq = sum(antennas) / len(antennas) rsrqs.append(avg_rsrq) distances.append(int(float(entry["distance"]))) except (ValueError, KeyError): @@ -224,7 +229,7 @@ def plot_median_rsrq(filename): # Plot the data plt.figure(figsize=(10, 6)) - plt.plot(distances, rsrqs, label="RSRQ PRX", marker="o", color="blue") + plt.plot(distances, rsrqs, label="RSRQ Avg RX", marker="o", color="blue") plt.title("RSRQ vs Distance") plt.xlabel("Distance (m)")