Merge remote-tracking branch 'adafruit/main' into alarm-lifetime

dhalbert · dhalbert · commit 0221cc8df739 · 2022-10-28T14:11:32.000-04:00
diff --git a/locale/de_DE.po b/locale/de_DE.po
@@ -128,7 +128,7 @@ msgstr "%q Initialisierung ist gescheitert"
 
 #: shared-bindings/dualbank/__init__.c
 msgid "%q is %q"
-msgstr ""
+msgstr "%q ist %q"
 
 #: py/argcheck.c
 msgid "%q length must be %d"
@@ -173,7 +173,7 @@ msgstr "%q muss >= %d sein"
 #: shared-bindings/analogbufio/BufferedIn.c
 #: shared-bindings/audiocore/RawSample.c
 msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
-msgstr ""
+msgstr "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
 
 #: py/argcheck.c
 msgid "%q must be a string"
@@ -1030,16 +1030,16 @@ msgstr "Filter zu komplex"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is duplicate"
-msgstr ""
+msgstr "Die Firmware ist doppelt vorhanden"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is invalid"
-msgstr ""
+msgstr "Die Firmware ist ungültig"
 
 #: ports/espressif/common-hal/coproc/Coproc.c
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Firmware is too big"
-msgstr ""
+msgstr "Die Firmware ist zu groß"
 
 #: shared-bindings/bitmaptools/__init__.c
 msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -1657,7 +1657,7 @@ msgstr ""
 #: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
 #: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
 msgid "Only one %q can be set in deep sleep."
-msgstr ""
+msgstr "Nur ein %q kann im Deep-Sleep gesetzt werden."
 
 #: ports/espressif/common-hal/i2ctarget/I2CTarget.c
 #: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -2224,7 +2224,7 @@ msgstr "mDNS-Abfrage kann nicht gestartet werden"
 
 #: shared-bindings/coproc/CoprocMemory.c
 msgid "Unable to write"
-msgstr ""
+msgstr "Schreiben nicht möglich"
 
 #: shared-bindings/nvm/ByteArray.c
 msgid "Unable to write to nvm."
@@ -2987,7 +2987,8 @@ msgstr "Fehler = 0x%08lX"
 msgid ""
 "esp32_camera.Camera requires reserved PSRAM to be configured. See the "
 "documentation for instructions."
-msgstr ""
+msgstr "esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu können. "
+"Sieh in der Dokumentation für eine Anleitung nach."
 
 #: py/runtime.c
 msgid "exceptions must derive from BaseException"
@@ -4391,7 +4392,7 @@ msgstr "wifi ist nicht aktiviert"
 
 #: ports/raspberrypi/common-hal/wifi/Monitor.c
 msgid "wifi.Monitor not available"
-msgstr ""
+msgstr "wifi.Monitor nicht verfügbar"
 
 #: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
@@ -4510,7 +4511,7 @@ msgstr "zi muss die Form (n_section, 2) haben"
 #~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
 #~ "or 'B'"
 #~ msgstr ""
-#~ "sample_source buffer muss ein Bytearray oder ein Array vom Typ 'h', 'H', "
+#~ "sample_source buffer muss ein Byte-Array oder ein Array vom Typ 'h', 'H', "
 #~ "'b' oder 'B' sein"
 
 #~ msgid "Expected an alarm"
diff --git a/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_box/mpconfigboard.mk
@@ -8,3 +8,5 @@ IDF_TARGET = esp32s3
 CIRCUITPY_ESP_FLASH_MODE = dio
 CIRCUITPY_ESP_FLASH_FREQ = 40m
 CIRCUITPY_ESP_FLASH_SIZE = 16MB
+
+CIRCUITPY_ESP32_CAMERA = 0
diff --git a/ports/espressif/boards/espressif_esp32s3_box/sdkconfig b/ports/espressif/boards/espressif_esp32s3_box/sdkconfig
@@ -1,35 +1,11 @@
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-#
-# SPI RAM config
-#
-# CONFIG_SPIRAM_MODE_QUAD is not set
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_TYPE_AUTO=y
-# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set
-CONFIG_SPIRAM_SIZE=-1
-# end of SPI RAM config
-
-CONFIG_DEFAULT_PSRAM_CLK_IO=30
-#
-# PSRAM Clock and CS IO for ESP32S3
-#
-CONFIG_DEFAULT_PSRAM_CS_IO=26
-# end of PSRAM Clock and CS IO for ESP32S3
 
-# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
-# CONFIG_SPIRAM_RODATA is not set
-CONFIG_SPIRAM_SPEED_80M=y
-# CONFIG_SPIRAM_SPEED_40M is not set
-CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
-# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
-# CONFIG_SPIRAM_USE_MEMMAP is not set
-# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
-CONFIG_SPIRAM_USE_MALLOC=y
-CONFIG_SPIRAM_MEMTEST=y
-CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
-# CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP is not set
-CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
+CONFIG_SPIRAM_USE_MEMMAP=y
+
 #
 # LWIP
 #
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -25,6 +25,7 @@ CIRCUITPY_CANIO ?= 1
 CIRCUITPY_COPROC ?= 1
 CIRCUITPY_COUNTIO ?= 1
 CIRCUITPY_DUALBANK ?= 1
+CIRCUITPY_ESP32_CAMERA ?= 1
 CIRCUITPY_ESPIDF ?= 1
 CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_FREQUENCYIO ?= 1
diff --git a/ports/raspberrypi/common-hal/ssl/SSLSocket.c b/ports/raspberrypi/common-hal/ssl/SSLSocket.c
@@ -284,7 +284,7 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t
 }
 
 bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t *self, const char *host, size_t hostlen, uint32_t port) {
-    mp_raise_NotImplementedError(NULL);
+    return common_hal_socketpool_socket_bind(self->sock, host, hostlen, port);
 }
 
 void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {
@@ -349,11 +349,14 @@ bool common_hal_ssl_sslsocket_get_connected(ssl_sslsocket_obj_t *self) {
 }
 
 bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog) {
-    mp_raise_NotImplementedError(NULL);
+    return common_hal_socketpool_socket_listen(self->sock, backlog);
 }
 
 ssl_sslsocket_obj_t *common_hal_ssl_sslsocket_accept(ssl_sslsocket_obj_t *self, uint8_t *ip, uint32_t *port) {
-    mp_raise_NotImplementedError(NULL);
+    socketpool_socket_obj_t *sock = common_hal_socketpool_socket_accept(self->sock, ip, port);
+    ssl_sslsocket_obj_t *sslsock = common_hal_ssl_sslcontext_wrap_socket(self->ssl_context, sock, true, NULL);
+    do_handshake(sslsock);
+    return sslsock;
 }
 
 void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms) {

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ mp_uint_t common_hal_ssl_sslsocket_send(ssl_sslsocket_obj_t *self, const uint8_t`
`284`	`284`	`}`
`285`	`285`
`286`	`286`	`bool common_hal_ssl_sslsocket_bind(ssl_sslsocket_obj_t self, const char host, size_t hostlen, uint32_t port) {`
`287`		`- mp_raise_NotImplementedError(NULL);`
	`287`	`+ return common_hal_socketpool_socket_bind(self->sock, host, hostlen, port);`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`void common_hal_ssl_sslsocket_close(ssl_sslsocket_obj_t *self) {`
`@@ -349,11 +349,14 @@ bool common_hal_ssl_sslsocket_get_connected(ssl_sslsocket_obj_t *self) {`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`bool common_hal_ssl_sslsocket_listen(ssl_sslsocket_obj_t *self, int backlog) {`
`352`		`- mp_raise_NotImplementedError(NULL);`
	`352`	`+ return common_hal_socketpool_socket_listen(self->sock, backlog);`
`353`	`353`	`}`
`354`	`354`
`355`	`355`	`ssl_sslsocket_obj_t common_hal_ssl_sslsocket_accept(ssl_sslsocket_obj_t self, uint8_t ip, uint32_t port) {`
`356`		`- mp_raise_NotImplementedError(NULL);`
	`356`	`+ socketpool_socket_obj_t *sock = common_hal_socketpool_socket_accept(self->sock, ip, port);`
	`357`	`+ ssl_sslsocket_obj_t *sslsock = common_hal_ssl_sslcontext_wrap_socket(self->ssl_context, sock, true, NULL);`
	`358`	`+ do_handshake(sslsock);`
	`359`	`+ return sslsock;`
`357`	`360`	`}`
`358`	`361`
`359`	`362`	`void common_hal_ssl_sslsocket_settimeout(ssl_sslsocket_obj_t *self, uint32_t timeout_ms) {`