Rednose (#1503)

* add rednose * update rednose * This compiles * Add rednose to release * cleanup * Extract generated dir as argument * Add constants.py to release * Add rednose to dockerfile * Fix that
eivegau · May 14, 2020 · 28bf5d1 · 28bf5d1
1 parent d976233
commit 28bf5d1
Show file tree

Hide file tree

Showing 30 changed files with 184 additions and 1,638 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -14,3 +14,6 @@
 	path = cereal
 	url = ../../commaai/cereal.git
 
+[submodule "rednose_repo"]
+	path = rednose_repo
+	url = ../../commaai/rednose.git
diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
@@ -88,6 +88,7 @@ COPY ./common /tmp/openpilot/common
 COPY ./opendbc /tmp/openpilot/opendbc
 COPY ./cereal /tmp/openpilot/cereal
 COPY ./panda /tmp/openpilot/panda
+COPY ./rednose /tmp/openpilot/rednose
 COPY ./selfdrive /tmp/openpilot/selfdrive
 
 COPY SConstruct /tmp/openpilot/SConstruct

diff --git a/SConstruct b/SConstruct
@@ -227,12 +227,11 @@ SConscript(['selfdrive/ui/SConscript'])
 SConscript(['selfdrive/loggerd/SConscript'])
 
 SConscript(['selfdrive/locationd/SConscript'])
-SConscript(['selfdrive/locationd/kalman/SConscript'])
+SConscript(['selfdrive/locationd/models/SConscript'])
 
 if arch == "aarch64":
   SConscript(['selfdrive/logcatd/SConscript'])
   SConscript(['selfdrive/sensord/SConscript'])
   SConscript(['selfdrive/clocksd/SConscript'])
 else:
   SConscript(['tools/lib/index_log/SConscript'])
-
diff --git a/rednose b/rednose
@@ -0,0 +1 @@
+rednose_repo/rednose
diff --git a/rednose_repo b/rednose_repo
diff --git a/release/files_common b/release/files_common
@@ -260,14 +260,11 @@ selfdrive/locationd/test/*.py
 
 selfdrive/locationd/locationd.py
 selfdrive/locationd/paramsd.py
-selfdrive/locationd/kalman/.gitignore
-selfdrive/locationd/kalman/__init__.py
-selfdrive/locationd/kalman/README.md
-selfdrive/locationd/kalman/SConscript
-selfdrive/locationd/kalman/templates/*
-selfdrive/locationd/kalman/helpers/*
-selfdrive/locationd/kalman/models/live_kf.py
-selfdrive/locationd/kalman/models/car_kf.py
+selfdrive/locationd/models/.gitignore
+selfdrive/locationd/models/SConscript
+selfdrive/locationd/models/live_kf.py
+selfdrive/locationd/models/car_kf.py
+selfdrive/locationd/models/constants.py
 
 selfdrive/locationd/calibrationd.py
 selfdrive/locationd/calibration_helpers.py
@@ -427,3 +424,5 @@ installer/updater/Makefile
 
 scripts/update_now.sh
 scripts/stop_updater.sh
+
+rednose/**
diff --git a/selfdrive/locationd/SConscript b/selfdrive/locationd/SConscript
@@ -19,4 +19,3 @@ env.Program("ubloxd_test", [
   "ublox_msg.cc",
   "ubloxd_main.cc"],
   LIBS=loc_libs)
-
diff --git a/selfdrive/locationd/kalman/README.md b/selfdrive/locationd/kalman/README.md
diff --git a/selfdrive/locationd/kalman/SConscript b/selfdrive/locationd/kalman/SConscript
diff --git a/selfdrive/locationd/kalman/helpers/__init__.py b/selfdrive/locationd/kalman/helpers/__init__.py
diff --git a/selfdrive/locationd/kalman/helpers/chi2_lookup.py b/selfdrive/locationd/kalman/helpers/chi2_lookup.py
diff --git a/selfdrive/locationd/kalman/helpers/chi2_lookup_table.npy b/selfdrive/locationd/kalman/helpers/chi2_lookup_table.npy
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ env.Program("ubloxd_test", [
		"ublox_msg.cc",
		"ubloxd_main.cc"],
		LIBS=loc_libs)