Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwdef: create and use convenient is_periph_firmware method

This commit is contained in:
Peter Barker 2023-05-10 18:46:37 +10:00 committed by Andrew Tridgell
parent a16c9cf64e
commit 586851e40f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View File

@ -674,7 +674,7 @@ class ChibiOSHWDef(object):
def get_ram_reserve_start(self): def get_ram_reserve_start(self):
'''get amount of memory to reserve for bootloader comms''' '''get amount of memory to reserve for bootloader comms'''
ram_reserve_start = self.get_config('RAM_RESERVE_START', default=0, type=int) ram_reserve_start = self.get_config('RAM_RESERVE_START', default=0, type=int)
if ram_reserve_start == 0 and int(self.env_vars.get('AP_PERIPH',0)) == 1: if ram_reserve_start == 0 and self.is_periph_fw():
ram_reserve_start = 256 ram_reserve_start = 256
return ram_reserve_start return ram_reserve_start
@ -1562,7 +1562,7 @@ INCLUDE common.ld
def write_check_firmware(self, f): def write_check_firmware(self, f):
'''add AP_CHECK_FIRMWARE_ENABLED if needed''' '''add AP_CHECK_FIRMWARE_ENABLED if needed'''
if self.env_vars.get('AP_PERIPH',0) != 0 or self.intdefines.get('AP_OPENDRONEID_ENABLED',0) == 1: if self.is_periph_fw() or self.intdefines.get('AP_OPENDRONEID_ENABLED',0) == 1:
f.write(''' f.write('''
#ifndef AP_CHECK_FIRMWARE_ENABLED #ifndef AP_CHECK_FIRMWARE_ENABLED
#define AP_CHECK_FIRMWARE_ENABLED 1 #define AP_CHECK_FIRMWARE_ENABLED 1
@ -1907,7 +1907,7 @@ INCLUDE common.ld
if OTG2_index is not None: if OTG2_index is not None:
f.write('#define HAL_OTG2_UART_INDEX %d\n' % OTG2_index) f.write('#define HAL_OTG2_UART_INDEX %d\n' % OTG2_index)
f.write('#define HAL_HAVE_DUAL_USB_CDC 1\n') f.write('#define HAL_HAVE_DUAL_USB_CDC 1\n')
if self.env_vars.get('AP_PERIPH', 0) == 0: if not self.is_periph_fw():
f.write(''' f.write('''
#if defined(HAL_NUM_CAN_IFACES) && HAL_NUM_CAN_IFACES #if defined(HAL_NUM_CAN_IFACES) && HAL_NUM_CAN_IFACES
#ifndef HAL_OTG2_PROTOCOL #ifndef HAL_OTG2_PROTOCOL
@ -2480,7 +2480,7 @@ INCLUDE common.ld
f = open(hwdat, 'w') f = open(hwdat, 'w')
f.write('\n'.join(self.all_lines)) f.write('\n'.join(self.all_lines))
f.close() f.close()
if not 'AP_PERIPH' in self.env_vars: if not self.is_periph_fw():
self.romfs["hwdef.dat"] = hwdat self.romfs["hwdef.dat"] = hwdat
def write_hwdef_header(self, outfilename): def write_hwdef_header(self, outfilename):
@ -2979,7 +2979,7 @@ INCLUDE common.ld
def add_apperiph_defaults(self, f): def add_apperiph_defaults(self, f):
'''add default defines for peripherals''' '''add default defines for peripherals'''
if self.env_vars.get('AP_PERIPH',0) == 0: if not self.is_periph_fw():
# not AP_Periph # not AP_Periph
return return
@ -3356,12 +3356,15 @@ INCLUDE common.ld
// end IOMCU Firmware defaults // end IOMCU Firmware defaults
''') ''')
def is_periph_fw(self):
return self.env_vars.get('AP_PERIPH', 0) != 0
def add_normal_firmware_defaults(self, f): def add_normal_firmware_defaults(self, f):
'''add default defines to builds with are not bootloader, periph or IOMCU''' '''add default defines to builds with are not bootloader, periph or IOMCU'''
if self.env_vars.get('IOMCU_FW', 0) != 0: if self.env_vars.get('IOMCU_FW', 0) != 0:
# IOMCU firmware # IOMCU firmware
return return
if self.env_vars.get('AP_PERIPH', 0) != 0: if self.is_periph_fw():
# Periph firmware # Periph firmware
return return
if args.bootloader: if args.bootloader: