diff options
Diffstat (limited to 'host/lib/cal')
| -rw-r--r-- | host/lib/cal/cal_python.hpp | 8 | ||||
| -rw-r--r-- | host/lib/cal/iq_cal.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/host/lib/cal/cal_python.hpp b/host/lib/cal/cal_python.hpp index 39a13d94c..e8f19eef9 100644 --- a/host/lib/cal/cal_python.hpp +++ b/host/lib/cal/cal_python.hpp @@ -8,8 +8,8 @@ #define INCLUDED_UHD_CAL_PYTHON_HPP #include <uhd/cal/database.hpp> -#include <uhd/cal/interpolation.hpp> #include <uhd/cal/iq_cal.hpp> +#include <uhd/utils/interpolation.hpp> std::vector<uint8_t> pybytes_to_vector(const py::bytes& data) { @@ -59,9 +59,9 @@ void export_cal(py::module& m) database::write_cal_data(key, serial, pybytes_to_vector(data)); }); - py::enum_<interp_mode>(m, "interp_mode") - .value("NEAREST_NEIGHBOR", interp_mode::NEAREST_NEIGHBOR) - .value("LINEAR", interp_mode::LINEAR); + py::enum_<uhd::math::interp_mode>(m, "interp_mode") + .value("NEAREST_NEIGHBOR", uhd::math::interp_mode::NEAREST_NEIGHBOR) + .value("LINEAR", uhd::math::interp_mode::LINEAR); py::class_<container, std::shared_ptr<container>>(m, "container") .def("get_name", &container::get_name) diff --git a/host/lib/cal/iq_cal.cpp b/host/lib/cal/iq_cal.cpp index e1ed8c9cb..f5640b01e 100644 --- a/host/lib/cal/iq_cal.cpp +++ b/host/lib/cal/iq_cal.cpp @@ -8,10 +8,12 @@ #include <uhd/cal/iq_cal_generated.h> #include <uhd/exception.hpp> #include <uhd/utils/math.hpp> +#include <uhdlib/utils/interpolation.hpp> #include <map> #include <string> using namespace uhd::usrp::cal; +using namespace uhd::math; constexpr int VERSION_MAJOR = 1; constexpr int VERSION_MINOR = 0; |