diff --git a/common/kalman/.gitignore b/common/kalman/.gitignore deleted file mode 100644 index d86912e7d0..0000000000 --- a/common/kalman/.gitignore +++ /dev/null @@ -1 +0,0 @@ -simple_kalman_impl.c diff --git a/common/kalman/__init__.py b/common/kalman/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/kalman/tests/__init__.py b/common/kalman/tests/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/common/kalman/simple_kalman.py b/common/simple_kalman.py similarity index 100% rename from common/kalman/simple_kalman.py rename to common/simple_kalman.py diff --git a/common/kalman/tests/test_simple_kalman.py b/common/tests/test_simple_kalman.py similarity index 92% rename from common/kalman/tests/test_simple_kalman.py rename to common/tests/test_simple_kalman.py index 3afaf09d24..f641cd19e6 100644 --- a/common/kalman/tests/test_simple_kalman.py +++ b/common/tests/test_simple_kalman.py @@ -1,6 +1,6 @@ import unittest -from openpilot.common.kalman.simple_kalman import KF1D +from openpilot.common.simple_kalman import KF1D class TestSimpleKalman(unittest.TestCase): diff --git a/release/files_common b/release/files_common index 2ef68651c8..6652643803 100644 --- a/release/files_common +++ b/release/files_common @@ -24,9 +24,6 @@ common/__init__.py common/*.py common/*.pyx -common/kalman/.gitignore -common/kalman/* - common/transformations/__init__.py common/transformations/camera.py common/transformations/model.py diff --git a/selfdrive/car/interfaces.py b/selfdrive/car/interfaces.py index 9363fd659e..3bbf16c789 100644 --- a/selfdrive/car/interfaces.py +++ b/selfdrive/car/interfaces.py @@ -8,7 +8,7 @@ from typing import Any, Dict, Optional, Tuple, List, Callable from cereal import car from openpilot.common.basedir import BASEDIR from openpilot.common.conversions import Conversions as CV -from openpilot.common.kalman.simple_kalman import KF1D, get_kalman_gain +from openpilot.common.simple_kalman import KF1D, get_kalman_gain from openpilot.common.numpy_fast import clip from openpilot.common.realtime import DT_CTRL from openpilot.selfdrive.car import apply_hysteresis, gen_empty_fingerprint, scale_rot_inertia, scale_tire_stiffness, STD_CARGO_KG diff --git a/selfdrive/controls/radard.py b/selfdrive/controls/radard.py index f75b4b2059..4acadee7a7 100755 --- a/selfdrive/controls/radard.py +++ b/selfdrive/controls/radard.py @@ -11,7 +11,7 @@ from openpilot.common.params import Params from openpilot.common.realtime import Ratekeeper, Priority, config_realtime_process from openpilot.common.swaglog import cloudlog -from openpilot.common.kalman.simple_kalman import KF1D +from openpilot.common.simple_kalman import KF1D # Default lead acceleration decay set to 50% at 1s