8000 Nrf52 uart io by hathach · Pull Request #1212 · adafruit/circuitpython · GitHub
[go: up one dir, main page]
Skip to content

Nrf52 uart io #1212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its ma 8000 intainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Oct 4, 2018
Merged

Nrf52 uart io #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d8c8c5f
remove CFG_HWUART_FOR_SERIAL
hathach Sep 18, 2018
1df3bcf
add board.UART() function
hathach Sep 19, 2018
c5593ec
got uart tx work
hathach Sep 19, 2018
9c25306
uart rx got some issue with irq
hathach Sep 19, 2018
fe1a297
still have issue with initial uart rx
hathach Sep 20, 2018
dddc437
got rx working finally
hathach Sep 20, 2018
816ff05
clean up
hathach Sep 20, 2018
7a1b4cc
Merge branch 'master' into nrf52_uart_io
hathach Sep 24, 2018
fdd3e91
changing to nrf uarte, tx works fine
hathach Sep 24, 2018
7bbd449
uarte rx work fine
hathach Sep 24, 2018
4015023
clean up uart io
hathach Sep 24, 2018
1782cea
uarte malloc if buffer is not in SRAM
hathach Sep 24, 2018
01c1296
nrf52 uart io rx work reliably
hathach Sep 25, 2018
d714479
clean up
hathach Sep 25, 2018
d3e5ba8
update nrfx to 1.3.0
hathach Sep 25, 2018
9017c9d
clean up
hathach Sep 25, 2018
2f0e0bd
migrate serial from uart to uarte
hathach Sep 25, 2018
dec5c50
clean up
hathach Sep 25, 2018
f724647
fix feather nrf52840 build error
hathach Sep 25, 2018
74cc55b
change error type to runtime
hathach Sep 25, 2018
52328c8
remove space
hathach Sep 25, 2018
eba80f7
update translate string
hathach Sep 25, 2018
76d6fb0
more clean up
hathach Sep 25, 2018
f543c84
"busio.UART not yet implemented -> not available
hathach Oct 3, 2018
08cbb03
implement common_hal_busio_uart_clear_rx_buffer
hathach Oct 3, 2018
b8884cc
Merge branch 'master' into nrf52_uart_io
hathach Oct 3, 2018
a47eaa5
update translate
hathach Oct 3, 2018
6049776
Merge branch 'master' into nrf52_uart_io
dhalbert Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/tinyusb
Open in desktop
Submodule tinyusb updated 35 files
+0 −10 README.md
+0 −5 examples/device/device_virtual_com/src/tusb_config.h
+15 −6 examples/device/nrf52840/segger/nrf52840.emProject
+6 −0 examples/device/nrf52840/src/main.c
+35 −44 examples/device/nrf52840/src/msc_app.c
+64 −0 examples/device/nrf52840/src/msc_app.h
+0 −93 examples/device/nrf52840/src/msc_device_app.h
+162 −0 examples/device/nrf52840/src/msc_flash_qspi.c
+36 −36 examples/device/nrf52840/src/msc_flash_ram.c
+7 −9 examples/device/nrf52840/src/tusb_config.h
+1 −1 examples/device/nrf52840_freertos/segger/nrf5x_freertos.emProject
+0 −4 examples/device/nrf52840_freertos/src/tusb_config.h
+0 −6 examples/obsolete/device/src/tusb_config.h
+0 −1 hw/bsp/board.h
+93 −4 hw/bsp/pca10056/board_pca10056.c
+10 −2 hw/bsp/pca10056/board_pca10056.h
+1 −1 hw/mcu/nordic/nrfx
+286 −2,213 hw/mcu/nordic/nrfx_config.h
+2 −1 hw/mcu/nordic/nrfx_glue.h
+9 −0 pkg.yml
+6 −0 repository.yml
+11 −13 src/class/cdc/cdc_device.c
+0 −6 src/class/cdc/cdc_device.h
+2 −3 src/common/tusb_compiler.h
+7 −4 src/device/usbd.c
+1 −7 src/device/usbd_auto_desc.c
+7 −0 src/osal/osal.c
+39 −2 src/osal/osal.h
+4 −6 src/osal/osal_freertos.h
+215 −0 src/osal/osal_mynewt.h
+11 −19 src/osal/osal_none.h
+1 −5 src/portable/nordic/nrf5x/hal_nrf5x.c
+7 −6 src/tusb.c
+10 −20 src/tusb_option.h
+1 −0 version.yml
35 changes: 28 additions & 7 deletions locale/circuitpython.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-01 18:52-0400\n"
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
Expand Down Expand Up @@ -378,10 +378,12 @@ msgid "bytes > 8 bits not supported"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:72
#: ports/nrf/common-hal/busio/UART.c:82
msgid "tx and rx cannot both be None"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:145
#: ports/nrf/common-hal/busio/UART.c:115
msgid "Failed to allocate RX buffer"
msgstr ""

Expand All @@ -390,10 +392,12 @@ msgid "Could not initialize UART"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:240
#: ports/nrf/common-hal/busio/UART.c:149
msgid "No RX pin"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:294
#: ports/nrf/common-hal/busio/UART.c:195
msgid "No TX pin"
msgstr ""

Expand Down Expand Up @@ -698,12 +702,29 @@ msgstr ""
msgid "All SPI peripherals are in use"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
msgid "busio.UART not yet implemented"
#: ports/nrf/common-hal/busio/SPI.c:176
msgid "Baud rate too high for this SPI peripheral"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:48
#, c-format
msgid "error = 0x%08lX"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:86
msgid "Invalid buffer size"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:90
msgid "Odd parity is not supported"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
#: ports/nrf/common-hal/busio/UART.c:364
msgid "busio.UART not available"
msgstr ""

#: ports/nrf/common-hal/microcontroller/Processor.c:49
Expand Down
37 changes: 30 additions & 7 deletions locale/de_DE.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: Sebastian Plamauer\n"
"Language-Team: \n"
Expand Down Expand Up @@ -387,10 +387,12 @@ msgid "bytes > 8 bits not supported"
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"

#: ports/atmel-samd/common-hal/busio/UART.c:72
#: ports/nrf/common-hal/busio/UART.c:82
msgid "tx and rx cannot both be None"
msgstr "tx und rx können nicht beide None sein"

#: ports/atmel-samd/common-hal/busio/UART.c:145
#: ports/nrf/common-hal/busio/UART.c:115
msgid "Failed to allocate RX buffer"
msgstr "Konnte keinen RX Buffer allozieren"

Expand All @@ -399,10 +401,12 @@ msgid "Could not initialize UART"
msgstr "Konnte UART nicht initialisieren"

#: ports/atmel-samd/common-hal/busio/UART.c:240
#: ports/nrf/common-hal/busio/UART.c:149
msgid "No RX pin"
msgstr "Kein RX Pin"

#: ports/atmel-samd/common-hal/busio/UART.c:294
#: ports/nrf/common-hal/busio/UART.c:195
msgid "No TX pin"
msgstr "Kein TX Pin"

Expand Down Expand Up @@ -709,12 +713,31 @@ msgstr "Alle timer werden benutzt"
msgid "All SPI peripherals are in use"
msgstr "Alle timer werden benutzt"

#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
msgid "busio.UART not yet implemented"
#: ports/nrf/common-hal/busio/SPI.c:176
msgid "Baud rate too high for this SPI peripheral"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:48
#, c-format
msgid "error = 0x%08lX"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:86
#, fuzzy
msgid "Invalid buffer size"
msgstr "ungültiger dupterm index"

#: ports/nrf/common-hal/busio/UART.c:90
#, fuzzy
msgid "Odd parity is not supported"
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"

#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
#: ports/nrf/common-hal/busio/UART.c:364
msgid "busio.UART not available"
msgstr ""

#: ports/nrf/common-hal/microcontroller/Processor.c:49
Expand Down
35 changes: 28 additions & 7 deletions locale/en_US.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -378,10 +378,12 @@ msgid "bytes > 8 bits not supported"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:72
#: ports/nrf/common-hal/busio/UART.c:82
msgid "tx and rx cannot both be None"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:145
#: ports/nrf/common-hal/busio/UART.c:115
msgid "Failed to allocate RX buffer"
msgstr ""

Expand All @@ -390,10 +392,12 @@ msgid "Could not initialize UART"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:240
#: ports/nrf/common-hal/busio/UART.c:149
msgid "No RX pin"
msgstr ""

#: ports/atmel-samd/common-hal/busio/UART.c:294
#: ports/nrf/common-hal/busio/UART.c:195
msgid "No TX pin"
msgstr ""

Expand Down Expand Up @@ -698,12 +702,29 @@ msgstr ""
msgid "All SPI peripherals are in use"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
msgid "busio.UART not yet implemented"
#: ports/nrf/common-hal/busio/SPI.c:176
msgid "Baud rate too high for this SPI peripheral"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:48
#, c-format
msgid "error = 0x%08lX"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:86
msgid "Invalid buffer size"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:90
msgid "Odd parity is not supported"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
#: ports/nrf/common-hal/busio/UART.c:364
msgid "busio.UART not available"
msgstr ""

#: ports/nrf/common-hal/microcontroller/Processor.c:49
Expand Down
37 10000 changes: 30 additions & 7 deletions locale/es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -393,10 +393,12 @@ msgid "bytes > 8 bits not supported"
msgstr "bytes > 8 bits no son soportados"

#: ports/atmel-samd/common-hal/busio/UART.c:72
#: ports/nrf/common-hal/busio/UART.c:82
msgid "tx and rx cannot both be None"
msgstr "tx y rx no pueden ser ambos None"

#: ports/atmel-samd/common-hal/busio/UART.c:145
#: ports/nrf/common-hal/busio/UART.c:115
msgid "Failed to allocate RX buffer"
msgstr "Fallo la asignación del buffer RX"

Expand All @@ -405,10 +407,12 @@ msgid "Could not initialize UART"
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 "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 "Sin pin TX"

Expand Down Expand Up @@ -715,12 +719,31 @@ msgstr "Todos los timers están siendo utilizados"
msgid "All SPI peripherals are in use"
msgstr "Todos los timers están siendo utilizados"

#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
msgid "busio.UART not yet implemented"
#: ports/nrf/common-hal/busio/SPI.c:176
msgid "Baud rate too high for this SPI peripheral"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:48
#, c-format
msgid "error = 0x%08lX"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:86
#, fuzzy
msgid "Invalid buffer size"
msgstr "index dupterm inválido"

#: ports/nrf/common-hal/busio/UART.c:90
#, fuzzy
msgid "Odd parity is not supported"
msgstr "bytes > 8 bits no son soportados"

#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
#: ports/nrf/common-hal/busio/UART.c:364
msgid "busio.UART not available"
msgstr ""

#: ports/nrf/common-hal/microcontroller/Processor.c:49
Expand Down
40 changes: 32 additions & 8 deletions locale/fil.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-01 18:44-0400\n"
"POT-Creation-Date: 2018-10-03 23:15+0700\n"
"PO-Revision-Date: 2018-08-30 23:04-0700\n"
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
"Language-Team: fil\n"
Expand Down Expand Up @@ -390,10 +390,12 @@ msgid "bytes > 8 bits not supported"
msgstr "hindi sinusuportahan ang bytes > 8 bits"

#: ports/atmel-samd/common-hal/busio/UART.c:72
#: ports/nrf/common-hal/busio/UART.c:82
msgid "tx and rx cannot both be None"
msgstr "tx at rx hindi pwedeng parehas na None"

#: ports/atmel-samd/common-hal/busio/UART.c:145
#: ports/nrf/common-hal/busio/UART.c:115
msgid "Failed to allocate RX buffer"
msgstr "Nabigong ilaan ang RX buffer"

Expand All @@ -402,10 +404,12 @@ msgid "Could not initialize UART"
msgstr "Hindi ma-initialize ang UART"

#: ports/atmel-samd/common-hal/busio/UART.c:240
#: ports/nrf/common-hal/busio/UART.c:149
msgid "No RX pin"
msgstr "Walang RX pin"

#: ports/atmel-samd/common-hal/busio/UART.c:294
#: ports/nrf/common-hal/busio/UART.c:195
msgid "No TX pin"
msgstr "Walang TX pin"

Expand Down Expand Up @@ -715,13 +719,33 @@ msgstr "Lahat ng timer ginagamit"
msgid "All SPI peripherals are in use"
msgstr "Lahat ng timer ginagamit"

#: ports/nrf/common-hal/busio/UART.c:43 ports/nrf/common-hal/busio/UART.c:47
#: ports/nrf/common-hal/busio/UART.c:51 ports/nrf/common-hal/busio/UART.c:60
#: ports/nrf/common-hal/busio/UART.c:66 ports/nrf/common-hal/busio/UART.c:71
#: ports/nrf/common-hal/busio/UART.c:76 ports/nrf/common-hal/busio/UART.c:81
#: ports/nrf/common-hal/busio/UART.c:86 ports/nrf/common-hal/busio/UART.c:90
msgid "busio.UART not yet implemented"
msgstr "hindi pa implemented ang busio.UART"
#: ports/nrf/common-hal/busio/SPI.c:176
msgid "Baud rate too high for this SPI peripheral"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:48
#, c-format
msgid "error = 0x%08lX"
msgstr ""

#: ports/nrf/common-hal/busio/UART.c:86
#, fuzzy
msgid "Invalid buffer size"
msgstr "mali ang buffer length"

#: ports/nrf/common-hal/busio/UART.c:90
#, fuzzy
msgid "Odd parity is not supported"
msgstr "hindi sinusuportahan ang bytes > 8 bits"

#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
#: ports/nrf/common-hal/busio/UART.c:364
#, fuzzy
msgid "busio.UART not available"
msgstr ""

#: ports/nrf/common-hal/microcontroller/Processor.c:49
#, c-format
Expand Down
Loading
0