Skip to content

Commit

Permalink
Merge pull request DotBots#323 from aabadie/maint_drv_bsp
Browse files Browse the repository at this point in the history
MAINT: move motors and rgbled libraries from bsp to drv
  • Loading branch information
aabadie authored Jul 9, 2024
2 parents 12605be + 2766c1f commit 0f4e791
Show file tree
Hide file tree
Showing 17 changed files with 2,569 additions and 109 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ ifeq (nrf5340dk-app,$(BUILD_TARGET))
01bsp_gpio \
01bsp_i2c \
01bsp_lighthouse \
01bsp_motors \
01bsp_nvmc \
01bsp_qdec \
01bsp_qspi \
01bsp_radio_txrx \
01bsp_radio_txrx_lr \
01bsp_rgbled \
01bsp_rng \
01bsp_rpm \
01bsp_timer \
Expand All @@ -30,8 +28,10 @@ ifeq (nrf5340dk-app,$(BUILD_TARGET))
01drv_lis2mdl \
01drv_lis3mdl \
01drv_lz4 \
01drv_motors \
01drv_move \
01drv_pid \
01drv_rgbled \
01drv_uzlib \
03app_dotbot \
03app_dotbot_gateway \
Expand All @@ -47,18 +47,18 @@ else ifeq (nrf5340dk-net,$(BUILD_TARGET))
01bsp_device \
01bsp_gpio \
01bsp_i2c \
01bsp_motors \
01bsp_nvmc \
01bsp_radio_txrx \
01bsp_radio_txrx_lr \
01bsp_rgbled \
01bsp_rng \
01bsp_rpm \
01bsp_timer \
01bsp_timer_hf \
01bsp_uart \
01drv_lis2mdl \
01drv_motors \
01drv_pid \
01drv_rgbled \
03app_dotbot_gateway \
03app_dotbot_gateway_lr \
03app_log_dump \
Expand Down Expand Up @@ -97,7 +97,7 @@ endif

# remove incompatible apps (nrf5340, sailbot, gateway, dotbot) for lh2-mini-mote builds
ifneq (,$(filter lh2-mini-mote,$(BUILD_TARGET)))
PROJECTS := $(filter-out 01bsp_qdec 01bsp_motors 01bsp_qspi 01bsp_rpm 01drv_lis2mdl 01drv_lis3mdl 01drv_lsm6ds 01drv_imu 01drv_move 01drv_pid 03app_dotbot_gateway 03app_dotbot_gateway_lr 03app_dotbot 03app_sailbot 03app_nrf5340_% 03app_freebot 03app_xgo,$(PROJECTS))
PROJECTS := $(filter-out 01bsp_qdec 01bsp_qspi 01bsp_rpm 01drv_imu 01drv_lis2mdl 01drv_lis3mdl 01drv_lsm6ds 01drv_motors 01drv_move 01drv_pid 03app_dotbot_gateway 03app_dotbot_gateway_lr 03app_dotbot 03app_sailbot 03app_nrf5340_% 03app_freebot 03app_xgo,$(PROJECTS))
ARTIFACT_PROJECTS := 03app_lh2_mini_mote_app
# Bootloader not supported on lh2-mini-mote
BOOTLOADER :=
Expand Down
18 changes: 0 additions & 18 deletions bsp/bsp.emProject
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,6 @@
<file file_name="nrf/$(Lh2ImplementationFile)" />
<file file_name="lh2.h" />
</project>
<project Name="00bsp_dotbot_motors">
<configuration
Name="Common"
project_dependencies="00bsp_pwm"
project_directory="."
project_type="Library" />
<file file_name="nrf/motors.c" />
<file file_name="motors.h" />
</project>
<project Name="00bsp_dotbot_rgbled">
<configuration
Name="Common"
project_dependencies="00bsp_gpio(bsp)"
project_directory="."
project_type="Library" />
<file file_name="nrf/rgbled.c" />
<file file_name="rgbled.h" />
</project>
<project Name="00bsp_dotbot_rpm">
<configuration
Name="Common"
Expand Down
Loading

0 comments on commit 0f4e791

Please sign in to comment.