Properly pass KF dependencies to rednose (#24985)

* Fix rednose dependencies

* bump rednose

* bump rednose
pull/24986/head
Willem Melching 3 years ago committed by GitHub
parent fd5b3d7603
commit 42d51a1b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 21
      SConstruct
  2. 2
      rednose_repo

@ -356,22 +356,27 @@ Export('cereal', 'messaging', 'visionipc')
# Build rednose library and ekf models # Build rednose library and ekf models
rednose_deps = [
"#selfdrive/locationd/models/constants.py",
"#selfdrive/locationd/models/gnss_helpers.py",
]
rednose_config = { rednose_config = {
'generated_folder': '#selfdrive/locationd/models/generated', 'generated_folder': '#selfdrive/locationd/models/generated',
'to_build': { 'to_build': {
'gnss': ('#selfdrive/locationd/models/gnss_kf.py', True, []), 'gnss': ('#selfdrive/locationd/models/gnss_kf.py', True, [], rednose_deps),
'live': ('#selfdrive/locationd/models/live_kf.py', True, ['live_kf_constants.h']), 'live': ('#selfdrive/locationd/models/live_kf.py', True, ['live_kf_constants.h'], rednose_deps),
'car': ('#selfdrive/locationd/models/car_kf.py', True, []), 'car': ('#selfdrive/locationd/models/car_kf.py', True, [], rednose_deps),
}, },
} }
if arch != "larch64": if arch != "larch64":
rednose_config['to_build'].update({ rednose_config['to_build'].update({
'loc_4': ('#selfdrive/locationd/models/loc_kf.py', True, []), 'loc_4': ('#selfdrive/locationd/models/loc_kf.py', True, [], rednose_deps),
'pos_computer_4': ('#rednose/helpers/lst_sq_computer.py', False, []), 'pos_computer_4': ('#rednose/helpers/lst_sq_computer.py', False, [], []),
'pos_computer_5': ('#rednose/helpers/lst_sq_computer.py', False, []), 'pos_computer_5': ('#rednose/helpers/lst_sq_computer.py', False, [], []),
'feature_handler_5': ('#rednose/helpers/feature_handler.py', False, []), 'feature_handler_5': ('#rednose/helpers/feature_handler.py', False, [], []),
'lane': ('#xx/pipeline/lib/ekf/lane_kf.py', True, []), 'lane': ('#xx/pipeline/lib/ekf/lane_kf.py', True, [], rednose_deps),
}) })
Export('rednose_config') Export('rednose_config')

@ -1 +1 @@
Subproject commit a79a87300a6c5093d99f281307c65b1e99295b20 Subproject commit 225dbacbaac312f85eaaee0b97a3acc31f9c6b47
Loading…
Cancel
Save