firmware: Fix non-Android build
Bug: 35666637
Test: Manual
Change-Id: I27d04e95cf94cb178878c2d6305193ad562100d3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/firmware/variant/lunchbox/lunchbox.mk b/firmware/variant/lunchbox/lunchbox.mk
index 59c8010..4b400eb 100644
--- a/firmware/variant/lunchbox/lunchbox.mk
+++ b/firmware/variant/lunchbox/lunchbox.mk
@@ -35,13 +35,16 @@
SRCS_os += os/drivers/rohm_rpr0521/rohm_rpr0521.c
# Fusion algorithms
-SRCS_os += os/algos/fusion.c os/algos/mat.c os/algos/quat.c os/algos/vec.c
+SRCS_os += os/algos/fusion.c \
+ os/algos/common/math/mat.c \
+ os/algos/common/math/quat.c \
+ os/algos/common/math/vec.c
# BMI160 accel and gyro, BMM150 mag drivers
FLAGS += -DUSE_BMM150 -DMAG_SLAVE_PRESENT
SRCS_os += os/drivers/bosch_bmi160/bosch_bmi160.c \
os/drivers/bosch_bmi160/bosch_bmm150_slave.c \
- os/algos/mag_cal.c \
+ os/algos/calibration/magnetometer/mag_cal.c \
os/algos/time_sync.c
# Orientation sensor driver
diff --git a/firmware/variant/nucleo/nucleo.mk b/firmware/variant/nucleo/nucleo.mk
index af070ed..2e09dae 100644
--- a/firmware/variant/nucleo/nucleo.mk
+++ b/firmware/variant/nucleo/nucleo.mk
@@ -40,13 +40,16 @@
SRCS_os += os/drivers/rohm_rpr0521/rohm_rpr0521.c
# Fusion algorithm
-SRCS_os += os/algos/fusion.c os/algos/mat.c os/algos/quat.c os/algos/vec.c
+SRCS_os += os/algos/fusion.c \
+ os/algos/common/math/mat.c \
+ os/algos/common/math/quat.c \
+ os/algos/common/math/vec.c
# BMI160 accel and gyro, BMM150 mag drivers
FLAGS += -DUSE_BMM150 -DMAG_SLAVE_PRESENT
SRCS_os += os/drivers/bosch_bmi160/bosch_bmi160.c \
os/drivers/bosch_bmi160/bosch_bmm150_slave.c \
- os/algos/mag_cal.c \
+ os/algos/calibration/magnetometer/mag_cal.c \
os/algos/time_sync.c
# Orientation sensor driver
