Merge pull request #1158 from dhalbert/nrf-pin-claiming

nrf: rework of pin files; add new boards; add pin claiming

Author: tannewt

conf.py

@@ -115,9 +115,9 @@
                     "ports/minimal",
                     "ports/nrf/device",
                     "ports/nrf/drivers",
-                    "ports/nrf/hal",
                     "ports/nrf/modules",
                     "ports/nrf/nrfx",
+                    "ports/nrf/peripherals",
                     "ports/nrf/usb",
                     "ports/pic16bit",
                     "ports/qemu-arm",

main.c

@@ -451,7 +451,7 @@ void NORETURN __fatal_error(const char *msg) {
 
 #ifndef NDEBUG
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
-    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    mp_printf(&mp_plat_print, "Assertion '%s' failed, at file %s:%d\n", expr, file, line);
     __fatal_error("Assertion failed");
 }
 #endif

ports/atmel-samd/boards/circuitplayground_express/board.c

@@ -48,8 +48,8 @@ bool board_requests_safe_mode(void) {
     gpio_set_pin_pull_mode(PIN_PA28, GPIO_PULL_DOWN);
     bool safe_mode = gpio_get_pin_level(PIN_PA14) &&
         gpio_get_pin_level(PIN_PA28);
-    reset_pin(PIN_PA14);
-    reset_pin(PIN_PA28);
+    reset_pin_number(PIN_PA14);
+    reset_pin_number(PIN_PA28);
     return safe_mode;
 }
 

ports/atmel-samd/boards/circuitplayground_express_crickit/board.c

@@ -48,8 +48,8 @@ bool board_requests_safe_mode(void) {
     gpio_set_pin_pull_mode(PIN_PA28, GPIO_PULL_DOWN);
     bool safe_mode = gpio_get_pin_level(PIN_PA14) &&
         gpio_get_pin_level(PIN_PA28);
-    reset_pin(PIN_PA14);
-    reset_pin(PIN_PA28);
+    reset_pin_number(PIN_PA14);
+    reset_pin_number(PIN_PA28);
     return safe_mode;
 }
 

ports/atmel-samd/boards/gemma_m0/pins.c

@@ -21,6 +21,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_PA00) },
     { MP_ROM_QSTR(MP_QSTR_APA102_SCK),  MP_ROM_PTR(&pin_PA01) },
+
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },

ports/atmel-samd/common-hal/analogio/AnalogIn.c

@@ -80,7 +80,7 @@ void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
     if (common_hal_analogio_analogin_deinited(self)) {
         return;
     }
-    reset_pin(self->pin->number);
+    reset_pin_number(self->pin->number);
     self->pin = mp_const_none;
 }
 

ports/atmel-samd/common-hal/analogio/AnalogOut.c

@@ -113,7 +113,7 @@ void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
         return;
     }
     dac_sync_disable_channel(&self->descriptor, self->channel);
-    reset_pin(PIN_PA02);
+    reset_pin_number(PIN_PA02);
     // Only deinit the DAC on the SAMD51 if both outputs are free.
     #ifdef SAMD51
     if (common_hal_mcu_pin_is_free(&pin_PA02) && common_hal_mcu_pin_is_free(&pin_PA05)) {

ports/atmel-samd/common-hal/audiobusio/I2SOut.c

@@ -212,11 +212,11 @@ void common_hal_audiobusio_i2sout_deinit(audiobusio_i2sout_obj_t* self) {
         return;
     }
 
-    reset_pin(self->bit_clock->number);
+    reset_pin_number(self->bit_clock->number);
     self->bit_clock = mp_const_none;
-    reset_pin(self->word_select->number);
+    reset_pin_number(self->word_select->number);
     self->word_select = mp_const_none;
-    reset_pin(self->data->number);
+    reset_pin_number(self->data->number);
     self->data = mp_const_none;
 }
 

ports/atmel-samd/common-hal/audiobusio/PDMIn.c

@@ -235,8 +235,8 @@ void common_hal_audiobusio_pdmin_deinit(audiobusio_pdmin_obj_t* self) {
     disconnect_gclk_from_peripheral(self->gclk, I2S_GCLK_ID_0 + self->clock_unit);
     disable_clock_generator(self->gclk);
 
-    reset_pin(self->clock_pin->number);
-    reset_pin(self->data_pin->number);
+    reset_pin_number(self->clock_pin->number);
+    reset_pin_number(self->data_pin->number);
     self->clock_pin = mp_const_none;
     self->data_pin = mp_const_none;
 }

ports/atmel-samd/common-hal/audioio/AudioOut.c

@@ -248,10 +248,10 @@ void common_hal_audioio_audioout_deinit(audioio_audioout_obj_t* self) {
 
     tc_set_enable(tc_insts[self->tc_index], false);
 
-    reset_pin(self->left_channel->number);
+    reset_pin_number(self->left_channel->number);
     self->left_channel = mp_const_none;
     #ifdef SAMD51
-    reset_pin(self->right_channel->number);
+    reset_pin_number(self->right_channel->number);
     self->right_channel = mp_const_none;
     #endif
 }