Skip to content

Commit 3856da9

Browse files
authored
Merge pull request #32 from adafruit/main
Update from adafruit/main
2 parents 5f3ef9f + f8d37c0 commit 3856da9

File tree

63 files changed

+728
-201
lines changed

Some content is hidden

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

63 files changed

+728
-201
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ jobs:
198198
- "datum_imu"
199199
- "datum_light"
200200
- "datum_weather"
201+
- "dynossat_edu_eps"
202+
- "dynossat_edu_obc"
201203
- "electronut_labs_blip"
202204
- "electronut_labs_papyr"
203205
- "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: 10 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-10-10 23:49-0700\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 <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -966,6 +966,10 @@ msgstr "Perangkat keras sibuk, coba pin alternatif"
966966
msgid "Hardware in use, try alternative pins"
967967
msgstr "Perangkat keras sedang digunakan, coba pin alternatif"
968968

969+
#: shared-bindings/wifi/Radio.c
970+
msgid "Hostname must be between 1 and 253 characters"
971+
msgstr ""
972+
969973
#: extmod/vfs_posix_file.c py/objstringio.c
970974
msgid "I/O operation on closed file"
971975
msgstr "operasi I/O pada file tertutup"
@@ -1047,6 +1051,7 @@ msgstr "File BMP tidak valid"
10471051
msgid "Invalid BSSID"
10481052
msgstr ""
10491053

1054+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
10501055
#: ports/stm/common-hal/analogio/AnalogOut.c
10511056
msgid "Invalid DAC pin supplied"
10521057
msgstr "Pin DAC yang diberikan tidak valid"
@@ -1258,7 +1263,6 @@ msgid "No CCCD for this Characteristic"
12581263
msgstr "Tidak ada CCCD untuk Karakteristik ini"
12591264

12601265
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1261-
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12621266
#: ports/stm/common-hal/analogio/AnalogOut.c
12631267
msgid "No DAC on chip"
12641268
msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
@@ -2775,6 +2779,10 @@ msgstr "format tidak valid"
27752779
msgid "invalid format specifier"
27762780
msgstr ""
27772781

2782+
#: shared-bindings/wifi/Radio.c
2783+
msgid "invalid hostname"
2784+
msgstr ""
2785+
27782786
#: extmod/modussl_axtls.c
27792787
msgid "invalid key"
27802788
msgstr "key tidak valid"

locale/circuitpython.pot

Lines changed: 10 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-10-10 23:49-0700\n"
11+
"POT-Creation-Date: 2020-10-15 16:06+0530\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"
@@ -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 ""
@@ -1026,6 +1030,7 @@ msgstr ""
10261030
msgid "Invalid BSSID"
10271031
msgstr ""
10281032

1033+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
10291034
#: ports/stm/common-hal/analogio/AnalogOut.c
10301035
msgid "Invalid DAC pin supplied"
10311036
msgstr ""
@@ -1237,7 +1242,6 @@ msgid "No CCCD for this Characteristic"
12371242
msgstr ""
12381243

12391244
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1240-
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12411245
#: ports/stm/common-hal/analogio/AnalogOut.c
12421246
msgid "No DAC on chip"
12431247
msgstr ""
@@ -2728,6 +2732,10 @@ msgstr ""
27282732
msgid "invalid format specifier"
27292733
msgstr ""
27302734

2735+
#: shared-bindings/wifi/Radio.c
2736+
msgid "invalid hostname"
2737+
msgstr ""
2738+
27312739
#: extmod/modussl_axtls.c
27322740
msgid "invalid key"
27332741
msgstr ""

locale/cs.po

Lines changed: 10 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-10-10 23:49-0700\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 <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -951,6 +951,10 @@ msgstr ""
951951
msgid "Hardware in use, try alternative pins"
952952
msgstr ""
953953

954+
#: shared-bindings/wifi/Radio.c
955+
msgid "Hostname must be between 1 and 253 characters"
956+
msgstr ""
957+
954958
#: extmod/vfs_posix_file.c py/objstringio.c
955959
msgid "I/O operation on closed file"
956960
msgstr ""
@@ -1030,6 +1034,7 @@ msgstr ""
10301034
msgid "Invalid BSSID"
10311035
msgstr ""
10321036

1037+
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
10331038
#: ports/stm/common-hal/analogio/AnalogOut.c
10341039
msgid "Invalid DAC pin supplied"
10351040
msgstr ""
@@ -1241,7 +1246,6 @@ msgid "No CCCD for this Characteristic"
12411246
msgstr ""
12421247

12431248
#: ports/atmel-samd/common-hal/analogio/AnalogOut.c
1244-
#: ports/esp32s2/common-hal/analogio/AnalogOut.c
12451249
#: ports/stm/common-hal/analogio/AnalogOut.c
12461250
msgid "No DAC on chip"
12471251
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 ""

0 commit comments

Comments
 (0)