HAL_ChibiOS: moved more board setup into hwdef.dat

7 years ago · 74ed19f460
9 changed files with 23 additions and 0 deletions
--- a/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/crazyflie2/hwdef.dat
@ -10,6 +10,8 @@ CCM_RAM_SIZE_KB 64
				@@ -10,6 +10,8 @@ CCM_RAM_SIZE_KB 64
 # board ID for firmware load
 APJ_BOARD_ID 70

+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_CRAZYFLIE2
+
 # crystal frequency
 OSCILLATOR_HZ 8000000
 STM32_PLLM_VALUE 8
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv3/hwdef.dat
@ -44,6 +44,11 @@
				@@ -44,6 +44,11 @@
 # MCU class and specific type
 MCU STM32F4xx STM32F427xx

+# we set a specific HAL_BOARD_SUBTYPE, allowing for custom config in
+# drivers. For this to be used the subtype needs to be added to
+# AP_HAL/AP_HAL_Boards.h as well
+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_FMUV3
+
 # now we need to specify the APJ_BOARD_ID. This is the ID that the
 # bootloader presents to GCS software so it knows if this firmware is
 # suitable for the board. Please see
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat
@ -1,6 +1,8 @@
				@@ -1,6 +1,8 @@
 # hw definition file for processing by chibios_hwdef.py
 # for FMUv4 hardware

+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_FMUV4
+
 # MCU class and specific type
 MCU STM32F4xx STM32F427xx

@ -193,3 +195,6 @@ define HAL_BATT_CURR_SCALE 17.0
				@@ -193,3 +195,6 @@ define HAL_BATT_CURR_SCALE 17.0
 # setup serial port defaults for ESP8266
 define HAL_SERIAL5_PROTOCOL SerialProtocol_MAVLink
 define HAL_SERIAL5_BAUD 921600
+
+
+
--- a/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/hwdef.dat
@ -5,6 +5,8 @@
				@@ -5,6 +5,8 @@
 # MCU class and specific type
 MCU STM32F4xx STM32F427xx

+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_MINDPXV2
+
 # board ID for firmware load
 APJ_BOARD_ID 88

--- a/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/mini-pix/hwdef.dat
@ -7,6 +7,8 @@ MCU STM32F4xx STM32F405xx
				@@ -7,6 +7,8 @@ MCU STM32F4xx STM32F405xx
 RAM_SIZE_KB 128
 CCM_RAM_SIZE_KB 64

+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_MINIPIX
+
 # board ID for firmware load
 APJ_BOARD_ID 3

--- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat
@ -7,6 +7,8 @@ MCU STM32F4xx STM32F405xx
				@@ -7,6 +7,8 @@ MCU STM32F4xx STM32F405xx
 RAM_SIZE_KB 128
 CCM_RAM_SIZE_KB 64

+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_REVOMINI
+
 # board ID for firmware load
 APJ_BOARD_ID 70

--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
@ -298,6 +298,7 @@ def write_mcu_config(f):
				@@ -298,6 +298,7 @@ def write_mcu_config(f):
        f.write('// SDIO available, enable POSIX filesystem support\n')
        f.write('#define USE_POSIX\n\n')
        f.write('#define HAL_USE_SDC TRUE\n')
+        env_vars['CHIBIOS_FATFS_FLAG'] = 'USE_FATFS=yes'
    else:
        f.write('#define HAL_USE_SDC FALSE\n')
        env_vars['CHIBIOS_FATFS_FLAG'] = 'USE_FATFS=no'
--- a/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
@ -52,3 +52,5 @@ DMA_PRIORITY SPI2_*
				@@ -52,3 +52,5 @@ DMA_PRIORITY SPI2_*
 DMA_NOSHARE SPI2_*
 undef PA1
 PA1 UART4_RX UART4 NODMA
+
+env DEFAULT_PARAMETERS '../../Tools/Frame_params/SkyViper-2450GPS/defaults.parm'
--- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat
@ -4,6 +4,8 @@
				@@ -4,6 +4,8 @@
 # MCU class and specific type
 MCU STM32F4xx STM32F405xx

+define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_SPARKY2
+
 # board ID for firmware load
 APJ_BOARD_ID 11