diff --git a/communication.py b/communication.py index 9a5c97b..f5912bb 100644 --- a/communication.py +++ b/communication.py @@ -7,12 +7,20 @@ import time import serial -from at_commands import (get_modem_cops, get_modem_cpol, get_modem_creg, - get_modem_csq, get_modem_qnwcfg, get_modem_qnwinfo, - get_modem_qspn, get_modem_rsrp, get_modem_rsrq, - get_modem_sinr, set_configs) -from helper_functions import (calculate_distance, parse_lat_lon, - save_data_to_json) +from at_commands import ( + get_modem_cops, + get_modem_cpol, + get_modem_creg, + get_modem_csq, + get_modem_qnwcfg, + get_modem_qnwinfo, + get_modem_qspn, + get_modem_rsrp, + get_modem_rsrq, + get_modem_sinr, + set_configs, +) +from helper_functions import calculate_distance, parse_lat_lon, save_data_to_json from sierra_commands import get_modem_nr_info, get_modem_status # Globals @@ -153,13 +161,13 @@ def collect_iperf( commands = [["iperf3", "-s"]] else: commands = [ - ["iperf3", "-c", server_ip, "-t", str(duration)], - ["iperf3", "-c", server_ip, "-t", str(duration), "-R"], - ] - + ["iperf3", "-c", server_ip, "-t", str(duration)], + ["iperf3", "-c", server_ip, "-t", str(duration), "-R"], + ] + for command in commands: try: - # try: + # try: # gps_data = read_gps_data() # start_distance = calculate_distance(base_location, gps_data) # except: @@ -291,7 +299,7 @@ def collect_sierra_data(filename): # Main function def main(): global running - foldername = 'data/boat_relay_sept_11' + foldername = "data/boat_relay_sept_11" os.makedirs(foldername, exist_ok=True) filename = foldername + "/test_" + str(int(time.time())) + ".json"