mawei/onepilot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

laikad: use new cache param (#27404)

Browse Source 
* add backward compatibility

* rename laikad cache file

* rm and update

---------

Co-authored-by: Kurt Nistelberger <kurt.nistelberger@gmail.com>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 6b4ac801e7ecb1addf74c9018958469741b609a3
This commit is contained in:
Kurt Nistelberger
2023-02-22 14:11:04 -08:00
committed by GitHub
parent 59ff270456
commit 1a97edf8d2
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/params.cc
View File

@@ -138,7 +138,7 @@ std::unordered_map<std::string, uint32_t> keys = {
{"IsReleaseBranch", CLEAR_ON_MANAGER_START},
{"IsUpdateAvailable", CLEAR_ON_MANAGER_START},
{"JoystickDebugMode", CLEAR_ON_MANAGER_START | CLEAR_ON_IGNITION_OFF},
{"LaikadEphemeris", PERSISTENT | DONT_LOG},
{"LaikadEphemerisV2", PERSISTENT | DONT_LOG},
{"LanguageSetting", PERSISTENT},
{"LastAthenaPingTime", CLEAR_ON_MANAGER_START},
{"LastGPSPosition", PERSISTENT},

2
selfdrive/locationd/laikad.py
View File

@@ -28,7 +28,7 @@ from selfdrive.locationd.models.gnss_kf import States as GStates
from system.swaglog import cloudlog
MAX_TIME_GAP = 10
EPHEMERIS_CACHE = 'LaikadEphemeris'
EPHEMERIS_CACHE = 'LaikadEphemerisV2'
DOWNLOADS_CACHE_FOLDER = "/tmp/comma_download_cache/"
CACHE_VERSION = 0.2
POS_FIX_RESIDUAL_THRESHOLD = 100.0

8
selfdrive/loggerd/tests/test_loggerd.py
View File

@@ -86,7 +86,7 @@ class TestLoggerd(unittest.TestCase):
params.clear_all()
for k, _, v in fake_params:
params.put(k, v)
params.put("LaikadEphemeris", "abc")
params.put("LaikadEphemerisV2", "abc")
lr = list(LogReader(str(self._gen_bootlog())))
initData = lr[0].initData
@@ -103,14 +103,14 @@ class TestLoggerd(unittest.TestCase):
# check params
logged_params = {entry.key: entry.value for entry in initData.params.entries}
expected_params = set(k for k, _, __ in fake_params) | {'LaikadEphemeris'}
expected_params = set(k for k, _, __ in fake_params) | {'LaikadEphemerisV2'}
assert set(logged_params.keys()) == expected_params, set(logged_params.keys()) ^ expected_params
assert logged_params['LaikadEphemeris'] == b'', f"DONT_LOG param value was logged: {repr(logged_params['LaikadEphemeris'])}"
assert logged_params['LaikadEphemerisV2'] == b'', f"DONT_LOG param value was logged: {repr(logged_params['LaikadEphemerisV2'])}"
for param_key, initData_key, v in fake_params:
self.assertEqual(getattr(initData, initData_key), v)
self.assertEqual(logged_params[param_key].decode(), v)
params.put("LaikadEphemeris", "")
params.put("LaikadEphemerisV2", "")
def test_rotation(self):
os.environ["LOGGERD_TEST"] = "1"

2
tools/gpstest/rpc_server.py
View File

@@ -17,7 +17,7 @@ ALT_DELTA = 30
MATCH_NUM = 10
REPORT_STATS = 10
EPHEM_CACHE = "/data/params/d/LaikadEphemeris"
EPHEM_CACHE = "/data/params/d/LaikadEphemerisV2"
DOWNLOAD_CACHE = "/tmp/comma_download_cache"
SERVER_LOG_FILE = "/tmp/fuzzy_server.log"

2
tools/gpstest/test_laikad.py
View File

@@ -39,7 +39,7 @@ class TestLaikad(unittest.TestCase):
def setUp(self):
# ensure laikad cold start
Params().remove("LaikadEphemeris")
Params().remove("LaikadEphemerisV2")
os.environ["LAIKAD_NO_INTERNET"] = "1"
managed_processes['laikad'].start()