diff options
| author | Gaetan <gaetan.noel@viacesi.fr> | 2020-10-28 00:38:07 +0100 |
|---|---|---|
| committer | Gaetan <gaetan.noel@viacesi.fr> | 2020-10-28 00:38:07 +0100 |
| commit | 9b911b2211715e9da7ae55b691f54fe2f33a4486 (patch) | |
| tree | e20b5c8a2b7c9cd6ce43ce27ba77f9b2703c4aa0 | |
| parent | 27827a4fef74dc66996ecb670f01ad5d58500899 (diff) | |
modifié : pins.c
| -rw-r--r-- | ports/nrf/boards/holyiot_nrf52840/pins.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ports/nrf/boards/holyiot_nrf52840/pins.c b/ports/nrf/boards/holyiot_nrf52840/pins.c index 604744e0e..8e0667591 100644 --- a/ports/nrf/boards/holyiot_nrf52840/pins.c +++ b/ports/nrf/boards/holyiot_nrf52840/pins.c @@ -50,8 +50,12 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_P0_21), MP_ROM_PTR(&pin_P0_21) }, { MP_ROM_QSTR(MP_QSTR_P0_19), MP_ROM_PTR(&pin_P0_19) }, - // RESET { MP_ROM_QSTR(MP_QSTR_P0_18), MP_ROM_PTR(&pin_P0_18) }, + // RESET { MP_ROM_QSTR(MP_QSTR_P0_18), MP_ROM_PTR(&pin_P0_18) } }; +<<<<<<< HEAD +======= + +>>>>>>> d0426b3438a934257c5351f7eb2d9cdd79881c03 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); |