Merge pull request #44 from adafruit/main

Update from adafruit main

Author: DavePutz

.github/workflows/build.yml

@@ -314,6 +314,7 @@ jobs:
         - "simmel"
         - "snekboard"
         - "sparkfun_lumidrive"
+        - "sparkfun_nrf52840_micromod"
         - "sparkfun_nrf52840_mini"
         - "sparkfun_qwiic_micro_no_flash"
         - "sparkfun_qwiic_micro_with_flash"

extmod/vfs_fat_diskio.c

@@ -34,7 +34,7 @@ STATIC fs_user_mount_t *disk_get_device(void *bdev) {
 /*-----------------------------------------------------------------------*/
 
 DRESULT disk_read (
-    bdev_t pdrv,      /* Physical drive nmuber (0..) */
+    bdev_t pdrv,      /* Physical drive */
     BYTE *buff,        /* Data buffer to store read data */
     DWORD sector,    /* Sector address (LBA) */
     UINT count        /* Number of sectors to read (1..128) */
@@ -75,7 +75,7 @@ DRESULT disk_read (
 /*-----------------------------------------------------------------------*/
 
 DRESULT disk_write (
-    bdev_t pdrv,          /* Physical drive nmuber (0..) */
+    bdev_t pdrv,          /* Physical drive */
     const BYTE *buff,    /* Data to be written */
     DWORD sector,        /* Sector address (LBA) */
     UINT count            /* Number of sectors to write (1..128) */
@@ -122,7 +122,7 @@ DRESULT disk_write (
 /*-----------------------------------------------------------------------*/
 
 DRESULT disk_ioctl (
-    bdev_t pdrv,      /* Physical drive nmuber (0..) */
+    bdev_t pdrv,      /* Physical drive */
     BYTE cmd,         /* Control code */
     void *buff        /* Buffer to send/receive control data */
 )

lib/mp3

@@ -3695,7 +3695,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/ID.po

@@ -3643,7 +3643,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/circuitpython.pot

@@ -3646,7 +3646,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/cs.po

@@ -3732,7 +3732,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr "Außerhalb des Bereichs der Quelle"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "Außerhalb des Bereichs des Ziels"
 

locale/de_DE.po

@@ -3643,7 +3643,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/el.po

@@ -3642,7 +3642,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/en_GB.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-03-07 15:50+0000\n"
-"Last-Translator: Jose David M <[email protected]>\n"
+"PO-Revision-Date: 2021-03-12 02:03+0000\n"
+"Last-Translator: Alvaro Figueroa <[email protected]>\n"
 "Language-Team: \n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5.1\n"
+"X-Generator: Weblate 4.5.2-dev\n"
 
 #: main.c
 msgid ""
@@ -1836,7 +1836,7 @@ msgstr ""
 
 #: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
 msgid "Pins must be sequential"
-msgstr ""
+msgstr "Los pines deben estar en orden secuencial"
 
 #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
 msgid "Pins must share PWM slice"
@@ -2142,11 +2142,10 @@ msgid ""
 "enough power for the whole circuit and press reset (after ejecting "
 "CIRCUITPY).\n"
 msgstr ""
-"La alimentación del microntrolador cayó. Asegúrate que tu fuente de "
+"La alimentación del microntrolador bajó. Asegúrate que tu fuente de "
 "alimentación\n"
 "pueda aportar suficiente energía para todo el circuito y presiona reset "
-"(luego de\n"
-"expulsar CIRCUITPY)\n"
+"(luego de expulsar CIRCUITPY)\n"
 
 #: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2818,7 +2817,7 @@ msgstr "circulo solo puede ser registrado con un pariente"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "clip point must be (x,y) tuple"
-msgstr "El punto clip debe ser una tupla (x, y)"
+msgstr "El punto de recorte debe ser una tupla (x, y)"
 
 #: shared-bindings/msgpack/ExtType.c
 msgid "code outside range 0~127"
@@ -3740,7 +3739,7 @@ msgstr "ord() espera un carácter, pero encontró un string de longitud %d"
 msgid "out of range of source"
 msgstr "fuera de rango de fuente"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "fuera de rango del objetivo"
 
@@ -3842,7 +3841,7 @@ msgstr "presionando ambos botones al inicio.\n"
 
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 msgid "pull masks conflict with direction masks"
-msgstr ""
+msgstr "máscara de pull en conflicto con máscara de dirección"
 
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "pull_threshold must be between 1 and 32"

locale/es.po

@@ -3691,7 +3691,7 @@ msgstr "ord() umaasa ng character pero string ng %d haba ang nakita"
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/fil.po

@@ -3760,7 +3760,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr "dépassement des bornes de source"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "dépassement des bornes de target"
 

locale/fr.po

@@ -3643,7 +3643,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/hi.po

@@ -3707,7 +3707,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/it_IT.po

@@ -3671,7 +3671,7 @@ msgstr "ord()は1文字を要求しますが、長さ %d の文字列が与え
 msgid "out of range of source"
 msgstr "ソースが範囲外"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/ja.po

@@ -3647,7 +3647,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/ko.po

@@ -3704,7 +3704,7 @@ msgstr "ord() verwacht een teken (char) maar vond een string van lengte %d"
 msgid "out of range of source"
 msgstr "buiten bereik van bron"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "buiten bereik van doel"
 

locale/nl.po

@@ -3664,7 +3664,7 @@ msgstr "ord() oczekuje znaku, a jest łańcuch od długości %d"
 msgid "out of range of source"
 msgstr ""
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr ""
 

locale/pl.po

@@ -3749,7 +3749,7 @@ msgstr ""
 msgid "out of range of source"
 msgstr "fora do alcance da fonte"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "fora do alcance do alvo"
 

locale/pt_BR.po

@@ -3707,7 +3707,7 @@ msgstr "ord() förväntade sig ett tecken, men en sträng med längden %d hittad
 msgid "out of range of source"
 msgstr "utanför räckvidd för source"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "utanför räckvidd för target"
 

locale/sv.po

@@ -3704,7 +3704,7 @@ msgstr "ord() yùqí zìfú, dàn chángdù zìfú chuàn %d"
 msgid "out of range of source"
 msgstr "yuán fàn wéi wài"
 
-#: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
 msgid "out of range of target"
 msgstr "mù biāo fàn wéi wài"
 

locale/zh_Latn_pinyin.po

@@ -103,7 +103,7 @@ uint8_t common_hal_busio_i2c_write(busio_i2c_obj_t *self, uint16_t address, cons
     msg.flags = (stop ? 0 : I2C_M_NOSTOP);
     msg.buffer = (uint8_t *) data;
     msg.length = len;
-    return I2C_TRANSFER(self->i2c_dev, &msg, 1);
+    return -I2C_TRANSFER(self->i2c_dev, &msg, 1);
 }
 
 uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self, uint16_t address, uint8_t *data, size_t len) {
@@ -114,7 +114,7 @@ uint8_t common_hal_busio_i2c_read(busio_i2c_obj_t *self, uint16_t address, uint8
     msg.flags = I2C_M_READ;
     msg.buffer = data;
     msg.length = len;
-    return I2C_TRANSFER(self->i2c_dev, &msg, 1);
+    return -I2C_TRANSFER(self->i2c_dev, &msg, 1);
 }
 
 void common_hal_busio_i2c_never_reset(busio_i2c_obj_t *self) {

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

@@ -35,9 +35,13 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, const mcu_pin_obj_t *
     const mcu_pin_obj_t *mosi, const mcu_pin_obj_t *miso) {
     int port = -1;
 
-    if (clock->number == PIN_SPI4_SCK && mosi->number == PIN_SPI4_MOSI && miso->number == PIN_SPI4_MISO) {
+    if (clock->number == PIN_SPI4_SCK &&
+        (mosi == NULL || mosi->number == PIN_SPI4_MOSI) &&
+        (miso == NULL || miso->number == PIN_SPI4_MISO)) {
         port = 4;
-    } else if (clock->number == PIN_EMMC_CLK && mosi->number == PIN_EMMC_DATA0 && miso->number == PIN_EMMC_DATA1) {
+    } else if (clock->number == PIN_EMMC_CLK &&
+               (mosi == NULL || mosi->number == PIN_EMMC_DATA0) &&
+               (miso == NULL || miso->number == PIN_EMMC_DATA1)) {
         port = 5;
     }
 

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

@@ -53,7 +53,6 @@ void i2c_reset(void) {
         }
     }
 }
-static bool i2c_inited[I2C_NUM_MAX];
 
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
         const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t frequency, uint32_t timeout) {
@@ -90,10 +89,9 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
 #endif
 
 
-    if (xSemaphoreCreateBinaryStatic(&self->semaphore) != &self->semaphore) {
+    if (xSemaphoreCreateMutexStatic(&self->semaphore) != &self->semaphore) {
         mp_raise_RuntimeError(translate("Unable to create lock"));
     }
-    xSemaphoreGive(&self->semaphore);
     self->sda_pin = sda;
     self->scl_pin = scl;
     self->i2c_num = I2C_NUM_MAX;
@@ -106,6 +104,10 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
         mp_raise_ValueError(translate("All I2C peripherals are in use"));
     }
     i2c_status[self->i2c_num] = STATUS_IN_USE;
+
+    // Delete any previous driver.
+    i2c_driver_delete(self->i2c_num);
+
     i2c_config_t i2c_conf = {
         .mode = I2C_MODE_MASTER,
         .sda_io_num = self->sda_pin->number,
@@ -117,23 +119,16 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
             .clk_speed = frequency,
         }
     };
-    esp_err_t result = i2c_param_config(self->i2c_num, &i2c_conf);
-    if (result != ESP_OK) {
-        mp_raise_ValueError(translate("Invalid pins"));
+    if (i2c_param_config(self->i2c_num, &i2c_conf) != ESP_OK) {
+        mp_raise_ValueError(translate("Invalid frequency"));
     }
 
-
-    if (!i2c_inited[self->i2c_num]) {
-        result = i2c_driver_install(self->i2c_num,
-                                    I2C_MODE_MASTER,
-                                    0,
-                                    0,
-                                    0);
-        if (result != ESP_OK) {
-            mp_raise_OSError(MP_EIO);
-        }
-        i2c_inited[self->i2c_num] = true;
-
+    if (i2c_driver_install(self->i2c_num,
+                           I2C_MODE_MASTER,
+                           0,
+                           0,
+                           0) != ESP_OK) {
+        mp_raise_OSError(MP_EIO);
     }
 
     claim_pin(sda);
@@ -149,12 +144,14 @@ void common_hal_busio_i2c_deinit(busio_i2c_obj_t *self) {
         return;
     }
 
-    i2c_status[self->i2c_num] = STATUS_FREE;
+    i2c_driver_delete(self->i2c_num);
 
     common_hal_reset_pin(self->sda_pin);
     common_hal_reset_pin(self->scl_pin);
     self->sda_pin = NULL;
     self->scl_pin = NULL;
+
+    i2c_status[self->i2c_num] = STATUS_FREE;
 }
 
 bool common_hal_busio_i2c_probe(busio_i2c_obj_t *self, uint8_t addr) {

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

@@ -109,6 +109,7 @@ void common_hal_wifi_init(void) {
 
     wifi_radio_obj_t* self = &common_hal_wifi_radio_obj;
     self->netif = esp_netif_create_default_wifi_sta();
+    self->started = false;
 
     // Even though we just called esp_netif_create_default_wifi_sta,
     //   station mode isn't actually ready for use until esp_wifi_set_mode()