Commented out r->g iperf, fixed addresses for calculating r->g ping
This commit is contained in:
parent
bac6551797
commit
96d12a24ce
16
relay.py
16
relay.py
|
|
@ -75,10 +75,10 @@ def relay_iperf(
|
||||||
collect_iperf(
|
collect_iperf(
|
||||||
filename=filename, server_ip=relay_address, duration=duration, stations="er"
|
filename=filename, server_ip=relay_address, duration=duration, stations="er"
|
||||||
)
|
)
|
||||||
try:
|
# try:
|
||||||
collect_iperf_remote(filename=filename)
|
# collect_iperf_remote(filename=filename)
|
||||||
except Exception as e:
|
# except Exception as e:
|
||||||
print(f"Error collecting relay -> ground iperf: {e}")
|
# print(f"Error collecting relay -> ground iperf: {e}")
|
||||||
|
|
||||||
|
|
||||||
# Collect and send data continuously
|
# Collect and send data continuously
|
||||||
|
|
@ -108,8 +108,8 @@ def collect_data(
|
||||||
) # edge to relay
|
) # edge to relay
|
||||||
data = calculate_ping(
|
data = calculate_ping(
|
||||||
dictionary=data,
|
dictionary=data,
|
||||||
base_address=base_address,
|
base_address="eg",
|
||||||
relay_address=relay_address,
|
relay_address="er",
|
||||||
name="rg",
|
name="rg",
|
||||||
) # relay to ground
|
) # relay to ground
|
||||||
data["timestamp"] = time.time()
|
data["timestamp"] = time.time()
|
||||||
|
|
@ -153,10 +153,10 @@ def set_parameters():
|
||||||
or "10.45.0.1"
|
or "10.45.0.1"
|
||||||
)
|
)
|
||||||
folder_name = (
|
folder_name = (
|
||||||
input("Enter the log folder name (Default is boat_relay_sept): ")
|
input("Enter the log folder name (Default is boat_relay_oct_9): ")
|
||||||
.strip()
|
.strip()
|
||||||
.lower()
|
.lower()
|
||||||
or "boat_relay_sept"
|
or "boat_relay_oct_9"
|
||||||
)
|
)
|
||||||
interval = int(
|
interval = int(
|
||||||
input(
|
input(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user