* rm laika

* Rm laika

* Needed this

* More rm

* More rm
This commit is contained in:
Harald Schäfer
2023-10-23 00:15:39 -07:00
committed by GitHub
parent 67f2321060
commit 56dea7b0b4
14 changed files with 5 additions and 1135 deletions
+3 -7
View File
@@ -33,8 +33,7 @@ def run_remote_checker(lat, lon, alt, duration, ip_addr):
return False, None, None
matched, log, info = con.root.exposed_run_checker(lat, lon, alt,
timeout=duration,
use_laikad=True)
timeout=duration)
con.close() # TODO: might wanna fetch more logs here
con = None
@@ -43,7 +42,7 @@ def run_remote_checker(lat, lon, alt, duration, ip_addr):
stats = defaultdict(int) # type: ignore
keys = ['success', 'failed', 'ublox_fail', 'laikad_fail', 'proc_crash', 'checker_crash']
keys = ['success', 'failed', 'ublox_fail', 'proc_crash', 'checker_crash']
def print_report():
print("\nFuzzy testing report summary:")
@@ -62,10 +61,7 @@ def update_stats(matched, log, info):
if log == "CHECKER CRASHED":
stats['checker_crash'] += 1
if log == "TIMEOUT":
if "LAIKAD" in info:
stats['laikad_fail'] += 1
else: # "UBLOX" in info
stats['ublox_fail'] += 1
stats['ublox_fail'] += 1
def main(ip_addr, continuous_mode, timeout, pos):
-185
View File
@@ -1,185 +0,0 @@
import os
import time
import shutil
from datetime import datetime
from collections import defaultdict
from openpilot.system.hardware.hw import Paths
import rpyc
from rpyc.utils.server import ThreadedServer
#from openpilot.common.params import Params
import cereal.messaging as messaging
from openpilot.selfdrive.manager.process_config import managed_processes
from laika.lib.coordinates import ecef2geodetic
DELTA = 0.001
ALT_DELTA = 30
MATCH_NUM = 10
REPORT_STATS = 10
EPHEM_CACHE = "/data/params/d/LaikadEphemerisV3"
SERVER_LOG_FILE = "/tmp/fuzzy_server.log"
server_log = open(SERVER_LOG_FILE, "w+")
def slog(msg):
server_log.write(f"{datetime.now().strftime('%H:%M:%S.%f')} | {msg}\n")
server_log.flush()
def handle_laikad(msg):
if not hasattr(msg, 'correctedMeasurements'):
return None
num_corr = len(msg.correctedMeasurements)
pos_ecef = msg.positionECEF.value
pos_geo = []
if len(pos_ecef) > 0:
pos_geo = ecef2geodetic(pos_ecef)
pos_std = msg.positionECEF.std
pos_valid = msg.positionECEF.valid
slog(f"{num_corr} {pos_geo} {pos_ecef} {pos_std} {pos_valid}")
return pos_geo, (num_corr, pos_geo, list(pos_ecef), list(msg.positionECEF.std))
hw_msgs = 0
ephem_msgs: dict = defaultdict(int)
def handle_ublox(msg):
global hw_msgs
d = msg.to_dict()
if 'hwStatus2' in d:
hw_msgs += 1
if 'ephemeris' in d:
ephem_msgs[msg.ephemeris.svId] += 1
num_meas = None
if 'measurementReport' in d:
num_meas = msg.measurementReport.numMeas
return [hw_msgs, ephem_msgs, num_meas]
def start_procs(procs):
for p in procs:
managed_processes[p].start()
time.sleep(1)
def kill_procs(procs, no_retry=False):
for p in procs:
managed_processes[p].stop()
time.sleep(1)
if not no_retry:
for p in procs:
mp = managed_processes[p].proc
if mp is not None and mp.is_alive():
managed_processes[p].stop()
time.sleep(3)
def check_alive_procs(procs):
for p in procs:
mp = managed_processes[p].proc
if mp is None or not mp.is_alive():
return False, p
return True, None
class RemoteCheckerService(rpyc.Service):
def on_connect(self, conn):
pass
def on_disconnect(self, conn):
#kill_procs(self.procs, no_retry=False)
# this execution is delayed, it will kill the next run of laikad
# TODO: add polling to wait for everything is killed
pass
def run_checker(self, slat, slon, salt, sockets, procs, timeout):
global hw_msgs, ephem_msgs
hw_msgs = 0
ephem_msgs = defaultdict(int)
slog(f"Run test: {slat} {slon} {salt}")
# quectel_mod = Params().get_bool("UbloxAvailable")
match_cnt = 0
msg_cnt = 0
stats_laikad = []
stats_ublox = []
self.procs = procs
start_procs(procs)
sm = messaging.SubMaster(sockets)
start_time = time.monotonic()
while True:
sm.update()
if sm.updated['ubloxGnss']:
stats_ublox.append(handle_ublox(sm['ubloxGnss']))
if sm.updated['gnssMeasurements']:
pos_geo, stats = handle_laikad(sm['gnssMeasurements'])
if pos_geo is None or len(pos_geo) == 0:
continue
match = all(abs(g-s) < DELTA for g,s in zip(pos_geo[:2], [slat, slon], strict=True))
match &= abs(pos_geo[2] - salt) < ALT_DELTA
if match:
match_cnt += 1
if match_cnt >= MATCH_NUM:
return True, "MATCH", f"After: {round(time.monotonic() - start_time, 4)}"
# keep some stats for error reporting
stats_laikad.append(stats)
if (msg_cnt % 10) == 0:
a, p = check_alive_procs(procs)
if not a:
return False, "PROC CRASH", f"{p}"
msg_cnt += 1
if (time.monotonic() - start_time) > timeout:
h = f"LAIKAD: {stats_laikad[-REPORT_STATS:]}"
if len(h) == 0:
h = f"UBLOX: {stats_ublox[-REPORT_STATS:]}"
return False, "TIMEOUT", h
def exposed_run_checker(self, slat, slon, salt, timeout=180, use_laikad=True):
try:
procs = []
sockets = []
if use_laikad:
procs.append("laikad") # pigeond, ubloxd # might wanna keep them running
sockets += ['ubloxGnss', 'gnssMeasurements']
if os.path.exists(EPHEM_CACHE):
os.remove(EPHEM_CACHE)
shutil.rmtree(Paths.download_cache_root(), ignore_errors=True)
ret = self.run_checker(slat, slon, salt, sockets, procs, timeout)
kill_procs(procs)
return ret
except Exception as e:
# always make sure processes get killed
kill_procs(procs)
return False, "CHECKER CRASHED", f"{str(e)}"
def exposed_kill_procs(self):
kill_procs(self.procs, no_retry=True)
if __name__ == "__main__":
print(f"Sever Log written to: {SERVER_LOG_FILE}")
t = ThreadedServer(RemoteCheckerService, port=18861)
t.start()
-105
View File
@@ -1,105 +0,0 @@
#!/usr/bin/env python3
import os
import time
import unittest
import cereal.messaging as messaging
import openpilot.system.sensord.pigeond as pd
from openpilot.common.params import Params
from openpilot.system.hardware import TICI
from openpilot.selfdrive.manager.process_config import managed_processes
from openpilot.selfdrive.test.helpers import with_processes
def wait_for_location(sm, timeout, con=10):
cons_meas = 0
start_time = time.monotonic()
while (time.monotonic() - start_time) < timeout:
sm.update()
if not sm.updated["gnssMeasurements"]:
continue
msg = sm["gnssMeasurements"]
cons_meas = (cons_meas + 1) if 'positionECEF' in msg.to_dict() else 0
if cons_meas >= con:
return True
return False
class TestLaikad(unittest.TestCase):
@classmethod
def setUpClass(self):
if not TICI:
raise unittest.SkipTest
ublox_available = Params().get_bool("UbloxAvailable")
if not ublox_available:
raise unittest.SkipTest
def setUp(self):
# ensure laikad cold start
Params().remove("LaikadEphemerisV3")
os.environ["LAIKAD_NO_INTERNET"] = "1"
managed_processes['laikad'].start()
def tearDown(self):
managed_processes['laikad'].stop()
@with_processes(['pigeond', 'ubloxd'])
def test_laikad_cold_start(self):
time.sleep(5)
start_time = time.monotonic()
sm = messaging.SubMaster(["gnssMeasurements"])
success = wait_for_location(sm, 60*2, con=10)
duration = time.monotonic() - start_time
assert success, "Waiting for location timed out (2min)!"
assert duration < 60, f"Received Location {duration}!"
@with_processes(['ubloxd'])
def test_laikad_ublox_reset_start(self):
time.sleep(2)
pigeon, pm = pd.create_pigeon()
pd.init_baudrate(pigeon)
assert pigeon.reset_device(), "Could not reset device!"
laikad_sock = messaging.sub_sock("gnssMeasurements", timeout=0.1)
ublox_gnss_sock = messaging.sub_sock("ubloxGnss", timeout=0.1)
pd.init_baudrate(pigeon)
pd.initialize_pigeon(pigeon)
pd.run_receiving(pigeon, pm, 180)
ublox_msgs = messaging.drain_sock(ublox_gnss_sock)
laikad_msgs = messaging.drain_sock(laikad_sock)
gps_ephem_cnt = 0
glonass_ephem_cnt = 0
for um in ublox_msgs:
if um.ubloxGnss.which() == 'ephemeris':
gps_ephem_cnt += 1
elif um.ubloxGnss.which() == 'glonassEphemeris':
glonass_ephem_cnt += 1
assert gps_ephem_cnt > 0, "NO gps ephemeris collected!"
assert glonass_ephem_cnt > 0, "NO glonass ephemeris collected!"
pos_meas = 0
duration = -1
for lm in laikad_msgs:
pos_meas = (pos_meas + 1) if 'positionECEF' in lm.gnssMeasurements.to_dict() else 0
if pos_meas > 5:
duration = (lm.logMonoTime - laikad_msgs[0].logMonoTime)*1e-9
break
assert pos_meas > 5, "NOT enough positions at end of read!"
assert duration < 120, "Laikad took too long to get a Position!"
if __name__ == "__main__":
unittest.main()