Skip to content

Commit 4e5df0e

Browse files
tannewttannewt
authored
Merge pull request #2919 from simmel-project/bleio-anonymous-advertising
_bleio: support anonymous advertising
2 parents 2c2b533 + c1bcc25 commit 4e5df0e

File tree

20 files changed

+200
-26
lines changed

20 files changed

+200
-26
lines changed

‎locale/ID.po

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1489,6 +1489,11 @@ msgstr ""
14891489
msgid "Tile width must exactly divide bitmap width"
14901490
msgstr ""
14911491

1492+
#: ports/nrf/common-hal/_bleio/Adapter.c
1493+
#, c-format
1494+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1495+
msgstr ""
1496+
14921497
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14931498
msgid "Too many channels in sample."
14941499
msgstr "Terlalu banyak channel dalam sampel"

‎locale/circuitpython.pot

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1473,6 +1473,11 @@ msgstr ""
14731473
msgid "Tile width must exactly divide bitmap width"
14741474
msgstr ""
14751475

1476+
#: ports/nrf/common-hal/_bleio/Adapter.c
1477+
#, c-format
1478+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1479+
msgstr ""
1480+
14761481
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14771482
msgid "Too many channels in sample."
14781483
msgstr ""

‎locale/cs.po

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1473,6 +1473,11 @@ msgstr ""
14731473
msgid "Tile width must exactly divide bitmap width"
14741474
msgstr ""
14751475

1476+
#: ports/nrf/common-hal/_bleio/Adapter.c
1477+
#, c-format
1478+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1479+
msgstr ""
1480+
14761481
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14771482
msgid "Too many channels in sample."
14781483
msgstr ""

‎locale/de_DE.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-05-18 02:48+0000\n"
1212
"Last-Translator: Jeff Epler <[email protected]>\n"
1313
"Language-Team: German <https://later.unpythonic.net/projects/circuitpython/"
@@ -1499,6 +1499,11 @@ msgstr ""
14991499
msgid "Tile width must exactly divide bitmap width"
15001500
msgstr ""
15011501

1502+
#: ports/nrf/common-hal/_bleio/Adapter.c
1503+
#, c-format
1504+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1505+
msgstr ""
1506+
15021507
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15031508
msgid "Too many channels in sample."
15041509
msgstr "Zu viele Kanäle im sample"

‎locale/en_US.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1473,6 +1473,11 @@ msgstr ""
14731473
msgid "Tile width must exactly divide bitmap width"
14741474
msgstr ""
14751475

1476+
#: ports/nrf/common-hal/_bleio/Adapter.c
1477+
#, c-format
1478+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1479+
msgstr ""
1480+
14761481
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14771482
msgid "Too many channels in sample."
14781483
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-03-30 22:11+0000\n"
1212
"Last-Translator: Tannewt <[email protected]>\n"
1313
"Language-Team: English <https://later.unpythonic.net/projects/circuitpython/"
@@ -1482,6 +1482,11 @@ msgstr ""
14821482
msgid "Tile width must exactly divide bitmap width"
14831483
msgstr ""
14841484

1485+
#: ports/nrf/common-hal/_bleio/Adapter.c
1486+
#, c-format
1487+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1488+
msgstr ""
1489+
14851490
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14861491
msgid "Too many channels in sample."
14871492
msgstr ""

‎locale/es.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1212
"Last-Translator: Jeff Epler <[email protected]>\n"
1313
"Language-Team: \n"
@@ -1491,6 +1491,11 @@ msgstr ""
14911491
msgid "Tile width must exactly divide bitmap width"
14921492
msgstr "Ancho del Tile debe dividir exactamente el ancho de mapa de bits"
14931493

1494+
#: ports/nrf/common-hal/_bleio/Adapter.c
1495+
#, c-format
1496+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1497+
msgstr ""
1498+
14941499
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14951500
msgid "Too many channels in sample."
14961501
msgstr "Demasiados canales en sample."

‎locale/fil.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1496,6 +1496,11 @@ msgstr ""
14961496
msgid "Tile width must exactly divide bitmap width"
14971497
msgstr ""
14981498

1499+
#: ports/nrf/common-hal/_bleio/Adapter.c
1500+
#, c-format
1501+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1502+
msgstr ""
1503+
14991504
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15001505
msgid "Too many channels in sample."
15011506
msgstr "Sobra ang channels sa sample."

‎locale/fr.po

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1212
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1313
"Last-Translator: Anonymous <[email protected]>\n"
1414
"Language-Team: French <https://later.unpythonic.net/projects/circuitpython/"
@@ -1526,6 +1526,11 @@ msgstr "Valeur de tuile hors limites"
15261526
msgid "Tile width must exactly divide bitmap width"
15271527
msgstr "La largeur de la tuile doit diviser exactement la largeur de l'image"
15281528

1529+
#: ports/nrf/common-hal/_bleio/Adapter.c
1530+
#, c-format
1531+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1532+
msgstr ""
1533+
15291534
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15301535
msgid "Too many channels in sample."
15311536
msgstr "Trop de canaux dans l'échantillon."

‎locale/it_IT.po

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1507,6 +1507,11 @@ msgstr ""
15071507
msgid "Tile width must exactly divide bitmap width"
15081508
msgstr ""
15091509

1510+
#: ports/nrf/common-hal/_bleio/Adapter.c
1511+
#, c-format
1512+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1513+
msgstr ""
1514+
15101515
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15111516
msgid "Too many channels in sample."
15121517
msgstr ""

‎locale/ko.po

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1212
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
1313
"Last-Translator: \n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1477,6 +1477,11 @@ msgstr ""
14771477
msgid "Tile width must exactly divide bitmap width"
14781478
msgstr ""
14791479

1480+
#: ports/nrf/common-hal/_bleio/Adapter.c
1481+
#, c-format
1482+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1483+
msgstr ""
1484+
14801485
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14811486
msgid "Too many channels in sample."
14821487
msgstr ""

‎locale/pl.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1478,6 +1478,11 @@ msgstr ""
14781478
msgid "Tile width must exactly divide bitmap width"
14791479
msgstr "Szerokość bitmapy musi być wielokrotnością szerokości kafelka"
14801480

1481+
#: ports/nrf/common-hal/_bleio/Adapter.c
1482+
#, c-format
1483+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1484+
msgstr ""
1485+
14811486
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14821487
msgid "Too many channels in sample."
14831488
msgstr "Zbyt wiele kanałów."

‎locale/pt_BR.po

Lines changed: 6 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-05-18 13:32-0700\n"
11+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1212
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -1490,6 +1490,11 @@ msgstr ""
14901490
msgid "Tile width must exactly divide bitmap width"
14911491
msgstr ""
14921492

1493+
#: ports/nrf/common-hal/_bleio/Adapter.c
1494+
#, c-format
1495+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1496+
msgstr ""
1497+
14931498
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14941499
msgid "Too many channels in sample."
14951500
msgstr "Muitos canais na amostra."

‎locale/sv.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+0800\n"
1111
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1212
"Last-Translator: Anonymous <[email protected]>\n"
1313
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1512,6 +1512,11 @@ msgstr "Tile-värde utanför intervall"
15121512
msgid "Tile width must exactly divide bitmap width"
15131513
msgstr "Tile-bredd måste vara jämnt delbar med bredd på bitmap"
15141514

1515+
#: ports/nrf/common-hal/_bleio/Adapter.c
1516+
#, c-format
1517+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1518+
msgstr ""
1519+
15151520
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15161521
msgid "Too many channels in sample."
15171522
msgstr "För många kanaler i sampling."

‎locale/zh_Latn_pinyin.po

Lines changed: 6 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-05-18 13:32-0700\n"
10+
"POT-Creation-Date: 2020-05-19 15:01+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"
@@ -1499,6 +1499,11 @@ msgstr "Píng pū zhí chāochū fànwéi"
14991499
msgid "Tile width must exactly divide bitmap width"
15001500
msgstr "Píng pū kuāndù bìxū huàfēn wèi tú kuāndù"
15011501

1502+
#: ports/nrf/common-hal/_bleio/Adapter.c
1503+
#, c-format
1504+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1505+
msgstr ""
1506+
15021507
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15031508
msgid "Too many channels in sample."
15041509
msgstr "Chōuyàng zhōng de píndào tài duō."

‎ports/nrf/bluetooth/ble_drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141

4242
#define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
4343
#define SEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000000) / (RESOLUTION))
44+
#define UNITS_TO_SEC(TIME, RESOLUTION) (((TIME) * (RESOLUTION)) / 1000000)
4445
// 0.625 msecs (625 usecs)
4546
#define ADV_INTERVAL_UNIT_FLOAT_SECS (0.000625)
4647
// Microseconds is the base unit. The macros above know that.

0 commit comments

Comments
 (0)