Merge pull request micropython#8037 from jpconstantineau/fix-PCA10100

fix to make buttons and leds compatible with pca10056
tannewt · Jun 8, 2023 · 6cf7e45 · 6cf7e45
2 parents 5d39414 + 6fd700e
commit 6cf7e45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.h b/ports/nrf/boards/pca10100/mpconfigboard.h
@@ -31,8 +31,6 @@
 #define MICROPY_HW_MCU_NAME         "nRF52833"
 
 #define MICROPY_HW_LED_STATUS          (&pin_P0_13)
-#define MICROPY_HW_LED_TX              (&pin_P0_14)
-#define MICROPY_HW_LED_RX              (&pin_P0_15)
 
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0
 #define CIRCUITPY_INTERNAL_FLASH_FILESYSTEM_SIZE (60 * 1024)

diff --git a/ports/nrf/boards/pca10100/pins.c b/ports/nrf/boards/pca10100/pins.c
@@ -45,10 +45,14 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED3), MP_ROM_PTR(&pin_P0_15) },
     { MP_ROM_QSTR(MP_QSTR_LED4), MP_ROM_PTR(&pin_P0_16) },
 
+    { MP_ROM_QSTR(MP_QSTR_BUTTON1), MP_ROM_PTR(&pin_P0_11) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON1_DEFAULT), MP_ROM_PTR(&pin_P0_11) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON1_OPTIONAL), MP_ROM_PTR(&pin_P1_07) },
+
+    { MP_ROM_QSTR(MP_QSTR_BUTTON2), MP_ROM_PTR(&pin_P0_12) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON2_DEFAULT), MP_ROM_PTR(&pin_P0_12) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON2_OPTIONAL), MP_ROM_PTR(&pin_P1_08) },
+
     { MP_ROM_QSTR(MP_QSTR_BUTTON3), MP_ROM_PTR(&pin_P0_24) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON4), MP_ROM_PTR(&pin_P0_25) },
 };