Skip to content

Commit a5b01f7

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into add_pwmio
2 parents 6857f98 + 988e5ca commit a5b01f7

43 files changed

Lines changed: 587 additions & 119 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎lib/mp-readline/readline.c‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ int readline_process_char(int c) {
144144
goto right_arrow_key;
145145
} else if (c == CHAR_CTRL_K) {
146146
// CTRL-K is kill from cursor to end-of-line, inclusive
147-
vstr_cut_tail_bytes(rl.line, last_line_len - rl.cursor_pos);
147+
vstr_cut_tail_bytes(rl.line, rl.line->len - rl.cursor_pos);
148148
// set redraw parameters
149149
redraw_from_cursor = true;
150150
} else if (c == CHAR_CTRL_N) {
@@ -155,6 +155,7 @@ int readline_process_char(int c) {
155155
goto up_arrow_key;
156156
} else if (c == CHAR_CTRL_U) {
157157
// CTRL-U is kill from beginning-of-line up to cursor
158+
cont_chars = count_cont_bytes(rl.line->buf+rl.orig_line_len, rl.line->buf+rl.cursor_pos);
158159
vstr_cut_out_bytes(rl.line, rl.orig_line_len, rl.cursor_pos - rl.orig_line_len);
159160
// set redraw parameters
160161
redraw_step_back = rl.cursor_pos - rl.orig_line_len;
@@ -342,6 +343,7 @@ int readline_process_char(int c) {
342343
if (c == '~') {
343344
if (rl.escape_seq_buf[0] == '1' || rl.escape_seq_buf[0] == '7') {
344345
home_key:
346+
cont_chars = count_cont_bytes(rl.line->buf+rl.orig_line_len, rl.line->buf+rl.cursor_pos);
345347
redraw_step_back = rl.cursor_pos - rl.orig_line_len;
346348
} else if (rl.escape_seq_buf[0] == '4' || rl.escape_seq_buf[0] == '8') {
347349
end_key:
@@ -352,7 +354,12 @@ int readline_process_char(int c) {
352354
delete_key:
353355
#endif
354356
if (rl.cursor_pos < rl.line->len) {
355-
vstr_cut_out_bytes(rl.line, rl.cursor_pos, 1);
357+
size_t len = 1;
358+
while (UTF8_IS_CONT(rl.line->buf[rl.cursor_pos+len]) &&
359+
rl.cursor_pos+len < rl.line->len) {
360+
len++;
361+
}
362+
vstr_cut_out_bytes(rl.line, rl.cursor_pos, len);
356363
redraw_from_cursor = true;
357364
}
358365
} else {

‎locale/ID.po‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-14 09:36-0400\n"
8+
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
99
"PO-Revision-Date: 2020-07-06 18:10+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -764,7 +764,7 @@ msgstr "Error pada regex"
764764

765765
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
766766
#: shared-bindings/microcontroller/Pin.c
767-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
767+
#: shared-bindings/neopixel_write/__init__.c
768768
#: shared-bindings/terminalio/Terminal.c
769769
msgid "Expected a %q"
770770
msgstr "Diharapkan %q"
@@ -1352,6 +1352,15 @@ msgstr "Tambahkan module apapun pada filesystem\n"
13521352
msgid "Polygon needs at least 3 points"
13531353
msgstr ""
13541354

1355+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1356+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1357+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1358+
#: ports/stm/common-hal/pulseio/PulseOut.c
1359+
msgid ""
1360+
"Port does not accept pins or frequency. "
1361+
"Construct and pass a PWMOut Carrier instead"
1362+
msgstr ""
1363+
13551364
#: shared-bindings/_bleio/Adapter.c
13561365
msgid "Prefix buffer must be on the heap"
13571366
msgstr ""
@@ -1366,6 +1375,10 @@ msgstr ""
13661375
msgid "Pull not used when direction is output."
13671376
msgstr ""
13681377

1378+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1379+
msgid "PulseOut not supported on this chip"
1380+
msgstr ""
1381+
13691382
#: ports/stm/common-hal/os/__init__.c
13701383
msgid "RNG DeInit Error"
13711384
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 15 additions & 2 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-08-14 09:36-0400\n"
11+
"POT-Creation-Date: 2020-08-18 11:19-0400\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"
@@ -744,7 +744,7 @@ msgstr ""
744744

745745
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
746746
#: shared-bindings/microcontroller/Pin.c
747-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
747+
#: shared-bindings/neopixel_write/__init__.c
748748
#: shared-bindings/terminalio/Terminal.c
749749
msgid "Expected a %q"
750750
msgstr ""
@@ -1328,6 +1328,15 @@ msgstr ""
13281328
msgid "Polygon needs at least 3 points"
13291329
msgstr ""
13301330

1331+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1332+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1333+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1334+
#: ports/stm/common-hal/pulseio/PulseOut.c
1335+
msgid ""
1336+
"Port does not accept pins or frequency. "
1337+
"Construct and pass a PWMOut Carrier instead"
1338+
msgstr ""
1339+
13311340
#: shared-bindings/_bleio/Adapter.c
13321341
msgid "Prefix buffer must be on the heap"
13331342
msgstr ""
@@ -1340,6 +1349,10 @@ msgstr ""
13401349
msgid "Pull not used when direction is output."
13411350
msgstr ""
13421351

1352+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1353+
msgid "PulseOut not supported on this chip"
1354+
msgstr ""
1355+
13431356
#: ports/stm/common-hal/os/__init__.c
13441357
msgid "RNG DeInit Error"
13451358
msgstr ""

‎locale/cs.po‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-14 09:36-0400\n"
8+
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
99
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
1010
"Last-Translator: dronecz <mzuzelka@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -750,7 +750,7 @@ msgstr ""
750750

751751
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
752752
#: shared-bindings/microcontroller/Pin.c
753-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
753+
#: shared-bindings/neopixel_write/__init__.c
754754
#: shared-bindings/terminalio/Terminal.c
755755
msgid "Expected a %q"
756756
msgstr ""
@@ -1334,6 +1334,15 @@ msgstr ""
13341334
msgid "Polygon needs at least 3 points"
13351335
msgstr ""
13361336

1337+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1338+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1339+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1340+
#: ports/stm/common-hal/pulseio/PulseOut.c
1341+
msgid ""
1342+
"Port does not accept pins or frequency. "
1343+
"Construct and pass a PWMOut Carrier instead"
1344+
msgstr ""
1345+
13371346
#: shared-bindings/_bleio/Adapter.c
13381347
msgid "Prefix buffer must be on the heap"
13391348
msgstr ""
@@ -1346,6 +1355,10 @@ msgstr ""
13461355
msgid "Pull not used when direction is output."
13471356
msgstr ""
13481357

1358+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1359+
msgid "PulseOut not supported on this chip"
1360+
msgstr ""
1361+
13491362
#: ports/stm/common-hal/os/__init__.c
13501363
msgid "RNG DeInit Error"
13511364
msgstr ""

‎locale/de_DE.po‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-14 09:36-0400\n"
8+
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
99
"PO-Revision-Date: 2020-06-16 18:24+0000\n"
1010
"Last-Translator: Andreas Buchen <andreas.buchen@gmail.com>\n"
1111
"Language: de_DE\n"
@@ -760,7 +760,7 @@ msgstr "Fehler in regex"
760760

761761
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
762762
#: shared-bindings/microcontroller/Pin.c
763-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
763+
#: shared-bindings/neopixel_write/__init__.c
764764
#: shared-bindings/terminalio/Terminal.c
765765
msgid "Expected a %q"
766766
msgstr "Erwartet ein(e) %q"
@@ -1362,6 +1362,15 @@ msgstr "und alle Module im Dateisystem \n"
13621362
msgid "Polygon needs at least 3 points"
13631363
msgstr "Polygone brauchen mindestens 3 Punkte"
13641364

1365+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1366+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1367+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1368+
#: ports/stm/common-hal/pulseio/PulseOut.c
1369+
msgid ""
1370+
"Port does not accept pins or frequency. "
1371+
"Construct and pass a PWMOut Carrier instead"
1372+
msgstr ""
1373+
13651374
#: shared-bindings/_bleio/Adapter.c
13661375
msgid "Prefix buffer must be on the heap"
13671376
msgstr "Der Präfixbuffer muss sich auf dem Heap befinden"
@@ -1376,6 +1385,10 @@ msgstr ""
13761385
msgid "Pull not used when direction is output."
13771386
msgstr "Pull wird nicht verwendet, wenn die Richtung output ist."
13781387

1388+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1389+
msgid "PulseOut not supported on this chip"
1390+
msgstr "PulseOut wird auf diesem Chip nicht unterstützt"
1391+
13791392
#: ports/stm/common-hal/os/__init__.c
13801393
msgid "RNG DeInit Error"
13811394
msgstr "RNG DeInit-Fehler"
@@ -3553,9 +3566,6 @@ msgstr ""
35533566
#~ msgid "'async for' or 'async with' outside async function"
35543567
#~ msgstr "'async for' oder 'async with' außerhalb der asynchronen Funktion"
35553568

3556-
#~ msgid "PulseOut not supported on this chip"
3557-
#~ msgstr "PulseOut wird auf diesem Chip nicht unterstützt"
3558-
35593569
#~ msgid "PulseIn not supported on this chip"
35603570
#~ msgstr "PulseIn wird auf diesem Chip nicht unterstützt"
35613571

‎locale/es.po‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-08-14 09:36-0400\n"
10+
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
1111
"PO-Revision-Date: 2020-08-17 21:11+0000\n"
1212
"Last-Translator: Alvaro Figueroa <alvaro@greencore.co.cr>\n"
1313
"Language-Team: \n"
@@ -765,7 +765,7 @@ msgstr "Error en regex"
765765

766766
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
767767
#: shared-bindings/microcontroller/Pin.c
768-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
768+
#: shared-bindings/neopixel_write/__init__.c
769769
#: shared-bindings/terminalio/Terminal.c
770770
msgid "Expected a %q"
771771
msgstr "Se espera un %q"
@@ -1362,6 +1362,15 @@ msgstr "Además de cualquier módulo en el sistema de archivos\n"
13621362
msgid "Polygon needs at least 3 points"
13631363
msgstr "El polígono necesita al menos 3 puntos"
13641364

1365+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1366+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1367+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1368+
#: ports/stm/common-hal/pulseio/PulseOut.c
1369+
msgid ""
1370+
"Port does not accept pins or frequency. "
1371+
"Construct and pass a PWMOut Carrier instead"
1372+
msgstr ""
1373+
13651374
#: shared-bindings/_bleio/Adapter.c
13661375
msgid "Prefix buffer must be on the heap"
13671376
msgstr "El búfer de prefijo debe estar en el montículo"
@@ -1375,6 +1384,10 @@ msgstr ""
13751384
msgid "Pull not used when direction is output."
13761385
msgstr "Pull no se usa cuando la dirección es output."
13771386

1387+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1388+
msgid "PulseOut not supported on this chip"
1389+
msgstr "PulseOut no es compatible con este chip"
1390+
13781391
#: ports/stm/common-hal/os/__init__.c
13791392
msgid "RNG DeInit Error"
13801393
msgstr "Error de desinicializado del RNG"
@@ -3539,9 +3552,6 @@ msgstr "zi debe ser una forma (n_section,2)"
35393552
#~ msgid "'async for' or 'async with' outside async function"
35403553
#~ msgstr "'async for' o 'async with' fuera de la función async"
35413554

3542-
#~ msgid "PulseOut not supported on this chip"
3543-
#~ msgstr "PulseOut no es compatible con este chip"
3544-
35453555
#~ msgid "PulseIn not supported on this chip"
35463556
#~ msgstr "PulseIn no es compatible con este chip"
35473557

‎locale/fil.po‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-14 09:36-0400\n"
8+
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
99
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1010
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1111
"Language-Team: fil\n"
@@ -754,7 +754,7 @@ msgstr "May pagkakamali sa REGEX"
754754

755755
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
756756
#: shared-bindings/microcontroller/Pin.c
757-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
757+
#: shared-bindings/neopixel_write/__init__.c
758758
#: shared-bindings/terminalio/Terminal.c
759759
msgid "Expected a %q"
760760
msgstr "Umasa ng %q"
@@ -1346,6 +1346,15 @@ msgstr "Kasama ang kung ano pang modules na sa filesystem\n"
13461346
msgid "Polygon needs at least 3 points"
13471347
msgstr ""
13481348

1349+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1350+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1351+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1352+
#: ports/stm/common-hal/pulseio/PulseOut.c
1353+
msgid ""
1354+
"Port does not accept pins or frequency. "
1355+
"Construct and pass a PWMOut Carrier instead"
1356+
msgstr ""
1357+
13491358
#: shared-bindings/_bleio/Adapter.c
13501359
msgid "Prefix buffer must be on the heap"
13511360
msgstr ""
@@ -1360,6 +1369,10 @@ msgstr ""
13601369
msgid "Pull not used when direction is output."
13611370
msgstr "Pull hindi ginagamit kapag ang direksyon ay output."
13621371

1372+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1373+
msgid "PulseOut not supported on this chip"
1374+
msgstr ""
1375+
13631376
#: ports/stm/common-hal/os/__init__.c
13641377
msgid "RNG DeInit Error"
13651378
msgstr ""

‎locale/fr.po‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-08-14 09:36-0400\n"
10+
"POT-Creation-Date: 2020-08-18 11:19-0400\n"
1111
"PO-Revision-Date: 2020-07-27 21:27+0000\n"
1212
"Last-Translator: Nathan <bonnemainsnathan@gmail.com>\n"
1313
"Language: fr\n"
@@ -768,7 +768,7 @@ msgstr "Erreur dans l'expression régulière"
768768

769769
#: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
770770
#: shared-bindings/microcontroller/Pin.c
771-
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
771+
#: shared-bindings/neopixel_write/__init__.c
772772
#: shared-bindings/terminalio/Terminal.c
773773
msgid "Expected a %q"
774774
msgstr "Attendu un %q"
@@ -1369,6 +1369,15 @@ msgstr "Ainsi que tout autre module présent sur le système de fichiers\n"
13691369
msgid "Polygon needs at least 3 points"
13701370
msgstr "Polygone a besoin d’au moins 3 points"
13711371

1372+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
1373+
#: ports/cxd56/common-hal/pulseio/PulseOut.c
1374+
#: ports/nrf/common-hal/pulseio/PulseOut.c
1375+
#: ports/stm/common-hal/pulseio/PulseOut.c
1376+
msgid ""
1377+
"Port does not accept pins or frequency. "
1378+
"Construct and pass a PWMOut Carrier instead"
1379+
msgstr ""
1380+
13721381
#: shared-bindings/_bleio/Adapter.c
13731382
msgid "Prefix buffer must be on the heap"
13741383
msgstr "Le tampon de préfixe doit être sur le tas"
@@ -1381,6 +1390,10 @@ msgstr "Appuyez sur une touche pour entrer sur REPL ou CTRL-D pour recharger."
13811390
msgid "Pull not used when direction is output."
13821391
msgstr "Le tirage 'pull' n'est pas utilisé quand la direction est 'output'."
13831392

1393+
#: ports/stm/ref/pulseout-pre-timeralloc.c
1394+
msgid "PulseOut not supported on this chip"
1395+
msgstr "PulseOut non pris en charge sur cette puce"
1396+
13841397
#: ports/stm/common-hal/os/__init__.c
13851398
msgid "RNG DeInit Error"
13861399
msgstr "Erreur RNG DeInit"
@@ -3557,9 +3570,6 @@ msgstr ""
35573570
#~ msgid "'async for' or 'async with' outside async function"
35583571
#~ msgstr "'async for' ou 'async with' sans fonction asynchrone extérieure"
35593572

3560-
#~ msgid "PulseOut not supported on this chip"
3561-
#~ msgstr "PulseOut non pris en charge sur cette puce"
3562-
35633573
#~ msgid "PulseIn not supported on this chip"
35643574
#~ msgstr "PulseIn non pris en charge sur cette puce"
35653575

0 commit comments

Comments
 (0)