Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/daemon/daemon.c
This commit is contained in:
chenfu
2023-06-23 17:07:33 +08:00
14 changed files with 19 additions and 21 deletions

View File

@@ -119,7 +119,7 @@ bsp/can/bsp_can.c \
bsp/usart/bsp_usart.c \
bsp/usb/bsp_usb.c \
bsp/log/bsp_log.c \
bsp/log/bsp_flash.c \
bsp/flash/bsp_flash.c \
bsp/bsp_init.c \
modules/algorithm/controller.c \
modules/algorithm/kalman_filter.c \
@@ -245,6 +245,7 @@ C_INCLUDES = \
-Ibsp/spi \
-Ibsp/iic \
-Ibsp/log \
-Ibsp/flash \
-Ibsp/pwm \
-Ibsp/bsp_legacy_support \
-Ibsp \