Skip to content

Commit a63f49c

Browse files
dhalbertdhalbert
authored
Merge pull request #2592 from tannewt/add_extra_ble_error
Add another error message to BLE
2 parents 06b4306 + 72a1bda commit a63f49c

File tree

14 files changed

+69
-13
lines changed

14 files changed

+69
-13
lines changed

‎locale/ID.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-0800\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"
@@ -676,6 +676,10 @@ msgstr ""
676676
msgid "Expected tuple of length %d, got %d"
677677
msgstr ""
678678

679+
#: ports/nrf/common-hal/_bleio/Adapter.c
680+
msgid "Extended advertisements with scan response not supported."
681+
msgstr ""
682+
679683
#: shared-bindings/ps2io/Ps2.c
680684
msgid "Failed sending command."
681685
msgstr ""

‎locale/circuitpython.pot

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-0800\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"
@@ -665,6 +665,10 @@ msgstr ""
665665
msgid "Expected tuple of length %d, got %d"
666666
msgstr ""
667667

668+
#: ports/nrf/common-hal/_bleio/Adapter.c
669+
msgid "Extended advertisements with scan response not supported."
670+
msgstr ""
671+
668672
#: shared-bindings/ps2io/Ps2.c
669673
msgid "Failed sending command."
670674
msgstr ""

‎locale/de_DE.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\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"
@@ -669,6 +669,10 @@ msgstr "Erwartet eine Adresse"
669669
msgid "Expected tuple of length %d, got %d"
670670
msgstr "Habe ein Tupel der Länge %d erwartet aber %d erhalten"
671671

672+
#: ports/nrf/common-hal/_bleio/Adapter.c
673+
msgid "Extended advertisements with scan response not supported."
674+
msgstr ""
675+
672676
#: shared-bindings/ps2io/Ps2.c
673677
msgid "Failed sending command."
674678
msgstr "Kommando nicht gesendet."

‎locale/en_US.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -665,6 +665,10 @@ msgstr ""
665665
msgid "Expected tuple of length %d, got %d"
666666
msgstr ""
667667

668+
#: ports/nrf/common-hal/_bleio/Adapter.c
669+
msgid "Extended advertisements with scan response not supported."
670+
msgstr ""
671+
668672
#: shared-bindings/ps2io/Ps2.c
669673
msgid "Failed sending command."
670674
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -669,6 +669,10 @@ msgstr ""
669669
msgid "Expected tuple of length %d, got %d"
670670
msgstr ""
671671

672+
#: ports/nrf/common-hal/_bleio/Adapter.c
673+
msgid "Extended advertisements with scan response not supported."
674+
msgstr ""
675+
672676
#: shared-bindings/ps2io/Ps2.c
673677
msgid "Failed sending command."
674678
msgstr ""

‎locale/es.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -671,6 +671,10 @@ msgstr ""
671671
msgid "Expected tuple of length %d, got %d"
672672
msgstr "Se esperaba un tuple de %d, se obtuvo %d"
673673

674+
#: ports/nrf/common-hal/_bleio/Adapter.c
675+
msgid "Extended advertisements with scan response not supported."
676+
msgstr ""
677+
674678
#: shared-bindings/ps2io/Ps2.c
675679
msgid "Failed sending command."
676680
msgstr "Fallo enviando comando"

‎locale/fil.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <[email protected]>\n"
1313
"Language-Team: fil\n"
@@ -679,6 +679,10 @@ msgstr ""
679679
msgid "Expected tuple of length %d, got %d"
680680
msgstr ""
681681

682+
#: ports/nrf/common-hal/_bleio/Adapter.c
683+
msgid "Extended advertisements with scan response not supported."
684+
msgstr ""
685+
682686
#: shared-bindings/ps2io/Ps2.c
683687
msgid "Failed sending command."
684688
msgstr ""

‎locale/fr.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: 0.1\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1212
"PO-Revision-Date: 2019-04-14 20:05+0100\n"
1313
"Last-Translator: Pierrick Couturier <[email protected]>\n"
1414
"Language-Team: fr\n"
@@ -682,6 +682,10 @@ msgstr ""
682682
msgid "Expected tuple of length %d, got %d"
683683
msgstr "Tuple de longueur %d attendu, obtenu %d"
684684

685+
#: ports/nrf/common-hal/_bleio/Adapter.c
686+
msgid "Extended advertisements with scan response not supported."
687+
msgstr ""
688+
685689
#: shared-bindings/ps2io/Ps2.c
686690
msgid "Failed sending command."
687691
msgstr ""

‎locale/it_IT.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <[email protected]>\n"
1414
"Language-Team: \n"
@@ -679,6 +679,10 @@ msgstr ""
679679
msgid "Expected tuple of length %d, got %d"
680680
msgstr ""
681681

682+
#: ports/nrf/common-hal/_bleio/Adapter.c
683+
msgid "Extended advertisements with scan response not supported."
684+
msgstr ""
685+
682686
#: shared-bindings/ps2io/Ps2.c
683687
msgid "Failed sending command."
684688
msgstr ""

‎locale/ko.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1212
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
1313
"Last-Translator: \n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -669,6 +669,10 @@ msgstr ""
669669
msgid "Expected tuple of length %d, got %d"
670670
msgstr ""
671671

672+
#: ports/nrf/common-hal/_bleio/Adapter.c
673+
msgid "Extended advertisements with scan response not supported."
674+
msgstr ""
675+
672676
#: shared-bindings/ps2io/Ps2.c
673677
msgid "Failed sending command."
674678
msgstr ""

‎locale/pl.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2019-03-19 18:37-0700\n"
1212
"Last-Translator: Radomir Dopieralski <[email protected]>\n"
1313
"Language-Team: pl\n"
@@ -668,6 +668,10 @@ msgstr ""
668668
msgid "Expected tuple of length %d, got %d"
669669
msgstr "Oczekiwano krotkę długości %d, otrzymano %d"
670670

671+
#: ports/nrf/common-hal/_bleio/Adapter.c
672+
msgid "Extended advertisements with scan response not supported."
673+
msgstr ""
674+
671675
#: shared-bindings/ps2io/Ps2.c
672676
msgid "Failed sending command."
673677
msgstr ""

‎locale/pt_BR.po

Lines changed: 5 additions & 1 deletion
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-03 23:41-0500\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1212
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -674,6 +674,10 @@ msgstr ""
674674
msgid "Expected tuple of length %d, got %d"
675675
msgstr ""
676676

677+
#: ports/nrf/common-hal/_bleio/Adapter.c
678+
msgid "Extended advertisements with scan response not supported."
679+
msgstr ""
680+
677681
#: shared-bindings/ps2io/Ps2.c
678682
msgid "Failed sending command."
679683
msgstr "Falha ao enviar comando."

‎locale/zh_Latn_pinyin.po

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: circuitpython-cn\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2019-04-13 10:10-0700\n"
1212
"Last-Translator: hexthat\n"
1313
"Language-Team: Chinese Hanyu Pinyin\n"
@@ -669,6 +669,10 @@ msgstr "Qídài yīgè dìzhǐ"
669669
msgid "Expected tuple of length %d, got %d"
670670
msgstr "Qīwàng de chángdù wèi %d de yuán zǔ, dédào %d"
671671

672+
#: ports/nrf/common-hal/_bleio/Adapter.c
673+
msgid "Extended advertisements with scan response not supported."
674+
msgstr ""
675+
672676
#: shared-bindings/ps2io/Ps2.c
673677
msgid "Failed sending command."
674678
msgstr "Fāsòng mìnglìng shībài."

‎ports/nrf/common-hal/_bleio/Adapter.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,6 +646,10 @@ void common_hal_bleio_adapter_start_advertising(bleio_adapter_obj_t *self, bool
646646

647647
check_data_fit(advertising_data_bufinfo->len, connectable);
648648
check_data_fit(scan_response_data_bufinfo->len, connectable);
649+
650+
if (advertising_data_bufinfo->len > 31 && scan_response_data_bufinfo->len > 0) {
651+
mp_raise_bleio_BluetoothError(translate("Extended advertisements with scan response not supported."));
652+
}
649653
// The advertising data buffers must not move, because the SoftDevice depends on them.
650654
// So make them long-lived and reuse them onwards.
651655
if (self->advertising_data == NULL) {

0 commit comments

Comments
 (0)