djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf/boards/make-pins.py: Fix gen of board pins to use correct index.

Browse Source 
It was previously not taking into account that the list of pins was sparse,
so using the wrong index.  The boards/X/pins.csv was generating the wrong
data for machine.Pin.board.

As part of this fix rename the variables to make it more clear what the
list contains (only board pins).
This commit is contained in:
Jim Mussared 2019-08-23 23:31:40 +10:00 committed by Damien George
parent 9e90e2528b
commit 353ed7705f
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/nrf/boards/make-pins.py
View File

@ -93,6 +93,7 @@ class Pin(object):
self.adc_num = 0
self.adc_channel = 0
self.board_pin = False
self.board_index = None
def cpu_pin_name(self):
return '{:s}{:d}'.format("P", self.pin)
@ -103,6 +104,9 @@ class Pin(object):
def set_is_board_pin(self):
self.board_pin = True
def set_board_index(self, index):
self.board_index = index
def parse_adc(self, adc_str):
if (adc_str[:3] != 'ADC'):
return
@ -233,20 +237,24 @@ class Pins(object):
def print_named(self, label, named_pins):
print('STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'.format(label))
index = 0
for named_pin in named_pins:
pin = named_pin.pin()
if pin.is_board_pin():
print(' {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&machine_pin_obj[{:d}]) }},'.format(named_pin.name(), index))
index += 1
print(' {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&machine_board_pin_obj[{:d}]) }},'.format(named_pin.name(), pin.board_index))
print('};')
print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label));
def print_const_table(self):
num_board_pins = 0
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():
pin.set_board_index(num_board_pins)
num_board_pins += 1
print('')
print('const uint8_t machine_pin_num_of_pins = {:d};'.format(len(self.board_pins)))
print('const uint8_t machine_pin_num_of_board_pins = {:d};'.format(num_board_pins))
print('')
print('const pin_obj_t machine_pin_obj[{:d}] = {{'.format(len(self.board_pins)))
print('const pin_obj_t machine_board_pin_obj[{:d}] = {{'.format(num_board_pins))
for named_pin in self.cpu_pins:
pin = named_pin.pin()
if pin.is_board_pin():

10
ports/nrf/modules/machine/pin.c
View File

@ -37,8 +37,8 @@
#include "nrf_gpio.h"
#include "nrfx_gpiote.h"
extern const pin_obj_t machine_pin_obj[];
extern const uint8_t machine_pin_num_of_pins;
extern const pin_obj_t machine_board_pin_obj[];
extern const uint8_t machine_pin_num_of_board_pins;
/// \moduleref machine
/// \class Pin - control I/O pins
@ -128,9 +128,9 @@ const pin_obj_t *pin_find(mp_obj_t user_obj) {
// If pin is SMALL_INT
if (mp_obj_is_small_int(user_obj)) {
uint8_t value = MP_OBJ_SMALL_INT_VALUE(user_obj);
for (uint8_t i = 0; i < machine_pin_num_of_pins; i++) {
if (machine_pin_obj[i].pin == value) {
return &machine_pin_obj[i];
for (uint8_t i = 0; i < machine_pin_num_of_board_pins; i++) {
if (machine_board_pin_obj[i].pin == value) {
return &machine_board_pin_obj[i];
}
}
}