Merge pull request #33 from coffee-and-telesense/bme68x_targetu0

Update BME68x driver to target U0

Author: nkanderson

.gitignore

@@ -1,3 +1,7 @@
 *build/
 *.vscode
-**/Drivers/
+*CMakeCache.txt
+*.cmake
+*.o
+*compile_commands.json
+*CmakeFiles

CMakeLists.txt

@@ -0,0 +1,31 @@
+cmake_minimum_required(VERSION 3.22)
+
+# Use the existing toolchain file from CubeMX
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/CubeMX/cmake/gcc-arm-none-eabi.cmake)
+
+# Disable CTest integration
+set(CMAKE_SKIP_TESTS TRUE)
+
+project(PicoAPRS-RTOS-Firmware C CXX ASM)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+### This is a generator expression which will be evaluated during build
+### system generation to produce project wide definitions
+add_compile_definitions(
+  BME68X_DO_NOT_USE_FPU
+  $<$<CONFIG:Debug>:DEBUG>
+)
+
+### gps feature selection, see libs\gps\Inc\driver\max_m10s.h for details
+#(NON-BLOCKING if ON or BLOCKING if OFF)
+option(GPS_NON_BLOCKING "Enable GPS Blocking/Non-Blocking Feature" ON)
+
+# Add library directories
+add_subdirectory(CubeMX/cmake/stm32cubemx)
+add_subdirectory(libs/gps)
+add_subdirectory(libs/common)
+add_subdirectory(libs/bme68x)
+
+# Add tests
+add_subdirectory(tests/gps_simple_test)
+add_subdirectory(tests/test_bme688)

tests/test_bme688/CMakePresets.json CMakePresets.jsontests/test_bme688/CMakePresets.json renamed to CMakePresets.json

@@ -6,7 +6,7 @@
             "hidden": true,
             "generator": "Ninja",
             "binaryDir": "${sourceDir}/build/${presetName}",
-		    "toolchainFile": "${sourceDir}/../../targets/stm32L4xx/L476RG/cmake/gcc-arm-none-eabi.cmake",
+		    "toolchainFile": "${sourceDir}/CubeMX/cmake/gcc-arm-none-eabi.cmake",
             "cacheVariables": {
             }
         },
@@ -37,11 +37,6 @@
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "MinSizeRel"
             }
-        },
-        {
-            "name": "target-base",
-            "hidden": true,
-            "inherits": "default"
         }
     ],
     "buildPresets": [
@@ -60,6 +55,11 @@
         {
             "name": "MinSizeRel",
             "configurePreset": "MinSizeRel"
+        },
+        {
+            "name": "test_bme688",
+            "description": "Test application for the BME688 sensor",
+            "displayName": "Test BME68x"
         }
     ]
-}
+}

Config/Inc/target_config.h

@@ -0,0 +1,14 @@
+[PreviousLibFiles]
+LibFiles=Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_adc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_adc_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_adc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rcc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rcc_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_rcc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_bus.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_system.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_utils.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_crs.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_flash.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_flash_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_gpio.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_gpio_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_gpio.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_dma.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_dma_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_pwr.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_pwr_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_pwr.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_cortex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_cortex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_def.h;Drivers\STM32U0xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_exti.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_exti.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_i2c.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_i2c_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_i2c.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rtc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rtc_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_rtc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_spi.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_spi.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_spi_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_tim.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_tim.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_tim_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_uart.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_uart_ex.h;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_adc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_adc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_ll_adc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rcc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rcc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_flash.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_flash_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_gpio.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_dma.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_dma_ex.c;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_dma.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_dmamux.h;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_pwr.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_pwr_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_cortex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_exti.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_i2c.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_i2c_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_ll_i2c.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rtc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rtc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_spi.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_spi_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_tim.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_tim_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_uart.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_uart_ex.c;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_adc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_adc_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_adc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rcc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rcc_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_rcc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_bus.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_system.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_utils.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_crs.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_flash.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_flash_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_gpio.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_gpio_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_gpio.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_dma.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_dma_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_pwr.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_pwr_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_pwr.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_cortex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_cortex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_def.h;Drivers\STM32U0xx_HAL_Driver\Inc\Legacy\stm32_hal_legacy.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_exti.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_exti.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_i2c.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_i2c_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_i2c.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rtc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_rtc_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_rtc.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_spi.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_spi.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_spi_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_tim.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_ll_tim.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_tim_ex.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_uart.h;Drivers\STM32U0xx_HAL_Driver\Inc\stm32u0xx_hal_uart_ex.h;Drivers\CMSIS\Device\ST\STM32U0xx\Include\stm32u083xx.h;Drivers\CMSIS\Device\ST\STM32U0xx\Include\stm32u0xx.h;Drivers\CMSIS\Device\ST\STM32U0xx\Include\system_stm32u0xx.h;Drivers\CMSIS\Device\ST\STM32U0xx\Include\system_stm32u0xx.h;Drivers\CMSIS\Device\ST\STM32U0xx\Source\Templates\system_stm32u0xx.c;Drivers\CMSIS\Include\cachel1_armv7.h;Drivers\CMSIS\Include\cmsis_armcc.h;Drivers\CMSIS\Include\cmsis_armclang.h;Drivers\CMSIS\Include\cmsis_armclang_ltm.h;Drivers\CMSIS\Include\cmsis_compiler.h;Drivers\CMSIS\Include\cmsis_gcc.h;Drivers\CMSIS\Include\cmsis_iccarm.h;Drivers\CMSIS\Include\cmsis_version.h;Drivers\CMSIS\Include\core_armv81mml.h;Drivers\CMSIS\Include\core_armv8mbl.h;Drivers\CMSIS\Include\core_armv8mml.h;Drivers\CMSIS\Include\core_cm0.h;Drivers\CMSIS\Include\core_cm0plus.h;Drivers\CMSIS\Include\core_cm1.h;Drivers\CMSIS\Include\core_cm23.h;Drivers\CMSIS\Include\core_cm3.h;Drivers\CMSIS\Include\core_cm33.h;Drivers\CMSIS\Include\core_cm35p.h;Drivers\CMSIS\Include\core_cm4.h;Drivers\CMSIS\Include\core_cm55.h;Drivers\CMSIS\Include\core_cm7.h;Drivers\CMSIS\Include\core_cm85.h;Drivers\CMSIS\Include\core_sc000.h;Drivers\CMSIS\Include\core_sc300.h;Drivers\CMSIS\Include\core_starmc1.h;Drivers\CMSIS\Include\mpu_armv7.h;Drivers\CMSIS\Include\mpu_armv8.h;Drivers\CMSIS\Include\pac_armv81.h;Drivers\CMSIS\Include\pmu_armv8.h;Drivers\CMSIS\Include\tz_context.h;
+
+[PreviousUsedCMakes]
+SourceFiles=Src\main.c;Src\gpio.c;Src\adc.c;Src\i2c.c;Src\rtc.c;Src\spi.c;Src\tim.c;Src\usart.c;Src\stm32u0xx_it.c;Src\stm32u0xx_hal_msp.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_adc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_adc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_ll_adc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rcc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rcc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_flash.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_flash_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_gpio.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_dma.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_dma_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_pwr.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_pwr_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_cortex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_exti.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_i2c.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_i2c_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_ll_i2c.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rtc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rtc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_spi.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_spi_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_tim.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_tim_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_uart.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_uart_ex.c;Drivers\CMSIS\Device\ST\STM32U0xx\Source\Templates\system_stm32u0xx.c;Src\system_stm32u0xx.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_adc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_adc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_ll_adc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rcc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rcc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_flash.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_flash_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_gpio.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_dma.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_dma_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_pwr.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_pwr_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_cortex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_exti.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_i2c.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_i2c_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_ll_i2c.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rtc.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_rtc_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_spi.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_spi_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_tim.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_tim_ex.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_uart.c;Drivers\STM32U0xx_HAL_Driver\Src\stm32u0xx_hal_uart_ex.c;Drivers\CMSIS\Device\ST\STM32U0xx\Source\Templates\system_stm32u0xx.c;Src\system_stm32u0xx.c;;;
+HeaderPath=Drivers\STM32U0xx_HAL_Driver\Inc;Drivers\STM32U0xx_HAL_Driver\Inc\Legacy;Drivers\CMSIS\Device\ST\STM32U0xx\Include;Drivers\CMSIS\Include;Inc;
+CDefines=USE_HAL_DRIVER;STM32U083xx;USE_HAL_DRIVER;USE_HAL_DRIVER;
+
+[PreviousGenFiles]
+HeaderPath=..\Inc
+HeaderFiles=gpio.h;adc.h;i2c.h;rtc.h;spi.h;tim.h;usart.h;stm32u0xx_it.h;stm32u0xx_hal_conf.h;main.h;
+SourcePath=..\Src
+SourceFiles=gpio.c;adc.c;i2c.c;rtc.c;spi.c;tim.c;usart.c;stm32u0xx_it.c;stm32u0xx_hal_msp.c;main.c;
+

CubeMX/.mxproject

@@ -19,7 +19,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Set the project name
-set(CMAKE_PROJECT_NAME U083RC)
+set(CMAKE_PROJECT_NAME CubeMX)
 
 # Include toolchain file
 include("cmake/gcc-arm-none-eabi.cmake")