Skip to content

Commit 575b2e6

Browse files
jensechujensechu
authored
Merge branch 'main' into color-converter-transparency
2 parents 74c07a4 + f0b3731 commit 575b2e6

70 files changed

Lines changed: 1041 additions & 146 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.

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ jobs:
180180
- "arduino_zero"
181181
- "bast_pro_mini_m0"
182182
- "bdmicro_vina_d21"
183+
- "bdmicro_vina_d51"
183184
- "bless_dev_board_multi_sensor"
184185
- "blm_badge"
185186
- "capablerobot_usbhub"
@@ -197,6 +198,8 @@ jobs:
197198
- "datum_imu"
198199
- "datum_light"
199200
- "datum_weather"
201+
- "dynossat_edu_eps"
202+
- "dynossat_edu_obc"
200203
- "electronut_labs_blip"
201204
- "electronut_labs_papyr"
202205
- "escornabot_makech"

‎devices/ble_hci/common-hal/_bleio/Adapter.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "shared-bindings/_bleio/Address.h"
4646
#include "shared-bindings/_bleio/Characteristic.h"
4747
#include "shared-bindings/_bleio/Service.h"
48-
#include "shared-bindings/nvm/ByteArray.h"
4948
#include "shared-bindings/_bleio/Connection.h"
5049
#include "shared-bindings/_bleio/ScanEntry.h"
5150
#include "shared-bindings/time/__init__.h"

‎devices/ble_hci/common-hal/_bleio/hci_include/att_internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include <stdbool.h>
1313
// for __packed
14-
#include <string.h>
14+
#include <sys/cdefs.h>
1515

1616
#define BT_EATT_PSM 0x27
1717
#define BT_ATT_DEFAULT_LE_MTU 23

‎devices/ble_hci/common-hal/_bleio/hci_include/hci.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@
1212
#define ZEPHYR_INCLUDE_BLUETOOTH_HCI_H_
1313

1414
#include <stdbool.h>
15-
#include <string.h>
15+
// for __packed
16+
#include <sys/cdefs.h>
17+
1618
#include "addr.h"
1719

20+
// ESP32S2 build environment defines this already.
21+
#ifndef BIT
1822
#define BIT(n) (1UL << (n))
23+
#endif
1924

2025
/* Special own address types for LL privacy (used in adv & scan parameters) */
2126
#define BT_HCI_OWN_ADDR_RPA_OR_PUBLIC 0x02

‎locale/ID.po‎

Lines changed: 24 additions & 4 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-10-06 13:26-0400\n"
8+
"POT-Creation-Date: 2020-10-15 16:06+0530\n"
99
"PO-Revision-Date: 2020-10-10 23:51+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -250,6 +250,10 @@ msgstr "'label' membutuhkan 1 argumen"
250250
msgid "'return' outside function"
251251
msgstr "'return' diluar fungsi"
252252

253+
#: py/compile.c
254+
msgid "'yield from' inside async function"
255+
msgstr ""
256+
253257
#: py/compile.c
254258
msgid "'yield' outside function"
255259
msgstr "'yield' diluar fungsi"
@@ -293,6 +297,7 @@ msgid "All I2C peripherals are in use"
293297
msgstr "Semua perangkat I2C sedang digunakan"
294298

295299
#: ports/atmel-samd/common-hal/canio/Listener.c
300+
#: ports/stm/common-hal/canio/Listener.c
296301
msgid "All RX FIFOs in use"
297302
msgstr ""
298303

@@ -914,6 +919,7 @@ msgid "File exists"
914919
msgstr "File sudah ada"
915920

916921
#: ports/atmel-samd/common-hal/canio/Listener.c
922+
#: ports/stm/common-hal/canio/Listener.c
917923
msgid "Filters too complex"
918924
msgstr ""
919925

@@ -951,14 +957,19 @@ msgid "Group full"
951957
msgstr "Grup penuh"
952958

953959
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
954-
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/sdioio/SDCard.c
960+
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
961+
#: ports/stm/common-hal/sdioio/SDCard.c
955962
msgid "Hardware busy, try alternative pins"
956963
msgstr "Perangkat keras sibuk, coba pin alternatif"
957964

958965
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
959966
msgid "Hardware in use, try alternative pins"
960967
msgstr "Perangkat keras sedang digunakan, coba pin alternatif"
961968

969+
#: shared-bindings/wifi/Radio.c
970+
msgid "Hostname must be between 1 and 253 characters"
971+
msgstr ""
972+
962973
#: extmod/vfs_posix_file.c py/objstringio.c
963974
msgid "I/O operation on closed file"
964975
msgstr "operasi I/O pada file tertutup"
@@ -1023,7 +1034,8 @@ msgid "Invalid %q pin"
10231034
msgstr "%q pada tidak valid"
10241035

10251036
#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c
1026-
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/sdioio/SDCard.c
1037+
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c
1038+
#: ports/stm/common-hal/sdioio/SDCard.c
10271039
msgid "Invalid %q pin selection"
10281040
msgstr ""
10291041

@@ -1039,6 +1051,7 @@ msgstr "File BMP tidak valid"
10391051
msgid "Invalid BSSID"
10401052
msgstr ""
10411053

1054+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
10421055
#: ports/stm/common-hal/analogio/AnalogOut.c
10431056
msgid "Invalid DAC pin supplied"
10441057
msgstr "Pin DAC yang diberikan tidak valid"
@@ -1250,7 +1263,6 @@ msgid "No CCCD for this Characteristic"
12501263
msgstr "Tidak ada CCCD untuk Karakteristik ini"
12511264

12521265
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1253-
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12541266
#: ports/stm/common-hal/analogio/AnalogOut.c
12551267
msgid "No DAC on chip"
12561268
msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
@@ -2767,6 +2779,10 @@ msgstr "format tidak valid"
27672779
msgid "invalid format specifier"
27682780
msgstr ""
27692781

2782+
#: shared-bindings/wifi/Radio.c
2783+
msgid "invalid hostname"
2784+
msgstr ""
2785+
27702786
#: extmod/modussl_axtls.c
27712787
msgid "invalid key"
27722788
msgstr "key tidak valid"
@@ -3475,6 +3491,10 @@ msgstr ""
34753491
msgid "type object '%q' has no attribute '%q'"
34763492
msgstr ""
34773493

3494+
#: py/objgenerator.c
3495+
msgid "type object 'generator' has no attribute '__await__'"
3496+
msgstr ""
3497+
34783498
#: py/objtype.c
34793499
msgid "type takes 1 or 3 arguments"
34803500
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,10 @@ msgstr ""
947947
msgid "Hardware in use, try alternative pins"
948948
msgstr ""
949949

950+
#: shared-bindings/wifi/Radio.c
951+
msgid "Hostname must be between 1 and 253 characters"
952+
msgstr ""
953+
950954
#: extmod/vfs_posix_file.c py/objstringio.c
951955
msgid "I/O operation on closed file"
952956
msgstr ""
@@ -2732,6 +2736,10 @@ msgstr ""
27322736
msgid "invalid format specifier"
27332737
msgstr ""
27342738

2739+
#: shared-bindings/wifi/Radio.c
2740+
msgid "invalid hostname"
2741+
msgstr ""
2742+
27352743
#: extmod/modussl_axtls.c
27362744
msgid "invalid key"
27372745
msgstr ""

‎locale/cs.po‎

Lines changed: 24 additions & 4 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-10-06 13:26-0400\n"
8+
"POT-Creation-Date: 2020-10-15 16:06+0530\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"
@@ -250,6 +250,10 @@ msgstr ""
250250
msgid "'return' outside function"
251251
msgstr ""
252252

253+
#: py/compile.c
254+
msgid "'yield from' inside async function"
255+
msgstr ""
256+
253257
#: py/compile.c
254258
msgid "'yield' outside function"
255259
msgstr ""
@@ -293,6 +297,7 @@ msgid "All I2C peripherals are in use"
293297
msgstr ""
294298

295299
#: ports/atmel-samd/common-hal/canio/Listener.c
300+
#: ports/stm/common-hal/canio/Listener.c
296301
msgid "All RX FIFOs in use"
297302
msgstr ""
298303

@@ -900,6 +905,7 @@ msgid "File exists"
900905
msgstr ""
901906

902907
#: ports/atmel-samd/common-hal/canio/Listener.c
908+
#: ports/stm/common-hal/canio/Listener.c
903909
msgid "Filters too complex"
904910
msgstr ""
905911

@@ -936,14 +942,19 @@ msgid "Group full"
936942
msgstr ""
937943

938944
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
939-
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/sdioio/SDCard.c
945+
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
946+
#: ports/stm/common-hal/sdioio/SDCard.c
940947
msgid "Hardware busy, try alternative pins"
941948
msgstr ""
942949

943950
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
944951
msgid "Hardware in use, try alternative pins"
945952
msgstr ""
946953

954+
#: shared-bindings/wifi/Radio.c
955+
msgid "Hostname must be between 1 and 253 characters"
956+
msgstr ""
957+
947958
#: extmod/vfs_posix_file.c py/objstringio.c
948959
msgid "I/O operation on closed file"
949960
msgstr ""
@@ -1006,7 +1017,8 @@ msgid "Invalid %q pin"
10061017
msgstr ""
10071018

10081019
#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c
1009-
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/sdioio/SDCard.c
1020+
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c
1021+
#: ports/stm/common-hal/sdioio/SDCard.c
10101022
msgid "Invalid %q pin selection"
10111023
msgstr ""
10121024

@@ -1022,6 +1034,7 @@ msgstr ""
10221034
msgid "Invalid BSSID"
10231035
msgstr ""
10241036

1037+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
10251038
#: ports/stm/common-hal/analogio/AnalogOut.c
10261039
msgid "Invalid DAC pin supplied"
10271040
msgstr ""
@@ -1233,7 +1246,6 @@ msgid "No CCCD for this Characteristic"
12331246
msgstr ""
12341247

12351248
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1236-
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12371249
#: ports/stm/common-hal/analogio/AnalogOut.c
12381250
msgid "No DAC on chip"
12391251
msgstr ""
@@ -2724,6 +2736,10 @@ msgstr ""
27242736
msgid "invalid format specifier"
27252737
msgstr ""
27262738

2739+
#: shared-bindings/wifi/Radio.c
2740+
msgid "invalid hostname"
2741+
msgstr ""
2742+
27272743
#: extmod/modussl_axtls.c
27282744
msgid "invalid key"
27292745
msgstr ""
@@ -3430,6 +3446,10 @@ msgstr ""
34303446
msgid "type object '%q' has no attribute '%q'"
34313447
msgstr ""
34323448

3449+
#: py/objgenerator.c
3450+
msgid "type object 'generator' has no attribute '__await__'"
3451+
msgstr ""
3452+
34333453
#: py/objtype.c
34343454
msgid "type takes 1 or 3 arguments"
34353455
msgstr ""

‎locale/de_DE.po‎

Lines changed: 24 additions & 4 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-10-06 13:26-0400\n"
8+
"POT-Creation-Date: 2020-10-15 16:06+0530\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"
@@ -249,6 +249,10 @@ msgstr "'label' erfordert genau ein Argument"
249249
msgid "'return' outside function"
250250
msgstr "'return' außerhalb einer Funktion"
251251

252+
#: py/compile.c
253+
msgid "'yield from' inside async function"
254+
msgstr ""
255+
252256
#: py/compile.c
253257
msgid "'yield' outside function"
254258
msgstr "'yield' außerhalb einer Funktion"
@@ -292,6 +296,7 @@ msgid "All I2C peripherals are in use"
292296
msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
293297

294298
#: ports/atmel-samd/common-hal/canio/Listener.c
299+
#: ports/stm/common-hal/canio/Listener.c
295300
msgid "All RX FIFOs in use"
296301
msgstr ""
297302

@@ -911,6 +916,7 @@ msgid "File exists"
911916
msgstr "Datei existiert"
912917

913918
#: ports/atmel-samd/common-hal/canio/Listener.c
919+
#: ports/stm/common-hal/canio/Listener.c
914920
msgid "Filters too complex"
915921
msgstr ""
916922

@@ -951,14 +957,19 @@ msgid "Group full"
951957
msgstr "Gruppe voll"
952958

953959
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/I2C.c
954-
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/sdioio/SDCard.c
960+
#: ports/stm/common-hal/busio/SPI.c ports/stm/common-hal/canio/CAN.c
961+
#: ports/stm/common-hal/sdioio/SDCard.c
955962
msgid "Hardware busy, try alternative pins"
956963
msgstr "Hardware beschäftigt, versuchen Sie alternative Pins"
957964

958965
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
959966
msgid "Hardware in use, try alternative pins"
960967
msgstr "Hardware in benutzung, probiere alternative Pins"
961968

969+
#: shared-bindings/wifi/Radio.c
970+
msgid "Hostname must be between 1 and 253 characters"
971+
msgstr ""
972+
962973
#: extmod/vfs_posix_file.c py/objstringio.c
963974
msgid "I/O operation on closed file"
964975
msgstr "Lese/Schreibe-operation an geschlossener Datei"
@@ -1023,7 +1034,8 @@ msgid "Invalid %q pin"
10231034
msgstr "Ungültiger %q pin"
10241035

10251036
#: ports/stm/common-hal/busio/I2C.c ports/stm/common-hal/busio/SPI.c
1026-
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/sdioio/SDCard.c
1037+
#: ports/stm/common-hal/busio/UART.c ports/stm/common-hal/canio/CAN.c
1038+
#: ports/stm/common-hal/sdioio/SDCard.c
10271039
msgid "Invalid %q pin selection"
10281040
msgstr ""
10291041

@@ -1039,6 +1051,7 @@ msgstr "Ungültige BMP-Datei"
10391051
msgid "Invalid BSSID"
10401052
msgstr ""
10411053

1054+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
10421055
#: ports/stm/common-hal/analogio/AnalogOut.c
10431056
msgid "Invalid DAC pin supplied"
10441057
msgstr "Ungültiger DAC-Pin angegeben"
@@ -1252,7 +1265,6 @@ msgid "No CCCD for this Characteristic"
12521265
msgstr "Kein CCCD für diese Charakteristik"
12531266

12541267
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1255-
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12561268
#: ports/stm/common-hal/analogio/AnalogOut.c
12571269
msgid "No DAC on chip"
12581270
msgstr "Kein DAC im Chip vorhanden"
@@ -2795,6 +2807,10 @@ msgstr "ungültiges Format"
27952807
msgid "invalid format specifier"
27962808
msgstr "ungültiger Formatbezeichner"
27972809

2810+
#: shared-bindings/wifi/Radio.c
2811+
msgid "invalid hostname"
2812+
msgstr ""
2813+
27982814
#: extmod/modussl_axtls.c
27992815
msgid "invalid key"
28002816
msgstr "ungültiger Schlüssel"
@@ -3514,6 +3530,10 @@ msgstr "Typ ist kein akzeptierter Basis-Typ"
35143530
msgid "type object '%q' has no attribute '%q'"
35153531
msgstr "Typ vom Objekt '%q' hat kein Attribut '%q'"
35163532

3533+
#: py/objgenerator.c
3534+
msgid "type object 'generator' has no attribute '__await__'"
3535+
msgstr ""
3536+
35173537
#: py/objtype.c
35183538
msgid "type takes 1 or 3 arguments"
35193539
msgstr "Typ akzeptiert 1 oder 3 Argumente"

0 commit comments

Comments
 (0)