nrf/modules/machine/pin: Add support for IRQ on Pin's

This patch ads irq method to the pin object. Handlers
registered in the irq method will be kept as part of the
ROOT_POINTERS.

In order to resolve which pin object is the root of the
IRQ, the pin_find has been extended to also be able to
search up Pin objects based on mp_int_t pin number.
This also implies that the Pin.new API is now also supporting
creation of Pin objects based on the integer value of the
pin instead of old style mandating string name of the Pin.

All boards have been updated to use real pin number from
0-48 instead of pin_Pxx for UART/SPI and music module pins.

UART/SPI/modmusic has also been updated to use pin number
provided directly or look up the Pin object based on the
integer value of the pin (modmusic).

Pin generation has been updated to create a list of pins, where
the board/cpu dicts are now refering to an index in this list
instead of having one const declaration for each pin. This new
const table makes it possible to iterate through all pins generated
in order to locate the correct Pin object.

11 files changed, 78 insertions, 61 deletions

diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.h b/ports/nrf/boards/arduino_primo/mpconfigboard.h
index e4a5d9bf2..c809857da 100644
--- a/ports/nrf/boards/arduino_primo/mpconfigboard.h
+++ b/ports/nrf/boards/arduino_primo/mpconfigboard.h
@@ -60,21 +60,21 @@
 #define MICROPY_HW_LED1             (20) // LED1
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P11)
-#define MICROPY_HW_UART1_TX         (pin_P12)
+#define MICROPY_HW_UART1_RX         (11)
+#define MICROPY_HW_UART1_TX         (12)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P25) // (Arduino D13)
-#define MICROPY_HW_SPI0_MOSI        (pin_P23) // (Arduino D11)
-#define MICROPY_HW_SPI0_MISO        (pin_P24) // (Arduino D12)
+#define MICROPY_HW_SPI0_SCK         (25) // (Arduino D13)
+#define MICROPY_HW_SPI0_MOSI        (23) // (Arduino D11)
+#define MICROPY_HW_SPI0_MISO        (24) // (Arduino D12)
 
 #define MICROPY_HW_PWM0_NAME        "PWM0"
 #define MICROPY_HW_PWM1_NAME        "PWM1"
 #define MICROPY_HW_PWM2_NAME        "PWM2"
 
 // buzzer pin
-#define MICROPY_HW_MUSIC_PIN        (pin_P8)
+#define MICROPY_HW_MUSIC_PIN        (8)
 
 #define HELP_TEXT_BOARD_LED         "1"
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.h b/ports/nrf/boards/dvk_bl652/mpconfigboard.h
index 150dd3318..b8af9ac68 100644
--- a/ports/nrf/boards/dvk_bl652/mpconfigboard.h
+++ b/ports/nrf/boards/dvk_bl652/mpconfigboard.h
@@ -60,17 +60,17 @@
 #define MICROPY_HW_LED2             (19) // LED2
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P8)
-#define MICROPY_HW_UART1_TX         (pin_P6)
-#define MICROPY_HW_UART1_CTS        (pin_P7)
-#define MICROPY_HW_UART1_RTS        (pin_P5)
+#define MICROPY_HW_UART1_RX         (8)
+#define MICROPY_HW_UART1_TX         (6)
+#define MICROPY_HW_UART1_CTS        (7)
+#define MICROPY_HW_UART1_RTS        (5)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P25)
-#define MICROPY_HW_SPI0_MOSI        (pin_P23)
-#define MICROPY_HW_SPI0_MISO        (pin_P24)
+#define MICROPY_HW_SPI0_SCK         (25)
+#define MICROPY_HW_SPI0_MOSI        (23)
+#define MICROPY_HW_SPI0_MISO        (24)
 
 #define MICROPY_HW_PWM0_NAME        "PWM0"
 #define MICROPY_HW_PWM1_NAME        "PWM1"
diff --git a/ports/nrf/boards/feather52/mpconfigboard.h b/ports/nrf/boards/feather52/mpconfigboard.h
index ca2284af4..d0f86c391 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.h
+++ b/ports/nrf/boards/feather52/mpconfigboard.h
@@ -60,15 +60,15 @@
 #define MICROPY_HW_LED2             (19) // LED2
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P8)
-#define MICROPY_HW_UART1_TX         (pin_P6)
+#define MICROPY_HW_UART1_RX         (8)
+#define MICROPY_HW_UART1_TX         (6)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P12) // (Arduino D13)
-#define MICROPY_HW_SPI0_MOSI        (pin_P13) // (Arduino D11)
-#define MICROPY_HW_SPI0_MISO        (pin_P14) // (Arduino D12)
+#define MICROPY_HW_SPI0_SCK         (12) // (Arduino D13)
+#define MICROPY_HW_SPI0_MOSI        (13) // (Arduino D11)
+#define MICROPY_HW_SPI0_MISO        (14) // (Arduino D12)
 
 #define MICROPY_HW_PWM0_NAME        "PWM0"
 #define MICROPY_HW_PWM1_NAME        "PWM1"
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 84d70add2..023b2161c 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -140,6 +140,12 @@ class Pin(object):
             str = '0'
         return str
 
+    def print_const_table_entry(self):
+        print('  PIN({:d}, {:s}, {:s}, {:d}),'.format(
+            self.pin,
+            self.alt_fn_name(null_if_0=True),
+            self.adc_num_str(), self.adc_channel))
+
     def print(self):
         if self.alt_fn_count == 0:
             print("// ",  end='')
@@ -227,18 +233,27 @@ 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(&pin_{:s}) }},'.format(named_pin.name(),  pin.cpu_pin_name()))
+                print('  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&machine_pin_obj[{:d}]) }},'.format(named_pin.name(), index))
+                index += 1
         print('};')
         print('MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'.format(label, label));
 
-    def print(self):
+    def print_const_table(self):
+        print('')
+        print('const uint8_t machine_pin_num_of_pins = {:d};'.format(len(self.board_pins)))
+        print('')
+        print('const pin_obj_t machine_pin_obj[{:d}] = {{'.format(len(self.board_pins)))
         for named_pin in self.cpu_pins:
             pin = named_pin.pin()
             if pin.is_board_pin():
-                pin.print()
+                pin.print_const_table_entry()
+        print('};');
+
+    def print(self):
         self.print_named('cpu', self.cpu_pins)
         print('')
         self.print_named('board', self.board_pins)
@@ -381,6 +396,8 @@ def main():
         print('')
         with open(args.prefix_filename, 'r') as prefix_file:
             print(prefix_file.read())
+
+    pins.print_const_table()
     pins.print()
     pins.print_header(args.hdr_filename)
     pins.print_qstr(args.qstr_filename)
diff --git a/ports/nrf/boards/microbit/mpconfigboard.h b/ports/nrf/boards/microbit/mpconfigboard.h
index 5aa2fb10d..03f7a1811 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.h
+++ b/ports/nrf/boards/microbit/mpconfigboard.h
@@ -56,15 +56,15 @@
 #define MICROPY_HW_ENABLE_CAN       (0)
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P25)
-#define MICROPY_HW_UART1_TX         (pin_P24)
+#define MICROPY_HW_UART1_RX         (25)
+#define MICROPY_HW_UART1_TX         (24)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P23)
-#define MICROPY_HW_SPI0_MOSI        (pin_P21)
-#define MICROPY_HW_SPI0_MISO        (pin_P22)
+#define MICROPY_HW_SPI0_SCK         (23)
+#define MICROPY_HW_SPI0_MOSI        (21)
+#define MICROPY_HW_SPI0_MISO        (22)
 
 // micro:bit music pin
-#define MICROPY_HW_MUSIC_PIN        (pin_P3)
+#define MICROPY_HW_MUSIC_PIN        (3)
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.h b/ports/nrf/boards/pca10000/mpconfigboard.h
index 89108d0c0..59a559784 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.h
+++ b/ports/nrf/boards/pca10000/mpconfigboard.h
@@ -60,8 +60,8 @@
 #define MICROPY_HW_LED_BLUE         (23) // BLUE
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P11)
-#define MICROPY_HW_UART1_TX         (pin_P9)
+#define MICROPY_HW_UART1_RX         (11)
+#define MICROPY_HW_UART1_TX         (9)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.h b/ports/nrf/boards/pca10001/mpconfigboard.h
index 3ecea41e8..a97f236b1 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.h
+++ b/ports/nrf/boards/pca10001/mpconfigboard.h
@@ -60,10 +60,10 @@
 #define MICROPY_HW_LED2             (19) // LED2
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P11)
-#define MICROPY_HW_UART1_TX         (pin_P9)
-#define MICROPY_HW_UART1_CTS        (pin_P10)
-#define MICROPY_HW_UART1_RTS        (pin_P8)
+#define MICROPY_HW_UART1_RX         (11)
+#define MICROPY_HW_UART1_TX         (9)
+#define MICROPY_HW_UART1_CTS        (10)
+#define MICROPY_HW_UART1_RTS        (8)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 #define HELP_TEXT_BOARD_LED         "1,2"
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.h b/ports/nrf/boards/pca10028/mpconfigboard.h
index 26c85f0f5..44334af3c 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.h
+++ b/ports/nrf/boards/pca10028/mpconfigboard.h
@@ -61,16 +61,16 @@
 #define MICROPY_HW_LED4             (24) // LED4
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P11)
-#define MICROPY_HW_UART1_TX         (pin_P9)
-#define MICROPY_HW_UART1_CTS        (pin_P10)
-#define MICROPY_HW_UART1_RTS        (pin_P8)
+#define MICROPY_HW_UART1_RX         (11)
+#define MICROPY_HW_UART1_TX         (9)
+#define MICROPY_HW_UART1_CTS        (10)
+#define MICROPY_HW_UART1_RTS        (8)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P29)
-#define MICROPY_HW_SPI0_MOSI        (pin_P25)
-#define MICROPY_HW_SPI0_MISO        (pin_P28)
+#define MICROPY_HW_SPI0_SCK         (29)
+#define MICROPY_HW_SPI0_MOSI        (25)
+#define MICROPY_HW_SPI0_MISO        (28)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3,4"
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.h b/ports/nrf/boards/pca10031/mpconfigboard.h
index b4a21c876..0834aa609 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.h
+++ b/ports/nrf/boards/pca10031/mpconfigboard.h
@@ -60,16 +60,16 @@
 #define MICROPY_HW_LED_BLUE         (23) // BLUE
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P11)
-#define MICROPY_HW_UART1_TX         (pin_P9)
-#define MICROPY_HW_UART1_CTS        (pin_P10)
-#define MICROPY_HW_UART1_RTS        (pin_P8)
+#define MICROPY_HW_UART1_RX         (11)
+#define MICROPY_HW_UART1_TX         (9)
+#define MICROPY_HW_UART1_CTS        (10)
+#define MICROPY_HW_UART1_RTS        (8)
 #define MICROPY_HW_UART1_HWFC       (0)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P15)
-#define MICROPY_HW_SPI0_MOSI        (pin_P16)
-#define MICROPY_HW_SPI0_MISO        (pin_P17)
+#define MICROPY_HW_SPI0_SCK         (15)
+#define MICROPY_HW_SPI0_MOSI        (16)
+#define MICROPY_HW_SPI0_MISO        (17)
 
 #define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.h b/ports/nrf/boards/pca10040/mpconfigboard.h
index ca2edb942..996124e3a 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.h
+++ b/ports/nrf/boards/pca10040/mpconfigboard.h
@@ -63,17 +63,17 @@
 #define MICROPY_HW_LED4             (20) // LED4
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P8)
-#define MICROPY_HW_UART1_TX         (pin_P6)
-#define MICROPY_HW_UART1_CTS        (pin_P7)
-#define MICROPY_HW_UART1_RTS        (pin_P5)
+#define MICROPY_HW_UART1_RX         (8)
+#define MICROPY_HW_UART1_TX         (6)
+#define MICROPY_HW_UART1_CTS        (7)
+#define MICROPY_HW_UART1_RTS        (5)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
-#define MICROPY_HW_SPI0_SCK         (pin_P25) // (Arduino D13)
-#define MICROPY_HW_SPI0_MOSI        (pin_P23) // (Arduino D11)
-#define MICROPY_HW_SPI0_MISO        (pin_P24) // (Arduino D12)
+#define MICROPY_HW_SPI0_SCK         (25) // (Arduino D13)
+#define MICROPY_HW_SPI0_MOSI        (23) // (Arduino D11)
+#define MICROPY_HW_SPI0_MISO        (24) // (Arduino D12)
 
 #define MICROPY_HW_PWM0_NAME        "PWM0"
 #define MICROPY_HW_PWM1_NAME        "PWM1"
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/pca10056/mpconfigboard.h
index f14e0990e..78590e974 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@@ -62,18 +62,18 @@
 #define MICROPY_HW_LED4             (16) // LED4
 
 // UART config
-#define MICROPY_HW_UART1_RX         (pin_P8)
-#define MICROPY_HW_UART1_TX         (pin_P6)
-#define MICROPY_HW_UART1_CTS        (pin_P7)
-#define MICROPY_HW_UART1_RTS        (pin_P5)
+#define MICROPY_HW_UART1_RX         (8)
+#define MICROPY_HW_UART1_TX         (6)
+#define MICROPY_HW_UART1_CTS        (7)
+#define MICROPY_HW_UART1_RTS        (5)
 #define MICROPY_HW_UART1_HWFC       (1)
 
 // SPI0 config
 #define MICROPY_HW_SPI0_NAME        "SPI0"
 
-#define MICROPY_HW_SPI0_SCK         (pin_P47)
-#define MICROPY_HW_SPI0_MOSI        (pin_P45)
-#define MICROPY_HW_SPI0_MISO        (pin_P46)
+#define MICROPY_HW_SPI0_SCK         (47)
+#define MICROPY_HW_SPI0_MOSI        (45)
+#define MICROPY_HW_SPI0_MISO        (46)
 
 #define MICROPY_HW_PWM0_NAME        "PWM0"
 #define MICROPY_HW_PWM1_NAME        "PWM1"