diff --git a/measurement_main.py b/measurement_main.py index 245bd8a..55a1b99 100644 --- a/measurement_main.py +++ b/measurement_main.py @@ -303,7 +303,10 @@ def monitor_gps(ser, output_file): nmea_sentence = ser.readline() # GPRMC nmea_str = nmea_sentence.decode("utf-8") if nmea_str.startswith("$GPRMC"): - write_to_file(output_file, nmea_str) + time_epoch = subprocess.check_output(CMD_TIME_EPOCH, shell=True).decode( + "utf-8" + ) + write_to_file(output_file, "{},{}".format(nmea_str, time_epoch)) except: if not ser.is_open: print_message("GPS serial port is closed. Exit monitoring thread.") @@ -332,10 +335,6 @@ def reconnect_modem(provider="telekom", hard=False): sleep(2) modem_serial_obj.write(b'at+cfun=1\r\n') sleep(NR_SERIAL_RESPOND_TIME) - sleep(2) - os.system("/root/connect-modem.py -s") - sleep(5) - os.system("/root/connect-modem.py -l {}".format(provider)) except Exception as e: if not modem_serial_obj.is_open: print_message("Serial port is closed. {}".format(e)) @@ -345,6 +344,10 @@ def reconnect_modem(provider="telekom", hard=False): "Something went wrong while writing to serial. {}".format(e) ) os.system("/root/connect-modem.py -s") + sleep(2) + os.system("/root/connect-modem.py -s") + sleep(5) + os.system("/root/connect-modem.py -l {}".format(provider)) else: os.system("/root/connect-modem.py -s") sleep(5)