Skip to content

Ringbuf: fix PacketBuffer; clean up ringbuf implementation and use #2799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers 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 18 commits into from
May 5, 2020
Merged

Ringbuf: fix PacketBuffer; clean up ringbuf implementation and use #2799

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
38ec3bc
further ringbuf cleanup
dhalbert Apr 21, 2020
77cd93a
merge from adafruit
dhalbert Apr 21, 2020
fbc8719
ringbuf tested
dhalbert Apr 22, 2020
84cee1a
rename and improve PacketBuffer packet length property
dhalbert Apr 29, 2020
3d62f87
back to '.packet_size' for compatiblity
dhalbert Apr 30, 2020
180f5c6
Merge remote-tracking branch 'adafruit/master' into ringbuf-fixes
dhalbert Apr 30, 2020
f307851
further cleanup and bug fixing
dhalbert Apr 30, 2020
241d7e2
change many ifndefs to ?=
dhalbert Apr 30, 2020
46298dd
PacketBuffer doc fixes
dhalbert Apr 30, 2020
7337ea4
fix support_matrix.py to handle ?=
dhalbert Apr 30, 2020
b0383f4
make translate; remove PO-Revision-Date to reduce merge changes in .p…
dhalbert Apr 30, 2020
d6c6f9f
add PacketBuffer .incoming_ and .outgoing_packet_length
dhalbert May 4, 2020
bae7a5e
make translate again
dhalbert May 4, 2020
b7836ae
address review comments
dhalbert May 4, 2020
c0af9f6
make translate
dhalbert May 4, 2020
0105acb
Merge remote-tracking branch 'adafruit/master' into ringbuf-fixes
dhalbert May 5, 2020
b23ff41
merge from upstream and make translate again (sv.po)
dhalbert May 5, 2020
e1366d7
trivial change to force rebuild
dhalbert May 5, 2020
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 docs/shared_bindings_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def build_module_map():
for module in modules:
full_name = module
search_name = module.lstrip("_")
re_pattern = "CIRCUITPY_{}\s=\s(.+)".format(search_name.upper())
re_pattern = "CIRCUITPY_{}\s*\??=\s*(.+)".format(search_name.upper())
find_config = re.findall(re_pattern, configs)
if not find_config:
continue
Expand Down
10 changes: 9 additions & 1 deletion locale/ID.po
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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -1096,6 +1096,10 @@ msgstr "Tidak ada pin TX"
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Tidak ada standar bus %q"
Expand Down Expand Up @@ -1445,6 +1449,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down
10 changes: 9 additions & 1 deletion 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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -1085,6 +1085,10 @@ msgstr ""
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr ""
Expand Down Expand Up @@ -1429,6 +1433,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down
10 changes: 9 additions & 1 deletion 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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: Pascal Deneaux\n"
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
Expand Down Expand Up @@ -1094,6 +1094,10 @@ msgstr "Kein TX Pin"
msgid "No available clocks"
msgstr "Keine Taktgeber verfügbar"

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Kein Standard %q Bus"
Expand Down Expand Up @@ -1448,6 +1452,10 @@ msgstr ""
msgid "Too many displays"
msgstr "Zu viele displays"

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr "Zurückverfolgung (jüngste Aufforderung zuletzt):\n"
Expand Down
10 changes: 9 additions & 1 deletion 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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -1085,6 +1085,10 @@ msgstr ""
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr ""
Expand Down Expand Up @@ -1429,6 +1433,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down
10 changes: 9 additions & 1 deletion locale/en_x_pirate.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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: \n"
"Language-Team: @sommersoft, @MrCertainly\n"
Expand Down Expand Up @@ -1089,6 +1089,10 @@ msgstr ""
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr ""
Expand Down Expand Up @@ -1433,6 +1437,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down
10 changes: 9 additions & 1 deletion 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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -1093,6 +1093,10 @@ msgstr "Sin pin TX"
msgid "No available clocks"
msgstr "Relojes no disponibles"

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Sin bus %q por defecto"
Expand Down Expand Up @@ -1446,6 +1450,10 @@ msgstr "Demasiados buses de pantalla"
msgid "Too many displays"
msgstr "Muchos displays"

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr "Traceback (ultima llamada reciente):\n"
Expand Down
10 changes: 9 additions & 1 deletion 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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
"Last-Translator: Timothy <[email protected]>\n"
"Language-Team: fil\n"
Expand Down Expand Up @@ -1101,6 +1101,10 @@ msgstr "Walang TX pin"
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Walang default na %q bus"
Expand Down Expand Up @@ -1452,6 +1456,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr "Traceback (pinakahuling huling tawag): \n"
Expand Down
10 changes: 9 additions & 1 deletion locale/fr.po
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: 0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2019-04-14 20:05+0100\n"
"Last-Translator: Pierrick Couturier <[email protected]>\n"
"Language-Team: fr\n"
Expand Down Expand Up @@ -1108,6 +1108,10 @@ msgstr "Pas de broche TX"
msgid "No available clocks"
msgstr "Pas d'horloge disponible"

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Pas de bus %q par défaut"
Expand Down Expand Up @@ -1467,6 +1471,10 @@ msgstr "Trop de bus d'affichage"
msgid "Too many displays"
msgstr "Trop d'affichages"

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr "Trace (appels les plus récents en dernier):\n"
Expand Down
10 changes: 9 additions & 1 deletion locale/it_IT.po
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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
"Last-Translator: Enrico Paganin <[email protected]>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -1105,6 +1105,10 @@ msgstr "Nessun pin TX"
msgid "No available clocks"
msgstr "Nessun orologio a disposizione"

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Nessun bus %q predefinito"
Expand Down Expand Up @@ -1463,6 +1467,10 @@ msgstr ""
msgid "Too many displays"
msgstr "Troppi schermi"

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr "Traceback (chiamata più recente per ultima):\n"
Expand Down
10 changes: 9 additions & 1 deletion locale/ko.po
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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -1089,6 +1089,10 @@ msgstr ""
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr ""
Expand Down Expand Up @@ -1433,6 +1437,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down
10 changes: 9 additions & 1 deletion locale/pl.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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2019-03-19 18:37-0700\n"
"Last-Translator: Radomir Dopieralski <[email protected]>\n"
"Language-Team: pl\n"
Expand Down Expand Up @@ -1090,6 +1090,10 @@ msgstr "Brak nóżki TX"
msgid "No available clocks"
msgstr "Brak wolnych zegarów"

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Nie ma domyślnej magistrali %q"
Expand Down Expand Up @@ -1434,6 +1438,10 @@ msgstr "Zbyt wiele magistrali"
msgid "Too many displays"
msgstr "Zbyt wiele wyświetlaczy"

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr "Ślad wyjątku (najnowsze wywołanie na końcu):\n"
Expand Down
10 changes: 9 additions & 1 deletion locale/pt_BR.po
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: 2020-04-27 18:34-0700\n"
"POT-Creation-Date: 2020-05-04 17:26-0400\n"
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down Expand Up @@ -1097,6 +1097,10 @@ msgstr "Nenhum pino TX"
msgid "No available clocks"
msgstr ""

#: shared-bindings/_bleio/PacketBuffer.c
msgid "No connection: size cannot be determined"
msgstr ""

#: shared-bindings/board/__init__.c
msgid "No default %q bus"
msgstr "Nenhum barramento %q padrão"
Expand Down Expand Up @@ -1446,6 +1450,10 @@ msgstr ""
msgid "Too many displays"
msgstr ""

#: ports/nrf/common-hal/_bleio/PacketBuffer.c
msgid "Total data to write is larger than outgoing_packet_length"
msgstr ""

#: py/obj.c
msgid "Traceback (most recent call last):\n"
msgstr ""
Expand Down
Loading