Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AP_HAL_ChibiOS: chibios_hwdef.py: canonicalise AP_PERIPH env define #24849

Merged
merged 1 commit into from Sep 5, 2023
Merged

AP_HAL_ChibiOS: chibios_hwdef.py: canonicalise AP_PERIPH env define #24849

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@ class ChibiOSHWDef(object):
# output variables for each pin
f4f7_vtypes = ['MODER', 'OTYPER', 'OSPEEDR', 'PUPDR', 'ODR', 'AFRL', 'AFRH']
f1_vtypes = ['CRL', 'CRH', 'ODR']
af_labels = ['USART', 'UART', 'SPI', 'I2C', 'SDIO', 'SDMMC', 'OTG', 'JT', 'TIM', 'CAN', 'QUADSPI', 'OCTOSPI', 'ETH', 'MCO' ]
af_labels = ['USART', 'UART', 'SPI', 'I2C', 'SDIO', 'SDMMC', 'OTG', 'JT', 'TIM', 'CAN', 'QUADSPI', 'OCTOSPI', 'ETH', 'MCO']

def __init__(self, bootloader=False, signed_fw=False, outdir=None, hwdef=[], default_params_filepath=None):
self.outdir = outdir
Expand Down Expand Up @@ -3009,7 +3009,11 @@ def process_line(self, line):
print("Adding environment %s" % ' '.join(a[1:]))
if len(a[1:]) < 2:
self.error("Bad env line for %s" % a[0])
self.env_vars[a[1]] = ' '.join(a[2:])
name = a[1]
value = ' '.join(a[2:])
if name == 'AP_PERIPH' and value != "1":
raise ValueError("AP_PERIPH may only have value 1")
self.env_vars[name] = value

def process_file(self, filename):
'''process a hwdef.dat file'''
Expand Down Expand Up @@ -3068,7 +3072,7 @@ def add_firmware_defaults_from_file(self, f, filename, description):
''' % (description, content, description))

def is_io_fw(self):
return self.env_vars.get('IOMCU_FW', 0) != 0
return int(self.env_vars.get('IOMCU_FW', 0)) != 0

def add_iomcu_firmware_defaults(self, f):
'''add default defines IO firmwares'''
Expand All @@ -3079,16 +3083,16 @@ def add_iomcu_firmware_defaults(self, f):
self.add_firmware_defaults_from_file(f, "defaults_iofirmware.h", "IOMCU Firmware")

def is_periph_fw(self):
return self.env_vars.get('AP_PERIPH', 0) != 0
return int(self.env_vars.get('AP_PERIPH', 0)) != 0

def is_normal_fw(self):
if self.env_vars.get('IOMCU_FW', 0) != 0:
if self.is_io_fw():
# IOMCU firmware
return False
if self.is_periph_fw():
# Periph firmware
return False
if args.bootloader:
if self.is_bootloader_fw():
# guess
return False
return True
Expand Down