Merge branch 'master' into nrf52_uart_io

locale/circuitpython.pot

@@ -768,27 +768,27 @@ msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:470
 #: ports/nrf/drivers/bluetooth/ble_drv.c:520
-msgid "Can encode UUID into the advertisment packet."
+msgid "Can encode UUID into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:545
-msgid "Can not fit data into the advertisment packet."
+msgid "Can not fit data into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:558
 #: ports/nrf/drivers/bluetooth/ble_drv.c:604
 #, c-format
-msgid "Can not apply advertisment data. status: 0x%02x"
+msgid "Can not apply advertisement data. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:614
 #, c-format
-msgid "Can not start advertisment. status: 0x%02x"
+msgid "Can not start advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:631
 #, c-format
-msgid "Can not stop advertisment. status: 0x%02x"
+msgid "Can not stop advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:650

locale/de_DE.po

@@ -781,27 +781,27 @@ msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:470
 #: ports/nrf/drivers/bluetooth/ble_drv.c:520
-msgid "Can encode UUID into the advertisment packet."
+msgid "Can encode UUID into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:545
-msgid "Can not fit data into the advertisment packet."
+msgid "Can not fit data into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:558
 #: ports/nrf/drivers/bluetooth/ble_drv.c:604
 #, c-format
-msgid "Can not apply advertisment data. status: 0x%02x"
+msgid "Can not apply advertisement data. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:614
 #, c-format
-msgid "Can not start advertisment. status: 0x%02x"
+msgid "Can not start advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:631
 #, c-format
-msgid "Can not stop advertisment. status: 0x%02x"
+msgid "Can not stop advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:650

locale/en_US.po

@@ -768,27 +768,27 @@ msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:470
 #: ports/nrf/drivers/bluetooth/ble_drv.c:520
-msgid "Can encode UUID into the advertisment packet."
+msgid "Can encode UUID into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:545
-msgid "Can not fit data into the advertisment packet."
+msgid "Can not fit data into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:558
 #: ports/nrf/drivers/bluetooth/ble_drv.c:604
 #, c-format
-msgid "Can not apply advertisment data. status: 0x%02x"
+msgid "Can not apply advertisement data. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:614
 #, c-format
-msgid "Can not start advertisment. status: 0x%02x"
+msgid "Can not start advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:631
 #, c-format
-msgid "Can not stop advertisment. status: 0x%02x"
+msgid "Can not stop advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:650

locale/es.po

@@ -343,11 +343,11 @@ msgstr "pin inválido"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c:84
 msgid "Invalid pin for left channel"
-msgstr ""
+msgstr "Pin inválido para canal izquierdo"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c:88
 msgid "Invalid pin for right channel"
-msgstr ""
+msgstr "Pin inválido para canal derecho"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c:91
 msgid "Cannot output both channels on the same pin"
@@ -366,7 +366,7 @@ msgstr "Todos los canales de eventos están siendo utilizados"
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c:297
 #, c-format
 msgid "Sample rate too high. It must be less than %d"
-msgstr ""
+msgstr "Frecuencia de muestreo demasiado alta. Debe ser menor que %d"
 
 #: ports/atmel-samd/common-hal/busio/I2C.c:71
 msgid "Not enough pins available"
@@ -382,11 +382,11 @@ msgstr "pines inválidos"
 
 #: ports/atmel-samd/common-hal/busio/I2C.c:101
 msgid "SDA or SCL needs a pull up"
-msgstr ""
+msgstr "SDA o SCL necesitan una pull up"
 
 #: ports/atmel-samd/common-hal/busio/I2C.c:121
 msgid "Unsupported baudrate"
-msgstr ""
+msgstr "Baudrate sin soporte"
 
 #: ports/atmel-samd/common-hal/busio/UART.c:66
 msgid "bytes > 8 bits not supported"
@@ -404,33 +404,33 @@ msgstr "Fallo la asignación del buffer RX"
 
 #: ports/atmel-samd/common-hal/busio/UART.c:153
 msgid "Could not initialize UART"
-msgstr ""
+msgstr "No se pudo inicializar la UART"
 
 #: ports/atmel-samd/common-hal/busio/UART.c:240
 #: ports/nrf/common-hal/busio/UART.c:149
 msgid "No RX pin"
-msgstr ""
+msgstr "Sin pin RX"
 
 #: ports/atmel-samd/common-hal/busio/UART.c:294
 #: ports/nrf/common-hal/busio/UART.c:195
 msgid "No TX pin"
-msgstr ""
+msgstr "Sin pin TX"
 
 #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c:170
 #: ports/nrf/common-hal/digitalio/DigitalInOut.c:142
 msgid "Cannot get pull while in output mode"
-msgstr ""
+msgstr "No se puede obtener pull mientras en modo de salida"
 
 #: ports/atmel-samd/common-hal/microcontroller/__init__.c:74
 #: ports/esp8266/common-hal/microcontroller/__init__.c:64
 msgid "Cannot reset into bootloader because no bootloader is present."
-msgstr ""
+msgstr "No se puede reiniciar en bootloader porque no hay bootloader presente."
 
 #: ports/atmel-samd/common-hal/pulseio/PWMOut.c:120
 #: ports/atmel-samd/common-hal/pulseio/PWMOut.c:369
 #: ports/nrf/common-hal/pulseio/PWMOut.c:227
 msgid "Invalid PWM frequency"
-msgstr ""
+msgstr "Frecuencia PWM inválida"
 
 #: ports/atmel-samd/common-hal/pulseio/PWMOut.c:187
 msgid "All timers for this pin are in use"
@@ -438,7 +438,7 @@ msgstr "Todos los timers para este pin están siendo utilizados"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c:110
 msgid "No hardware support on pin"
-msgstr ""
+msgstr "pin no tiene soporte en hardware"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c:113
 msgid "EXTINT channel already in use"
@@ -453,16 +453,16 @@ msgstr "Fallo la asignación del buffer RX de %d bytes"
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c:205
 #: ports/esp8266/common-hal/pulseio/PulseIn.c:151
 msgid "pop from an empty PulseIn"
-msgstr ""
+msgstr "pop en un PulseIn vacío"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseIn.c:237
 #: ports/esp8266/common-hal/pulseio/PulseIn.c:182 py/obj.c:420
 msgid "index out of range"
-msgstr ""
+msgstr "index fuera de rango"
 
 #: ports/atmel-samd/common-hal/pulseio/PulseOut.c:178
 msgid "Another send is already active"
-msgstr ""
+msgstr "Otro envío ya está activo"
 
 #: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c:38
 msgid "Both pins must support hardware interrupts"
@@ -478,11 +478,11 @@ msgstr "Valor de calibración fuera de rango +/-127"
 
 #: ports/atmel-samd/common-hal/storage/__init__.c:48
 msgid "Cannot remount '/' when USB is active."
-msgstr ""
+msgstr "No se puede volver a montar '/' cuando el USB esta activo."
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c:75
 msgid "No free GCLKs"
-msgstr ""
+msgstr "Sin GCLKs libres"
 
 #: ports/atmel-samd/common-hal/usb_hid/Device.c:78
 #: ports/nrf/common-hal/usb_hid/Device.c:45
@@ -493,48 +493,48 @@ msgstr "Tamaño de buffer incorrecto. Debe ser de %d bytes."
 #: ports/atmel-samd/common-hal/usb_hid/Device.c:82
 #: ports/nrf/common-hal/usb_hid/Device.c:53
 msgid "USB Busy"
-msgstr ""
+msgstr "USB ocupado"
 
 #: ports/atmel-samd/common-hal/usb_hid/Device.c:82
 #: ports/nrf/common-hal/usb_hid/Device.c:59
 msgid "USB Error"
-msgstr ""
+msgstr "Error USB"
 
 #: ports/esp8266/common-hal/analogio/AnalogIn.c:43
 msgid "Pin %q does not have ADC capabilities"
-msgstr ""
+msgstr "Pin %q no tiene capacidades ADC"
 
 #: ports/esp8266/common-hal/analogio/AnalogOut.c:39
 msgid "No hardware support for analog out."
-msgstr ""
+msgstr "Sin soporte de hardware para salida análoga"
 
 #: ports/esp8266/common-hal/busio/SPI.c:72
 msgid "Pins not valid for SPI"
-msgstr ""
+msgstr "Pines no válidos para SPI"
 
 #: ports/esp8266/common-hal/busio/UART.c:45
 msgid "Only tx supported on UART1 (GPIO2)."
-msgstr ""
+msgstr "Solo tx soportada en UART1 (GPIO2)"
 
 #: ports/esp8266/common-hal/busio/UART.c:67 ports/esp8266/machine_uart.c:108
 msgid "invalid data bits"
-msgstr ""
+msgstr "data bits inválidos"
 
 #: ports/esp8266/common-hal/busio/UART.c:91 ports/esp8266/machine_uart.c:144
 msgid "invalid stop bits"
-msgstr ""
+msgstr "stop bits inválidos"
 
 #: ports/esp8266/common-hal/digitalio/DigitalInOut.c:200
 msgid "ESP8266 does not support pull down."
-msgstr ""
+msgstr "ESP8266 no tiene soporte para pull down"
 
 #: ports/esp8266/common-hal/digitalio/DigitalInOut.c:210
 msgid "GPIO16 does not support pull up."
-msgstr "GPIO16 no soporta pull up."
+msgstr "GPIO16 no tiene soporte para pull up."
 
 #: ports/esp8266/common-hal/microcontroller/__init__.c:66
 msgid "ESP8226 does not support safe mode."
-msgstr "ESP8226 no soporta modo seguro"
+msgstr "ESP8226 no tiene soporte para modo seguro"
 
 #: ports/esp8266/common-hal/pulseio/PWMOut.c:54
 #: ports/esp8266/common-hal/pulseio/PWMOut.c:113
@@ -568,143 +568,143 @@ msgstr "No se pudo montar de nuevo el sistema de archivos"
 
 #: ports/esp8266/common-hal/storage/__init__.c:38
 msgid "Use esptool to erase flash and re-upload Python instead"
-msgstr ""
+msgstr "Usa esptool para borrar la flash y vuelve a cargar Python en su lugar"
 
 #: ports/esp8266/esp_mphal.c:154
 msgid "C-level assert"
-msgstr ""
+msgstr "C-level assert"
 
 #: ports/esp8266/machine_adc.c:57
 #, c-format
 msgid "not a valid ADC Channel: %d"
-msgstr ""
+msgstr "no es un canal ADC válido: %d"
 
 #: ports/esp8266/machine_hspi.c:131 ports/esp8266/machine_hspi.c:137
 msgid "impossible baudrate"
-msgstr ""
+msgstr "baudrate imposible"
 
 #: ports/esp8266/machine_pin.c:129
 msgid "expecting a pin"
-msgstr ""
+msgstr "esperando un pin"
 
 #: ports/esp8266/machine_pin.c:284
 msgid "Pin(16) doesn't support pull"
-msgstr ""
+msgstr "Pin(16) no tiene soporte para pull"
 
 #: ports/esp8266/machine_pin.c:323
 msgid "invalid pin"
-msgstr ""
+msgstr "pin inválido"
 
 #: ports/esp8266/machine_pin.c:389
 msgid "pin does not have IRQ capabilities"
-msgstr ""
+msgstr "pin no tiene capacidades IRQ"
 
 #: ports/esp8266/machine_rtc.c:185
 msgid "buffer too long"
-msgstr ""
+msgstr "buffer demasiado largo"
 
 #: ports/esp8266/machine_rtc.c:209 ports/esp8266/machine_rtc.c:223
 #: ports/esp8266/machine_rtc.c:246
 msgid "invalid alarm"
-msgstr ""
+msgstr "alarma inválida"
 
 #: ports/esp8266/machine_uart.c:169
 #, c-format
 msgid "UART(%d) does not exist"
-msgstr ""
+msgstr "UART(%d) no existe"
 
 #: ports/esp8266/machine_uart.c:219
 msgid "UART(1) can't read"
-msgstr ""
+msgstr "UART(1) no puede leer"
 
 #: ports/esp8266/modesp.c:119
 msgid "len must be multiple of 4"
-msgstr ""
+msgstr "len debe de ser múltiple de 4"
 
 #: ports/esp8266/modesp.c:274
 #, c-format
 msgid "memory allocation failed, allocating %u bytes for native code"
-msgstr ""
+msgstr "la asignación de memoria ha fallado, asignando %u bytes para código nativo"
 
 #: ports/esp8266/modesp.c:317
 msgid "flash location must be below 1MByte"
-msgstr ""
+msgstr "la ubicación de la flash debe estar debajo de 1MByte"
 
 #: ports/esp8266/modmachine.c:63
 msgid "frequency can only be either 80Mhz or 160MHz"
-msgstr ""
+msgstr "la frecuencia solo puede ser 80MHz o 160MHz"
 
 #: ports/esp8266/modnetwork.c:61
 msgid "AP required"
-msgstr ""
+msgstr "AP necesario"
 
 #: ports/esp8266/modnetwork.c:61
 msgid "STA required"
-msgstr ""
+msgstr "STA necesario"
 
 #: ports/esp8266/modnetwork.c:87
 msgid "Cannot update i/f status"
-msgstr ""
+msgstr "No se puede actualizar i/f status"
 
 #: ports/esp8266/modnetwork.c:142
 msgid "Cannot set STA config"
-msgstr ""
+msgstr "No se puede establecer STA config"
 
 #: ports/esp8266/modnetwork.c:144
 msgid "Cannot connect to AP"
-msgstr ""
+msgstr "No se puede conectar a AP"
 
 #: ports/esp8266/modnetwork.c:152
 msgid "Cannot disconnect from AP"
-msgstr ""
+msgstr "No se puede desconectar de AP"
 
 #: ports/esp8266/modnetwork.c:173
 msgid "unknown status param"
-msgstr ""
+msgstr "status param desconocido"
 
 #: ports/esp8266/modnetwork.c:222
 msgid "STA must be active"
-msgstr ""
+msgstr "STA debe estar activo"
 
 #: ports/esp8266/modnetwork.c:239
 msgid "scan failed"
-msgstr ""
+msgstr "scan ha fallado"
 
 #: ports/esp8266/modnetwork.c:306
 msgid "wifi_set_ip_info() failed"
-msgstr ""
+msgstr "wifi_set_ip_info() ha fallado"
 
 #: ports/esp8266/modnetwork.c:319
 msgid "either pos or kw args are allowed"
-msgstr ""
+msgstr "ya sea pos o kw args son permitidos"
 
 #: ports/esp8266/modnetwork.c:329
 msgid "can't get STA config"
-msgstr ""
+msgstr "no se puede obtener STA config"
 
 #: ports/esp8266/modnetwork.c:331
 msgid "can't get AP config"
-msgstr ""
+msgstr "no se puede obtener AP config"
 
 #: ports/esp8266/modnetwork.c:346
 msgid "invalid buffer length"
-msgstr ""
+msgstr "longitud de buffer inválida"
 
 #: ports/esp8266/modnetwork.c:405
 msgid "can't set STA config"
-msgstr ""
+msgstr "no se puede establecer STA config"
 
 #: ports/esp8266/modnetwork.c:407
 msgid "can't set AP config"
-msgstr ""
+msgstr "no se puede establecer AP config"
 
 #: ports/esp8266/modnetwork.c:416
 msgid "can query only one param"
-msgstr ""
+msgstr "puede consultar solo un param"
 
 #: ports/esp8266/modnetwork.c:469
 msgid "unknown config param"
-msgstr ""
+msgstr "parámetro config desconocido"
 
 #: ports/nrf/common-hal/analogio/AnalogOut.c:37
 msgid "AnalogOut functionality not supported"
@@ -786,27 +786,27 @@ msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:470
 #: ports/nrf/drivers/bluetooth/ble_drv.c:520
-msgid "Can encode UUID into the advertisment packet."
+msgid "Can encode UUID into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:545
-msgid "Can not fit data into the advertisment packet."
+msgid "Can not fit data into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:558
 #: ports/nrf/drivers/bluetooth/ble_drv.c:604
 #, c-format
-msgid "Can not apply advertisment data. status: 0x%02x"
+msgid "Can not apply advertisement data. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:614
 #, c-format
-msgid "Can not start advertisment. status: 0x%02x"
+msgid "Can not start advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:631
 #, c-format
-msgid "Can not stop advertisment. status: 0x%02x"
+msgid "Can not stop advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:650

locale/fil.po

@@ -788,28 +788,28 @@ msgstr "Hindi ma-encode UUID, para suriin ang haba."
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:470
 #: ports/nrf/drivers/bluetooth/ble_drv.c:520
-msgid "Can encode UUID into the advertisment packet."
+msgid "Can encode UUID into the advertisement packet."
 msgstr "Maaring i-encode ang UUID sa advertisement packet."
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:545
-msgid "Can not fit data into the advertisment packet."
+msgid "Can not fit data into the advertisement packet."
 msgstr "Hindi makasya ang data sa loob ng advertisement packet."
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:558
 #: ports/nrf/drivers/bluetooth/ble_drv.c:604
 #, c-format
-msgid "Can not apply advertisment data. status: 0x%02x"
+msgid "Can not apply advertisement data. status: 0x%02x"
-msgstr "Hindi ma i-apply ang advertisment data. status: 0x%02x"
+msgstr "Hindi ma i-apply ang advertisement data. status: 0x%02x"
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:614
 #, c-format
-msgid "Can not start advertisment. status: 0x%02x"
+msgid "Can not start advertisement. status: 0x%02x"
 msgstr "Hindi masimulaan ang advertisement. status 0x%02x"
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:631
 #, c-format
-msgid "Can not stop advertisment. status: 0x%02x"
+msgid "Can not stop advertisement. status: 0x%02x"
-msgstr "Hindi mahinto ang advertisment. status: 0x%02x"
+msgstr "Hindi mahinto ang advertisement. status: 0x%02x"
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:650
 #: ports/nrf/drivers/bluetooth/ble_drv.c:726

locale/fr.po

@@ -784,27 +784,27 @@ msgstr "Impossible d'encoder l'UUID pour vérifier la longueur."
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:470
 #: ports/nrf/drivers/bluetooth/ble_drv.c:520
-msgid "Can encode UUID into the advertisment packet."
+msgid "Can encode UUID into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:545
-msgid "Can not fit data into the advertisment packet."
+msgid "Can not fit data into the advertisement packet."
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:558
 #: ports/nrf/drivers/bluetooth/ble_drv.c:604
 #, c-format
-msgid "Can not apply advertisment data. status: 0x%02x"
+msgid "Can not apply advertisement data. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:614
 #, c-format
-msgid "Can not start advertisment. status: 0x%02x"
+msgid "Can not start advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:631
 #, c-format
-msgid "Can not stop advertisment. status: 0x%02x"
+msgid "Can not stop advertisement. status: 0x%02x"
 msgstr ""
 
 #: ports/nrf/drivers/bluetooth/ble_drv.c:650

ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.h

@@ -3,7 +3,7 @@
 
 #define CIRCUITPY_MCU_FAMILY samd51
 
-// This is for Rev A
+// This is for a purple prototype which is Rev C
 #define MICROPY_HW_APA102_MOSI   (&pin_PA01)
 #define MICROPY_HW_APA102_SCK    (&pin_PA00)
 
@@ -28,7 +28,7 @@
 #include "external_flash/devices.h"
 
 #define EXTERNAL_FLASH_DEVICE_COUNT 1
-#define EXTERNAL_FLASH_DEVICES GD25Q64C
+#define EXTERNAL_FLASH_DEVICES W25Q128JV_SQ
 
 #include "external_flash/external_flash.h"
 

ports/atmel-samd/external_flash/devices.h

@@ -266,5 +266,23 @@ typedef struct {
 }
 
 
+// Settings for the Winbond W25Q128JV-SQ 8MiB SPI flash. Note that JV-IM has a different .memory_type (0x70)
+// Datasheet: https://www.winbond.com/resource-files/w25q128jv%20revf%2003272018%20plus.pdf
+#define W25Q128JV_SQ {\
+    .total_size = (1 << 23), /* 16 MiB */ \
+    .start_up_time_us = 5000, \
+    .manufacturer_id = 0xef, \
+    .memory_type = 0x40, \
+    .capacity = 0x18, \
+    .max_clock_speed_mhz = 133, \
+    .has_sector_protection = false, \
+    .supports_fast_read = true, \
+    .supports_qspi = true, \
+    .has_quad_enable = true, \
+    .supports_qspi_writes = true, \
+    .write_status_register_split = false, \
+}
+
+
 
 #endif  // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H

ports/nrf/common-hal/busio/I2C.c

@@ -54,7 +54,11 @@ STATIC twim_peripheral_t twim_peripherals[] = {
 #endif
 };
 
-#define INST_NO 0
+void i2c_reset(void) {
+    for (size_t i = 0 ; i < MP_ARRAY_SIZE(twim_peripherals); i++) {
+        twim_peripherals[i].in_use = false;
+    }
+}
 
 static uint8_t twi_error_to_mp(const nrfx_err_t err) {
     switch (err) {

ports/nrf/common-hal/busio/I2C.h

@@ -45,4 +45,6 @@ typedef struct {
     uint8_t sda_pin_number;
 } busio_i2c_obj_t;
 
+void i2c_reset(void);
+
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_I2C_H

ports/nrf/common-hal/busio/SPI.c

@@ -59,6 +59,12 @@ STATIC spim_peripheral_t spim_peripherals[] = {
 #endif
 };
 
+void spi_reset(void) {
+    for (size_t i = 0 ; i < MP_ARRAY_SIZE(spim_peripherals); i++) {
+        nrfx_spim_uninit(&spim_peripherals[i].spim);
+    }
+}
+
 // Convert frequency to clock-speed-dependent value
 static nrf_spim_frequency_t baudrate_to_spim_frequency(const uint32_t baudrate) {
     if (baudrate <= 125000) {

ports/nrf/common-hal/busio/SPI.h

@@ -45,4 +45,6 @@ typedef struct {
     uint8_t MISO_pin_number;
 } busio_spi_obj_t;
 
+void spi_reset(void);
+
 #endif // MICROPY_INCLUDED_NRF_COMMON_HAL_BUSIO_SPI_H

ports/nrf/drivers/bluetooth/ble_drv.c

@@ -467,7 +467,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
                 // do encoding into the adv buffer
                 if (sd_ble_uuid_encode(&uuid, &encoded_size, &adv_data[byte_pos]) != 0) {
                     nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                              translate("Can encode UUID into the advertisment packet.")));
+                              translate("Can encode UUID into the advertisement packet.")));
                 }
 
                 BLE_DRIVER_LOG("encoded uuid for service %u: ", 0);
@@ -517,7 +517,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
                 // do encoding into the adv buffer
                 if (sd_ble_uuid_encode(&uuid, &encoded_size, &adv_data[byte_pos]) != 0) {
                     nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                              translate("Can encode UUID into the advertisment packet.")));
+                              translate("Can encode UUID into the advertisement packet.")));
                 }
 
                 BLE_DRIVER_LOG("encoded uuid for service %u: ", 0);
@@ -542,7 +542,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
     if ((p_adv_params->data_len > 0) && (p_adv_params->p_data != NULL)) {
         if (p_adv_params->data_len + byte_pos > BLE_GAP_ADV_MAX_SIZE) {
             nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                      translate("Can not fit data into the advertisment packet.")));
+                      translate("Can not fit data into the advertisement packet.")));
         }
 
         memcpy(adv_data, p_adv_params->p_data, p_adv_params->data_len);
@@ -555,7 +555,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
     if ((err_code = sd_ble_gap_adv_data_set(adv_data, byte_pos, NULL, 0)) != 0) {
 
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                  translate("Can not apply advertisment data. status: 0x%02x"), (uint16_t)err_code));
+                  translate("Can not apply advertisement data. status: 0x%02x"), (uint16_t)err_code));
     }
     BLE_DRIVER_LOG("Set Adv data size: " UINT_FMT "\n", byte_pos);
 #endif
@@ -586,7 +586,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
     m_adv_params.primary_phy           = BLE_GAP_PHY_1MBPS;
 #else
     m_adv_params.fp          = BLE_GAP_ADV_FP_ANY;
-    m_adv_params.timeout     = 0;                                   // infinite advertisment
+    m_adv_params.timeout     = 0;                                   // infinite advertisement
 #endif
 
     ble_drv_advertise_stop();
@@ -601,7 +601,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
 
     if ((err_code = sd_ble_gap_adv_set_configure(&m_adv_handle, &ble_gap_adv_data, &m_adv_params)) != 0) {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                  translate("Can not apply advertisment data. status: 0x%02x"), (uint16_t)err_code));
+                  translate("Can not apply advertisement data. status: 0x%02x"), (uint16_t)err_code));
     }
     err_code = sd_ble_gap_adv_start(m_adv_handle, BLE_CONN_CFG_TAG_DEFAULT);
 #elif (BLUETOOTH_SD == 132 && BLE_API_VERSION == 4)
@@ -611,7 +611,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
 #endif
     if (err_code != 0) {
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                  translate("Can not start advertisment. status: 0x%02x"), (uint16_t)err_code));
+                  translate("Can not start advertisement. status: 0x%02x"), (uint16_t)err_code));
     }
 
     m_adv_in_progress = true;
@@ -628,7 +628,7 @@ void ble_drv_advertise_stop(void) {
         if ((err_code = sd_ble_gap_adv_stop()) != 0) {
 #endif
             nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
-                      translate("Can not stop advertisment. status: 0x%02x"), (uint16_t)err_code));
+                      translate("Can not stop advertisement. status: 0x%02x"), (uint16_t)err_code));
         }
     }
     m_adv_in_progress = false;

ports/nrf/examples/ubluepy_eddystone.py

@@ -44,7 +44,7 @@ def generate_eddystone_adv_packet(url):
     service_data = uuid + eddystone_data
     packet_service_data = gen_ad_type_content(constants.ad_types.AD_TYPE_SERVICE_DATA, service_data)
 
-    # generate advertisment packet
+    # generate advertisement packet
     packet = bytearray([])
     packet.extend(packet_flags)
     packet.extend(packet_uuid16)

ports/nrf/examples/ubluepy_temp.py

@@ -41,7 +41,7 @@ def event_handler(id, handle, data):
         rtc.stop()
         # indicate 'disconnected'
         LED(1).off()
-        # restart advertisment
+        # restart advertisement
         periph.advertise(device_name="micr_temp", services=[serv_env_sense])
 
     elif id == constants.EVT_GATTS_WRITE:

ports/nrf/modules/ubluepy/ubluepy_peripheral.c

@@ -166,7 +166,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_set_conn_handler_obj, periph
 #if MICROPY_PY_UBLUEPY_PERIPHERAL
 
 /// \method advertise(device_name, [service=[service1, service2, ...]], [data=bytearray], [connectable=True])
-/// Start advertising. Connectable advertisment type by default.
+/// Start advertising. Connectable advertisement type by default.
 ///
 STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
@@ -236,7 +236,7 @@ STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args,
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_peripheral_advertise_obj, 0, peripheral_advertise);
 
 /// \method advertise_stop()
-/// Stop advertisment if any onging advertisment.
+/// Stop advertisement if any onging advertisement.
 ///
 STATIC mp_obj_t peripheral_advertise_stop(mp_obj_t self_in) {
     ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);

ports/nrf/supervisor/port.c

@@ -34,6 +34,8 @@
 
 #include "shared-module/gamepad/__init__.h"
 #include "common-hal/microcontroller/Pin.h"
+#include "common-hal/busio/I2C.h"
+#include "common-hal/busio/SPI.h"
 #include "common-hal/pulseio/PWMOut.h"
 #include "tick.h"
 
@@ -72,11 +74,14 @@ safe_mode_t port_init(void) {
 }
 
 void reset_port(void) {
- #ifdef CIRCUITPY_GAMEPAD_TICKS
+#ifdef CIRCUITPY_GAMEPAD_TICKS
     gamepad_reset();
- #endif
+#endif
 
+    i2c_reset();
+    spi_reset();
     pwmout_reset();
+
     reset_all_pins();
 }