Skip to content

Commit da31acf

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/master' into ulab
2 parents c0bfa11 + e98991f commit da31acf

File tree

30 files changed

+481
-132
lines changed

30 files changed

+481
-132
lines changed

‎.github/workflows/build.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,13 +273,3 @@ jobs:
273273
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
274274
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
275275
if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
276-
- name: Install upload deps
277-
run: |
278-
pip install uritemplate
279-
- name: Upload to Release
280-
run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
281-
working-directory: tools
282-
env:
283-
UPLOAD_URL: ${{ github.event.release.upload_url }}
284-
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
285-
if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')

‎lib/oofatfs/ff.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3382,11 +3382,7 @@ FRESULT f_read (
33823382
if (!sect) ABORT(fs, FR_INT_ERR);
33833383
sect += csect;
33843384
cc = btr / SS(fs); /* When remaining bytes >= sector size, */
3385-
if (cc
3386-
#if _FS_DISK_READ_ALIGNED
3387-
&& (((int)rbuff & 3) == 0)
3388-
#endif
3389-
) {/* Read maximum contiguous sectors directly */
3385+
if (cc) {/* Read maximum contiguous sectors directly */
33903386
if (csect + cc > fs->csize) { /* Clip at cluster boundary */
33913387
cc = fs->csize - csect;
33923388
}

‎lib/oofatfs/ffconf.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,6 @@
343343
/ SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
344344
/ included somewhere in the scope of ff.h. */
345345

346-
// Set to nonzero if buffers passed to disk_read have a word alignment
347-
// restriction
348-
#ifndef _FS_DISK_READ_ALIGNED
349-
#define _FS_DISK_READ_ALIGNED 0
350-
#endif
351-
352346
/* #include <windows.h> // O/S definitions */
353347

354348

‎locale/ID.po

Lines changed: 16 additions & 5 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-02-27 11:02-0600\n"
11+
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -184,6 +184,10 @@ msgstr ""
184184
msgid "'align' requires 1 argument"
185185
msgstr "'align' membutuhkan 1 argumen"
186186

187+
#: py/compile.c
188+
msgid "'async for' or 'async with' outside async function"
189+
msgstr ""
190+
187191
#: py/compile.c
188192
msgid "'await' outside function"
189193
msgstr "'await' diluar fungsi"
@@ -910,10 +914,13 @@ msgstr "Pin untuk channel kanan tidak valid"
910914
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
911915
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
912916
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
913-
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
914917
msgid "Invalid pins"
915918
msgstr "Pin-pin tidak valid"
916919

920+
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
921+
msgid "Invalid pins for PWMOut"
922+
msgstr ""
923+
917924
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
918925
msgid "Invalid polarity"
919926
msgstr ""
@@ -1003,6 +1010,10 @@ msgstr ""
10031010
msgid "Must provide MISO or MOSI pin"
10041011
msgstr ""
10051012

1013+
#: py/parse.c
1014+
msgid "Name too long"
1015+
msgstr ""
1016+
10061017
#: shared-bindings/_pixelbuf/PixelBuf.c
10071018
msgid "Negative step not supported"
10081019
msgstr ""
@@ -1181,7 +1192,7 @@ msgid "PulseIn not yet supported"
11811192
msgstr ""
11821193

11831194
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1184-
msgid "PulseOut not yet supported"
1195+
msgid "PulseOut not supported on this chip"
11851196
msgstr ""
11861197

11871198
#: ports/stm32f4/common-hal/os/__init__.c
@@ -2216,7 +2227,7 @@ msgstr ""
22162227
msgid "inline assembler must be a function"
22172228
msgstr "inline assembler harus sebuah fungsi"
22182229

2219-
#: extmod/ulab/code/linalg.c
2230+
#: extmod/ulab/code/create.c
22202231
msgid "input argument must be an integer or a 2-tuple"
22212232
msgstr ""
22222233

@@ -2539,7 +2550,7 @@ msgstr ""
25392550
msgid "number of arguments must be 2, or 3"
25402551
msgstr ""
25412552

2542-
#: extmod/ulab/code/numerical.c
2553+
#: extmod/ulab/code/create.c
25432554
msgid "number of points must be at least 2"
25442555
msgstr ""
25452556

‎locale/circuitpython.pot

Lines changed: 16 additions & 5 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-02-27 11:02-0600\n"
11+
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -183,6 +183,10 @@ msgstr ""
183183
msgid "'align' requires 1 argument"
184184
msgstr ""
185185

186+
#: py/compile.c
187+
msgid "'async for' or 'async with' outside async function"
188+
msgstr ""
189+
186190
#: py/compile.c
187191
msgid "'await' outside function"
188192
msgstr ""
@@ -899,10 +903,13 @@ msgstr ""
899903
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
900904
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
901905
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
902-
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
903906
msgid "Invalid pins"
904907
msgstr ""
905908

909+
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
910+
msgid "Invalid pins for PWMOut"
911+
msgstr ""
912+
906913
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
907914
msgid "Invalid polarity"
908915
msgstr ""
@@ -992,6 +999,10 @@ msgstr ""
992999
msgid "Must provide MISO or MOSI pin"
9931000
msgstr ""
9941001

1002+
#: py/parse.c
1003+
msgid "Name too long"
1004+
msgstr ""
1005+
9951006
#: shared-bindings/_pixelbuf/PixelBuf.c
9961007
msgid "Negative step not supported"
9971008
msgstr ""
@@ -1167,7 +1178,7 @@ msgid "PulseIn not yet supported"
11671178
msgstr ""
11681179

11691180
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1170-
msgid "PulseOut not yet supported"
1181+
msgid "PulseOut not supported on this chip"
11711182
msgstr ""
11721183

11731184
#: ports/stm32f4/common-hal/os/__init__.c
@@ -2192,7 +2203,7 @@ msgstr ""
21922203
msgid "inline assembler must be a function"
21932204
msgstr ""
21942205

2195-
#: extmod/ulab/code/linalg.c
2206+
#: extmod/ulab/code/create.c
21962207
msgid "input argument must be an integer or a 2-tuple"
21972208
msgstr ""
21982209

@@ -2515,7 +2526,7 @@ msgstr ""
25152526
msgid "number of arguments must be 2, or 3"
25162527
msgstr ""
25172528

2518-
#: extmod/ulab/code/numerical.c
2529+
#: extmod/ulab/code/create.c
25192530
msgid "number of points must be at least 2"
25202531
msgstr ""
25212532

‎locale/de_DE.po

Lines changed: 16 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-02-27 11:02-0600\n"
10+
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -185,6 +185,10 @@ msgstr "'S' und 'O' sind keine unterstützten Formattypen"
185185
msgid "'align' requires 1 argument"
186186
msgstr "'align' erfordert genau ein Argument"
187187

188+
#: py/compile.c
189+
msgid "'async for' or 'async with' outside async function"
190+
msgstr ""
191+
188192
#: py/compile.c
189193
msgid "'await' outside function"
190194
msgstr "'await' außerhalb einer Funktion"
@@ -907,10 +911,13 @@ msgstr "Ungültiger Pin für rechten Kanal"
907911
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
908912
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
909913
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
910-
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
911914
msgid "Invalid pins"
912915
msgstr "Ungültige Pins"
913916

917+
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
918+
msgid "Invalid pins for PWMOut"
919+
msgstr ""
920+
914921
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
915922
msgid "Invalid polarity"
916923
msgstr "Ungültige Polarität"
@@ -1001,6 +1008,10 @@ msgstr "Muss eine %q Unterklasse sein."
10011008
msgid "Must provide MISO or MOSI pin"
10021009
msgstr ""
10031010

1011+
#: py/parse.c
1012+
msgid "Name too long"
1013+
msgstr ""
1014+
10041015
#: shared-bindings/_pixelbuf/PixelBuf.c
10051016
msgid "Negative step not supported"
10061017
msgstr ""
@@ -1184,7 +1195,7 @@ msgid "PulseIn not yet supported"
11841195
msgstr ""
11851196

11861197
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1187-
msgid "PulseOut not yet supported"
1198+
msgid "PulseOut not supported on this chip"
11881199
msgstr ""
11891200

11901201
#: ports/stm32f4/common-hal/os/__init__.c
@@ -2222,7 +2233,7 @@ msgstr ""
22222233
msgid "inline assembler must be a function"
22232234
msgstr "inline assembler muss eine function sein"
22242235

2225-
#: extmod/ulab/code/linalg.c
2236+
#: extmod/ulab/code/create.c
22262237
msgid "input argument must be an integer or a 2-tuple"
22272238
msgstr ""
22282239

@@ -2551,7 +2562,7 @@ msgstr ""
25512562
msgid "number of arguments must be 2, or 3"
25522563
msgstr ""
25532564

2554-
#: extmod/ulab/code/numerical.c
2565+
#: extmod/ulab/code/create.c
25552566
msgid "number of points must be at least 2"
25562567
msgstr ""
25572568

‎locale/en_US.po

Lines changed: 16 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-02-27 11:02-0600\n"
10+
"POT-Creation-Date: 2020-03-03 20:13-0600\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -183,6 +183,10 @@ msgstr ""
183183
msgid "'align' requires 1 argument"
184184
msgstr ""
185185

186+
#: py/compile.c
187+
msgid "'async for' or 'async with' outside async function"
188+
msgstr ""
189+
186190
#: py/compile.c
187191
msgid "'await' outside function"
188192
msgstr ""
@@ -899,10 +903,13 @@ msgstr ""
899903
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
900904
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
901905
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
902-
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
903906
msgid "Invalid pins"
904907
msgstr ""
905908

909+
#: ports/stm32f4/common-hal/pulseio/PWMOut.c
910+
msgid "Invalid pins for PWMOut"
911+
msgstr ""
912+
906913
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
907914
msgid "Invalid polarity"
908915
msgstr ""
@@ -992,6 +999,10 @@ msgstr ""
992999
msgid "Must provide MISO or MOSI pin"
9931000
msgstr ""
9941001

1002+
#: py/parse.c
1003+
msgid "Name too long"
1004+
msgstr ""
1005+
9951006
#: shared-bindings/_pixelbuf/PixelBuf.c
9961007
msgid "Negative step not supported"
9971008
msgstr ""
@@ -1167,7 +1178,7 @@ msgid "PulseIn not yet supported"
11671178
msgstr ""
11681179

11691180
#: ports/stm32f4/common-hal/pulseio/PulseOut.c
1170-
msgid "PulseOut not yet supported"
1181+
msgid "PulseOut not supported on this chip"
11711182
msgstr ""
11721183

11731184
#: ports/stm32f4/common-hal/os/__init__.c
@@ -2192,7 +2203,7 @@ msgstr ""
21922203
msgid "inline assembler must be a function"
21932204
msgstr ""
21942205

2195-
#: extmod/ulab/code/linalg.c
2206+
#: extmod/ulab/code/create.c
21962207
msgid "input argument must be an integer or a 2-tuple"
21972208
msgstr ""
21982209

@@ -2515,7 +2526,7 @@ msgstr ""
25152526
msgid "number of arguments must be 2, or 3"
25162527
msgstr ""
25172528

2518-
#: extmod/ulab/code/numerical.c
2529+
#: extmod/ulab/code/create.c
25192530
msgid "number of points must be at least 2"
25202531
msgstr ""
25212532

0 commit comments

Comments
 (0)