Open HappyTakoumi opened 8 months ago
git pull --rebase origin main
git mergetool
git rebase --continue
git push raphael radio_test_project -f
The CI build jobs will pass with the following diff:
diff --git a/Makefile b/Makefile
index aa6c471..517cc89 100644
--- a/Makefile
+++ b/Makefile
@@ -72,17 +72,20 @@ RADIO_TEST_APPS ?= $(shell find radio_test/ -maxdepth 1 -mindepth 1 -type d | tr
ifneq (,$(filter dotbot-v1,$(BUILD_TARGET)))
PROJECTS := $(filter-out 01bsp_qdec 01drv_lis3mdl 01drv_move 03app_dotbot_gateway 03app_dotbot_gateway_lr 03app_sailbot 03app_nrf5340_%,$(PROJECTS))
ARTIFACT_PROJECTS := 03app_dotbot
+ RADIO_TEST_APPS :=
endif
ifneq (,$(filter dotbot-v2,$(BUILD_TARGET)))
PROJECTS := $(filter-out 03app_dotbot_gateway 03app_dotbot_gateway_lr 03app_sailbot 03app_nrf5340_net,$(PROJECTS))
ARTIFACT_PROJECTS := 03app_dotbot
+ RADIO_TEST_APPS :=
endif
# remove incompatible apps (nrf5340, dotbot, gateway) for sailbot-v1 build
ifeq (sailbot-v1,$(BUILD_TARGET))
PROJECTS := $(filter-out 01bsp_qdec 01drv_lis3mdl 01drv_move 03app_dotbot_gateway 03app_dotbot_gateway_lr 03app_dotbot 03app_nrf5340_%,$(PROJECTS))
ARTIFACT_PROJECTS := 03app_sailbot
+ RADIO_TEST_APPS :=
endif
# remove incompatible apps (nrf5340) for nrf52833dk/nrf52840dk build
@@ -97,6 +100,7 @@ endif
ifneq (,$(filter nrf5340dk-net,$(BUILD_TARGET)))
ARTIFACT_PROJECTS := 03app_nrf5340_net
+ RADIO_TEST_APPS :=
endif
SRCS ?= $(shell find bsp/ -name "*.[c|h]") $(shell find crypto/ -name "*.[c|h]") $(shell find drv/ -name "*.[c|h]") $(shell find projects/ -name "*.[c|h]") $(shell find otap/ -name "*.[c|h]") $(shell find radio_test/ -name "*.[c|h]")
@@ -171,4 +175,4 @@ docclean:
make -C doc/sphinx clean --no-print-directory
doc:
- make -C doc/sphinx linkcheck html --no-print-directory SPHINXOPTS="-W --keep-going -n"
\ No newline at end of file
+ make -C doc/sphinx linkcheck html --no-print-directory SPHINXOPTS="-W --keep-going -n"
diff --git a/nrf52833dk.emProject b/nrf52833dk.emProject
index 0a165f6..11d5d1c 100644
--- a/nrf52833dk.emProject
+++ b/nrf52833dk.emProject
@@ -64,4 +64,5 @@
<import file_name="projects/projects-log-dump.emProject" />
<import file_name="projects/projects-sailbot.emProject" />
<import file_name="otap/otap.emProject" />
+ <import file_name="radio_test/radio_test.emProject" />
</solution>
diff --git a/nrf5340dk-app.emProject b/nrf5340dk-app.emProject
index a5ab636..4a9a405 100644
--- a/nrf5340dk-app.emProject
+++ b/nrf5340dk-app.emProject
@@ -65,4 +65,5 @@
<import file_name="projects/projects-sailbot.emProject" />
<import file_name="projects/projects-nrf5340-app.emProject" />
<import file_name="otap/otap.emProject" />
+ <import file_name="radio_test/radio_test.emProject" />
</solution>
diff --git a/radio_test/radio_test.emProject b/radio_test/radio_test.emProject
index d9651ae..09846d9 100644
--- a/radio_test/radio_test.emProject
+++ b/radio_test/radio_test.emProject
@@ -1,6 +1,6 @@
<!DOCTYPE CrossStudio_Project_File>
<solution Name="Radio test" target="8" version="2">
- <project Name="Rx">
+ <project Name="rx">
<configuration
Name="Common"
project_dependencies="00bsp_dotbot_board(bsp);00bsp_timer(bsp);00bsp_radio(bsp);00bsp_uart(bsp)"
@@ -39,7 +39,7 @@
<file file_name="$(SeggerThumbStartup)" />
</folder>
</project>
- <project Name="Tx">
+ <project Name="tx">
<configuration
Name="Common"
project_dependencies="00bsp_dotbot_board(bsp);00bsp_timer(bsp);00bsp_radio(bsp)"
@@ -78,7 +78,7 @@
<file file_name="$(SeggerThumbStartup)" />
</folder>
</project>
- <project Name="Tx idle">
+ <project Name="tx_idle">
<configuration
Name="Common"
project_dependencies="00bsp_dotbot_board(bsp);00bsp_timer(bsp);00bsp_radio(bsp)"
fixes #277