Merge remote-tracking branch 'adafruit/main' into translate_header

Author: tannewt

conf.py

@@ -33,6 +33,25 @@
 
 tools_describe = str(pathlib.Path(__file__).parent / "tools/describe")
 
+# Monkeypatch autoapi
+def _format_args(args_info, include_annotations=True, ignore_self=None):
+    result = []
+
+    for i, (prefix, name, annotation, default) in enumerate(args_info):
+        if i == 0 and ignore_self is not None and name == ignore_self:
+            continue
+        formatted = "{}{}{}{}".format(
+            prefix or "",
+            name or "",
+            ": {}".format(annotation) if annotation and include_annotations else "",
+            (" = {}" if annotation else "={}").format(default) if default else "",
+        )
+        result.append(formatted)
+    return ", ".join(result)
+
+import autoapi.mappers.python.objects as objects
+objects._format_args = _format_args
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

frozen/Adafruit_CircuitPython_CircuitPlayground

@@ -19,7 +19,7 @@ CIRCUITPY_COUNTIO = 1
 CIRCUITPY_BUSDEVICE = 1
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk

@@ -18,7 +18,7 @@ CIRCUITPY_KEYPAD = 0
 CIRCUITPY_ONEWIREIO = 0
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

@@ -24,7 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_PARALLELDISPLAY = 0
 
 # Include these Python libraries in firmware.
-FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor

ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

@@ -398,6 +398,35 @@ mp_obj_t common_hal_wifi_radio_get_ipv4_dns(wifi_radio_obj_t *self) {
     return common_hal_ipaddress_new_ipv4address(self->dns_info.ip.u_addr.ip4.addr);
 }
 
+void common_hal_wifi_radio_set_ipv4_dns(wifi_radio_obj_t *self, mp_obj_t ipv4_dns_addr) {
+    esp_netif_dns_info_t dns_addr;
+    ipaddress_ipaddress_to_esp_idf_ip4(ipv4_dns_addr, &dns_addr.ip.u_addr.ip4);
+    esp_netif_set_dns_info(self->netif, ESP_NETIF_DNS_MAIN, &dns_addr);
+}
+
+void common_hal_wifi_radio_start_dhcp_client(wifi_radio_obj_t *self) {
+    esp_netif_dhcpc_start(self->netif);
+}
+
+void common_hal_wifi_radio_stop_dhcp_client(wifi_radio_obj_t *self) {
+    esp_netif_dhcpc_stop(self->netif);
+}
+
+void common_hal_wifi_radio_set_ipv4_address(wifi_radio_obj_t *self, mp_obj_t ipv4, mp_obj_t netmask, mp_obj_t gateway, mp_obj_t ipv4_dns) {
+    common_hal_wifi_radio_stop_dhcp_client(self); // Must stop DHCP to set a manual address
+
+    esp_netif_ip_info_t ip_info;
+    ipaddress_ipaddress_to_esp_idf_ip4(ipv4, &ip_info.ip);
+    ipaddress_ipaddress_to_esp_idf_ip4(netmask, &ip_info.netmask);
+    ipaddress_ipaddress_to_esp_idf_ip4(gateway, &ip_info.gw);
+
+    esp_netif_set_ip_info(self->netif, &ip_info);
+
+    if (ipv4_dns != MP_OBJ_NULL) {
+        common_hal_wifi_radio_set_ipv4_dns(self, ipv4_dns);
+    }
+}
+
 mp_int_t common_hal_wifi_radio_ping(wifi_radio_obj_t *self, mp_obj_t ip_address, mp_float_t timeout) {
     esp_ping_config_t ping_config = ESP_PING_DEFAULT_CONFIG();
     ipaddress_ipaddress_to_esp_idf(ip_address, &ping_config.target_addr);

ports/espressif/common-hal/wifi/Radio.c

@@ -189,6 +189,16 @@ void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t *esp_ip_addre
     IP_ADDR4(esp_ip_address, bytes[0], bytes[1], bytes[2], bytes[3]);
 }
 
+void ipaddress_ipaddress_to_esp_idf_ip4(mp_obj_t ip_address, esp_ip4_addr_t *esp_ip_address) {
+    if (!mp_obj_is_type(ip_address, &ipaddress_ipv4address_type)) {
+        mp_raise_ValueError(translate("Only IPv4 addresses supported"));
+    }
+    mp_obj_t packed = common_hal_ipaddress_ipv4address_get_packed(ip_address);
+    size_t len;
+    const char *bytes = mp_obj_str_get_data(packed, &len);
+    esp_netif_set_ip4_addr(esp_ip_address, bytes[0], bytes[1], bytes[2], bytes[3]);
+}
+
 void common_hal_wifi_gc_collect(void) {
     common_hal_wifi_radio_gc_collect(&common_hal_wifi_radio_obj);
 }

ports/espressif/common-hal/wifi/__init__.c

@@ -30,9 +30,11 @@
 #include "py/obj.h"
 
 #include "lwip/api.h"
+#include "components/esp_wifi/include/esp_wifi.h"
 
 void wifi_reset(void);
 
 void ipaddress_ipaddress_to_esp_idf(mp_obj_t ip_address, ip_addr_t *esp_ip_address);
+void ipaddress_ipaddress_to_esp_idf_ip4(mp_obj_t ip_address, esp_ip4_addr_t *esp_ip_address);
 
 #endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_WIFI___INIT___H

ports/espressif/common-hal/wifi/__init__.h

@@ -206,6 +206,10 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     spi_clock_enable(1 << (self->sck->periph_index - 1));
     reserved_spi[self->sck->periph_index - 1] = true;
 
+    // Always start at 250khz which is what SD cards need. They are sensitive to
+    // SPI bus noise before they are put into SPI mode.
+    const uint32_t default_baudrate = 250000UL;
+
     self->handle.Instance = SPIx;
     self->handle.Init.Mode = SPI_MODE_MASTER;
     // Direction change only required for RX-only, see RefMan RM0090:884
@@ -218,16 +222,16 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     self->handle.Init.CLKPolarity = SPI_POLARITY_LOW;
     self->handle.Init.CLKPhase = SPI_PHASE_1EDGE;
     self->handle.Init.NSS = SPI_NSS_SOFT;
-    self->handle.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_256;
+    self->handle.Init.BaudRatePrescaler = stm32_baud_to_spi_div(default_baudrate, &self->prescaler, get_busclock(self->handle.Instance));
     self->handle.Init.FirstBit = SPI_FIRSTBIT_MSB;
     self->handle.Init.TIMode = SPI_TIMODE_DISABLE;
     self->handle.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
     self->handle.Init.CRCPolynomial = 10;
     if (HAL_SPI_Init(&self->handle) != HAL_OK) {
         mp_raise_ValueError(translate("SPI init error"));
     }
-    self->baudrate = (get_busclock(SPIx) / 16);
-    self->prescaler = 16;
+    self->baudrate = default_baudrate;
+    // self->prescaler = 16; // Initialised above by stm32_baud_to_spi_div
     self->half_duplex = half_duplex;
     self->polarity = 0;
     self->phase = 0;
@@ -381,7 +385,7 @@ bool common_hal_busio_spi_transfer(busio_spi_obj_t *self,
 
 uint32_t common_hal_busio_spi_get_frequency(busio_spi_obj_t *self) {
     // returns actual frequency
-    uint32_t result = HAL_RCC_GetPCLK2Freq() / self->prescaler;
+    uint32_t result = get_busclock(self->handle.Instance) / self->prescaler;
     return result;
 }
 

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

@@ -230,7 +230,8 @@ def est_net_savings(s, occ):
         # words[] array.
 
         scores = sorted(
-            ((s, -est_net_savings(s, occ)) for (s, occ) in counter.items()), key=lambda x: x[1]
+            ((s, -est_net_savings(s, occ)) for (s, occ) in counter.items() if occ > 1),
+            key=lambda x: x[1],
         )
 
         # Pick the one with the highest score.  The score must be negative.