Skip to content

Commit 73162bd

Browse files
tannewttannewt
authored
Merge pull request adafruit#3584 from jepler/can-esp32s2
esp32s2: implement canio
2 parents 5110fec + 3a501a0 commit 73162bd

10 files changed

Lines changed: 667 additions & 5 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-10-16 19:50-0500\n"
11+
"POT-Creation-Date: 2020-10-21 20:13-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -288,11 +288,16 @@ msgstr ""
288288
msgid "Address type out of range"
289289
msgstr ""
290290

291+
#: ports/esp32s2/common-hal/canio/CAN.c
292+
msgid "All CAN peripherals are in use"
293+
msgstr ""
294+
291295
#: ports/esp32s2/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
292296
msgid "All I2C peripherals are in use"
293297
msgstr ""
294298

295299
#: ports/atmel-samd/common-hal/canio/Listener.c
300+
#: ports/esp32s2/common-hal/canio/Listener.c
296301
#: ports/stm/common-hal/canio/Listener.c
297302
msgid "All RX FIFOs in use"
298303
msgstr ""
@@ -407,6 +412,10 @@ msgid ""
407412
"disable.\n"
408413
msgstr ""
409414

415+
#: ports/esp32s2/common-hal/canio/CAN.c
416+
msgid "Baudrate not supported by peripheral"
417+
msgstr ""
418+
410419
#: shared-module/displayio/Display.c
411420
#: shared-module/framebufferio/FramebufferDisplay.c
412421
msgid "Below minimum frame rate"
@@ -775,7 +784,7 @@ msgstr ""
775784
msgid "ECB only operates on 16 bytes at a time"
776785
msgstr ""
777786

778-
#: ports/esp32s2/common-hal/busio/SPI.c
787+
#: ports/esp32s2/common-hal/busio/SPI.c ports/esp32s2/common-hal/canio/CAN.c
779788
msgid "ESP-IDF memory allocation failed"
780789
msgstr ""
781790

@@ -901,6 +910,7 @@ msgid "File exists"
901910
msgstr ""
902911

903912
#: ports/atmel-samd/common-hal/canio/Listener.c
913+
#: ports/esp32s2/common-hal/canio/Listener.c
904914
#: ports/stm/common-hal/canio/Listener.c
905915
msgid "Filters too complex"
906916
msgstr ""
@@ -1119,7 +1129,7 @@ msgstr ""
11191129
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
11201130
#: ports/cxd56/common-hal/busio/UART.c ports/cxd56/common-hal/sdioio/SDCard.c
11211131
#: ports/esp32s2/common-hal/busio/I2C.c ports/esp32s2/common-hal/busio/SPI.c
1122-
#: ports/esp32s2/common-hal/busio/UART.c
1132+
#: ports/esp32s2/common-hal/busio/UART.c ports/esp32s2/common-hal/canio/CAN.c
11231133
#: ports/mimxrt10xx/common-hal/busio/I2C.c
11241134
#: ports/mimxrt10xx/common-hal/busio/SPI.c
11251135
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
@@ -2837,6 +2847,10 @@ msgstr ""
28372847
msgid "long int not supported in this build"
28382848
msgstr ""
28392849

2850+
#: ports/esp32s2/common-hal/canio/CAN.c
2851+
msgid "loopback + silent mode not supported by peripheral"
2852+
msgstr ""
2853+
28402854
#: py/parse.c
28412855
msgid "malformed f-string"
28422856
msgstr ""
@@ -3189,6 +3203,8 @@ msgstr ""
31893203
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
31903204
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
31913205
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3206+
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
3207+
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
31923208
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
31933209
#: ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h
31943210
msgid "pressing boot button at start up.\n"
@@ -3444,6 +3460,16 @@ msgstr ""
34443460
msgid "tuple/list has wrong length"
34453461
msgstr ""
34463462

3463+
#: ports/esp32s2/common-hal/canio/CAN.c
3464+
#, c-format
3465+
msgid "twai_driver_install returned esp-idf error #%d"
3466+
msgstr ""
3467+
3468+
#: ports/esp32s2/common-hal/canio/CAN.c
3469+
#, c-format
3470+
msgid "twai_start returned esp-idf error #%d"
3471+
msgstr ""
3472+
34473473
#: ports/atmel-samd/common-hal/busio/UART.c
34483474
#: ports/esp32s2/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
34493475
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c

‎ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LONGINT_IMPL = MPZ
1111
CFLAGS += -DCFG_TUD_TASK_QUEUE_SZ=32
1212

1313
CIRCUITPY_ESP_FLASH_MODE=dio
14-
CIRCUITPY_ESP_FLASH_FREQ=40m
14+
CIRCUITPY_ESP_FLASH_FREQ=80m
1515
CIRCUITPY_ESP_FLASH_SIZE=4MB
1616

1717
CIRCUITPY_MODULE=wrover

0 commit comments

Comments
 (0)