Browse Source

HAL_ChibiOS: use AP_PERIPH env var

mission-4.1.18
Andrew Tridgell 6 years ago
parent
commit
c8806acaf5
  1. 3
      libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat
  2. 3
      libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat
  3. 2
      libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py

3
libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef-bl.dat

@ -9,6 +9,9 @@ FLASH_BOOTLOADER_LOAD_KB 25
# board ID for firmware load # board ID for firmware load
APJ_BOARD_ID 3 APJ_BOARD_ID 3
# setup build for a peripheral firmware
env AP_PERIPH 1
# crystal frequency # crystal frequency
OSCILLATOR_HZ 8000000 OSCILLATOR_HZ 8000000

3
libraries/AP_HAL_ChibiOS/hwdef/f103-periph/hwdef.dat

@ -13,6 +13,9 @@ define HAL_STORAGE_SIZE 800
# board ID for firmware load # board ID for firmware load
APJ_BOARD_ID 3 APJ_BOARD_ID 3
# setup build for a peripheral firmware
env AP_PERIPH 1
# crystal frequency # crystal frequency
OSCILLATOR_HZ 8000000 OSCILLATOR_HZ 8000000

2
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py

@ -551,7 +551,7 @@ def write_mcu_config(f):
f.write('#define HAL_USE_SERIAL_USB TRUE\n') f.write('#define HAL_USE_SERIAL_USB TRUE\n')
if 'OTG2' in bytype: if 'OTG2' in bytype:
f.write('#define STM32_USB_USE_OTG2 TRUE\n') f.write('#define STM32_USB_USE_OTG2 TRUE\n')
if have_type_prefix('CAN') and not mcu_series.startswith("STM32F1"): if have_type_prefix('CAN') and not 'AP_PERIPH' in env_vars:
enable_can(f) enable_can(f)
if get_config('PROCESS_STACK', required=False): if get_config('PROCESS_STACK', required=False):

Loading…
Cancel
Save