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

HAL_ChibiOS: break out make_line() for PAL_LINE defines

This commit is contained in:
Andrew Tridgell 2020-01-01 15:50:10 +11:00
parent 33182a9f11
commit c5df48faa7
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,6 +559,15 @@ def get_mcu_config(name, required=False):
return None return None
return lib.mcu[name] return lib.mcu[name]
def make_line(label):
'''return a line for a label'''
if label in bylabel:
p = bylabel[label]
line = 'PAL_LINE(GPIO%s,%uU)' % (p.port, p.pin)
else:
line = "0"
return line
def enable_can(f): def enable_can(f):
'''setup for a CAN enabled board''' '''setup for a CAN enabled board'''
f.write('#define HAL_WITH_UAVCAN 1\n') f.write('#define HAL_WITH_UAVCAN 1\n')
@ -1038,22 +1047,11 @@ def write_UART_config(f):
else: else:
error("Invalid element %s in UART_ORDER" % dev) error("Invalid element %s in UART_ORDER" % dev)
devlist.append('HAL_%s_CONFIG' % dev) devlist.append('HAL_%s_CONFIG' % dev)
if dev + "_TX" in bylabel: tx_line = make_line(dev + '_TX')
p = bylabel[dev + '_TX'] rx_line = make_line(dev + '_RX')
tx_line = 'PAL_LINE(GPIO%s,%uU)' % (p.port, p.pin) rts_line = make_line(dev + '_RTS')
else: if rts_line != "0":
tx_line = "0"
if dev + "_RX" in bylabel:
p = bylabel[dev + '_RX']
rx_line = 'PAL_LINE(GPIO%s,%uU)' % (p.port, p.pin)
else:
rx_line = "0"
if dev + "_RTS" in bylabel:
p = bylabel[dev + '_RTS']
rts_line = 'PAL_LINE(GPIO%s,%uU)' % (p.port, p.pin)
have_rts_cts = True have_rts_cts = True
else:
rts_line = "0"
if dev.startswith('OTG2'): if dev.startswith('OTG2'):
f.write( f.write(
'#define HAL_%s_CONFIG {(BaseSequentialStream*) &SDU2, true, false, 0, 0, false, 0, 0}\n' '#define HAL_%s_CONFIG {(BaseSequentialStream*) &SDU2, true, false, 0, 0, false, 0, 0}\n'
@ -1160,14 +1158,16 @@ def write_I2C_config(f):
error("Bad I2C_ORDER element %s" % dev) error("Bad I2C_ORDER element %s" % dev)
n = int(dev[3:]) n = int(dev[3:])
devlist.append('HAL_I2C%u_CONFIG' % n) devlist.append('HAL_I2C%u_CONFIG' % n)
sda_line = make_line('I2C%u_SDA' % n)
scl_line = make_line('I2C%u_SCL' % n)
f.write(''' f.write('''
#if defined(STM32_I2C_I2C%u_RX_DMA_STREAM) && defined(STM32_I2C_I2C%u_TX_DMA_STREAM) #if defined(STM32_I2C_I2C%u_RX_DMA_STREAM) && defined(STM32_I2C_I2C%u_TX_DMA_STREAM)
#define HAL_I2C%u_CONFIG { &I2CD%u, STM32_I2C_I2C%u_RX_DMA_STREAM, STM32_I2C_I2C%u_TX_DMA_STREAM, HAL_GPIO_PIN_I2C%u_SCL, HAL_GPIO_PIN_I2C%u_SDA } #define HAL_I2C%u_CONFIG { &I2CD%u, STM32_I2C_I2C%u_RX_DMA_STREAM, STM32_I2C_I2C%u_TX_DMA_STREAM, %s, %s }
#else #else
#define HAL_I2C%u_CONFIG { &I2CD%u, SHARED_DMA_NONE, SHARED_DMA_NONE, HAL_GPIO_PIN_I2C%u_SCL, HAL_GPIO_PIN_I2C%u_SDA } #define HAL_I2C%u_CONFIG { &I2CD%u, SHARED_DMA_NONE, SHARED_DMA_NONE, %s, %s }
#endif #endif
''' '''
% (n, n, n, n, n, n, n, n, n, n, n, n)) % (n, n, n, n, n, n, scl_line, sda_line, n, n, scl_line, sda_line))
f.write('\n#define HAL_I2C_DEVICE_LIST %s\n\n' % ','.join(devlist)) f.write('\n#define HAL_I2C_DEVICE_LIST %s\n\n' % ','.join(devlist))
def parse_timer(str): def parse_timer(str):
@ -1758,7 +1758,10 @@ def process_line(line):
if a[0] in config: if a[0] in config:
error("Pin %s redefined" % a[0]) error("Pin %s redefined" % a[0])
if p is None and line.find('ALT(') != -1:
error("ALT() invalid for %s" % a[0])
config[a[0]] = a[1:] config[a[0]] = a[1:]
if p is not None: if p is not None:
# add to set of pins for primary config # add to set of pins for primary config