Merge branch '183-add-support-for-the-mini-mote-2' of https://github.…

…com/SaidAlvarado/DotBot-firmware into 183-add-support-for-the-mini-mote-2
DotBots · Jun 5, 2024 · be8ba2b · be8ba2b
2 parents befcd79 + c33a221
commit be8ba2b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- target: ["dotbot-v1", "dotbot-v2", "freebot-v1.0", "nrf52833dk", "nrf52840dk", "nrf5340dk-app", "nrf5340dk-net", "sailbot-v1", "xgo-v1", "xgo-v2", "lh2-mini-mote"]
+ target: ["dotbot-v1", "dotbot-v2", "freebot-v1.0", "lh2-mini-mote", "nrf52833dk", "nrf52840dk", "nrf5340dk-app", "nrf5340dk-net", "sailbot-v1", "xgo-v1", "xgo-v2"]
  config: ["Debug", "Release"]
  steps:
  - name: Checkout repo
@@ -126,14 +126,14 @@ jobs:
  with:
  name: artifacts-xgo-v2
  path: ./artifacts
+ - name: Download LH2 mini mote artifacts
+ uses: actions/download-artifact@v4
+ with:
+ name: artifacts-lh2-mini-mote
+ path: ./artifacts
  - name: Release
  uses: ncipollo/release-action@v1
  with:
  generateReleaseNotes: true
  artifacts: "artifacts/*"
  token: ${{ secrets.RELEASE_TOKEN }}
- - name: Download LH2 mini mote artifacts
- uses: actions/download-artifact@v4
- with:
- name: artifacts-lh2-mini-mote
- path: ./artifacts
diff --git a/Makefile b/Makefile
@@ -95,10 +95,12 @@ ifneq (,$(filter dotbot-v2,$(BUILD_TARGET)))
  ARTIFACT_PROJECTS := 03app_dotbot
 endif
 
-# remove incompatible apps (nrf5340, sailbot, gateway, dotbot) for lh2_mini_mote builds
+# 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_rpm 01drv_lis2mdl 01drv_lis3mdl 01drv_lsm6ds 01drv_move 03app_dotbot_gateway 03app_dotbot_gateway_lr 03app_dotbot 03app_sailbot 03app_nrf5340_% 03app_freebot 03app_xgo,$(PROJECTS))
+ 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))
  ARTIFACT_PROJECTS := 03app_lh2_mini_mote_app
+ # Bootloader not supported on lh2-mini-mote
+ BOOTLOADER :=
 endif
 
 # remove incompatible apps (nrf5340, dotbot, gateway) for sailbot-v1 build

diff --git a/bsp/nrf/board.c b/bsp/nrf/board.c
@@ -64,3 +64,5 @@ void db_board_init(void) {
  db_gpio_set(&_reg_pin);
 #endif
 }
+
+// TODO: add a 3v minimote UICR code
diff --git a/lh2-mini-mote.emProject b/lh2-mini-mote.emProject
@@ -38,7 +38,7 @@
  link_time_optimization="No"
  linker_memory_map_file="$(PackagesDir)/nRF/XML/nRF52833_xxAA_MemoryMap.xml"
  linker_output_format="hex"
- macros="BuildTarget=lh2-minimote;Lh2ImplementationFile=lh2.c;PwmImplementationFile=pwm.c;RadioImplementationFile=radio.c;RngImplementationFile=rng.c;DeviceHeaderFile=$(PackagesDir)/nRF/Device/Include/nrf52833.h;DeviceCommonHeaderFile=$(PackagesDir)/nRF/Device/Include/nrf.h;DeviceSystemFile=$(PackagesDir)/nRF/Device/Source/system_nrf52.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/nrf52833_Vectors.s;DeviceCommonVectorsFile=$(PackagesDir)/nRF/Source/nRF_Startup.s;SeggerThumbStartup=$(ProjectDir)/../../../nRF/SEGGER_THUMB_Startup.s;DeviceLinkerScript=$(ProjectDir)/../../../nRF/nrf5340/nRF_Flash_Variant1.icf;DeviceMemoryMap=$(PackagesDir)/nRF/XML/nRF52840_xxAA_MemoryMap.xml;DeviceLibraryIdentifier=M4lf;DeviceFamily=nRF;Target=nRF52833_xxAA;Placement=Flash"
+ macros="BuildTarget=lh2-mini-mote;Lh2ImplementationFile=lh2.c;PwmImplementationFile=pwm.c;RadioImplementationFile=radio.c;RngImplementationFile=rng.c;DeviceHeaderFile=$(PackagesDir)/nRF/Device/Include/nrf52833.h;DeviceCommonHeaderFile=$(PackagesDir)/nRF/Device/Include/nrf.h;DeviceSystemFile=$(PackagesDir)/nRF/Device/Source/system_nrf52.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/nrf52833_Vectors.s;DeviceCommonVectorsFile=$(PackagesDir)/nRF/Source/nRF_Startup.s;SeggerThumbStartup=$(ProjectDir)/../../../nRF/SEGGER_THUMB_Startup.s;DeviceLinkerScript=$(ProjectDir)/../../../nRF/nrf5340/nRF_Flash_Variant1.icf;DeviceMemoryMap=$(PackagesDir)/nRF/XML/nRF52840_xxAA_MemoryMap.xml;DeviceLibraryIdentifier=M4lf;DeviceFamily=nRF;Target=nRF52833_xxAA;Placement=Flash"
  project_type="Executable"
  target_reset_script="Reset();"
  target_trace_initialize_script="EnableTrace(&quot;$(TraceInterfaceType)&quot;)" />