Skip to content

Commit d79b0a6

Browse files
dhalbertdhalbert
authored
Merge pull request #1232 from platipo/master
Fix 'advertisement' typo
2 parents da48fc9 + 4b90993 commit d79b0a6

File tree

11 files changed

+49
-49
lines changed

11 files changed

+49
-49
lines changed

Diff for: ‎locale/circuitpython.pot

+5-5
Original file line numberDiff line numberDiff line change
@@ -751,27 +751,27 @@ msgstr ""
751751

752752
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
753753
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
754-
msgid "Can encode UUID into the advertisment packet."
754+
msgid "Can encode UUID into the advertisement packet."
755755
msgstr ""
756756

757757
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
758-
msgid "Can not fit data into the advertisment packet."
758+
msgid "Can not fit data into the advertisement packet."
759759
msgstr ""
760760

761761
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
762762
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
763763
#, c-format
764-
msgid "Can not apply advertisment data. status: 0x%02x"
764+
msgid "Can not apply advertisement data. status: 0x%02x"
765765
msgstr ""
766766

767767
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
768768
#, c-format
769-
msgid "Can not start advertisment. status: 0x%02x"
769+
msgid "Can not start advertisement. status: 0x%02x"
770770
msgstr ""
771771

772772
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
773773
#, c-format
774-
msgid "Can not stop advertisment. status: 0x%02x"
774+
msgid "Can not stop advertisement. status: 0x%02x"
775775
msgstr ""
776776

777777
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

Diff for: ‎locale/de_DE.po

+5-5
Original file line numberDiff line numberDiff line change
@@ -762,27 +762,27 @@ msgstr ""
762762

763763
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
764764
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
765-
msgid "Can encode UUID into the advertisment packet."
765+
msgid "Can encode UUID into the advertisement packet."
766766
msgstr ""
767767

768768
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
769-
msgid "Can not fit data into the advertisment packet."
769+
msgid "Can not fit data into the advertisement packet."
770770
msgstr ""
771771

772772
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
773773
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
774774
#, c-format
775-
msgid "Can not apply advertisment data. status: 0x%02x"
775+
msgid "Can not apply advertisement data. status: 0x%02x"
776776
msgstr ""
777777

778778
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
779779
#, c-format
780-
msgid "Can not start advertisment. status: 0x%02x"
780+
msgid "Can not start advertisement. status: 0x%02x"
781781
msgstr ""
782782

783783
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
784784
#, c-format
785-
msgid "Can not stop advertisment. status: 0x%02x"
785+
msgid "Can not stop advertisement. status: 0x%02x"
786786
msgstr ""
787787

788788
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

Diff for: ‎locale/en_US.po

+5-5
Original file line numberDiff line numberDiff line change
@@ -751,27 +751,27 @@ msgstr ""
751751

752752
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
753753
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
754-
msgid "Can encode UUID into the advertisment packet."
754+
msgid "Can encode UUID into the advertisement packet."
755755
msgstr ""
756756

757757
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
758-
msgid "Can not fit data into the advertisment packet."
758+
msgid "Can not fit data into the advertisement packet."
759759
msgstr ""
760760

761761
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
762762
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
763763
#, c-format
764-
msgid "Can not apply advertisment data. status: 0x%02x"
764+
msgid "Can not apply advertisement data. status: 0x%02x"
765765
msgstr ""
766766

767767
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
768768
#, c-format
769-
msgid "Can not start advertisment. status: 0x%02x"
769+
msgid "Can not start advertisement. status: 0x%02x"
770770
msgstr ""
771771

772772
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
773773
#, c-format
774-
msgid "Can not stop advertisment. status: 0x%02x"
774+
msgid "Can not stop advertisement. status: 0x%02x"
775775
msgstr ""
776776

777777
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

Diff for: ‎locale/es.po

+5-5
Original file line numberDiff line numberDiff line change
@@ -767,27 +767,27 @@ msgstr ""
767767

768768
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
769769
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
770-
msgid "Can encode UUID into the advertisment packet."
770+
msgid "Can encode UUID into the advertisement packet."
771771
msgstr ""
772772

773773
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
774-
msgid "Can not fit data into the advertisment packet."
774+
msgid "Can not fit data into the advertisement packet."
775775
msgstr ""
776776

777777
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
778778
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
779779
#, c-format
780-
msgid "Can not apply advertisment data. status: 0x%02x"
780+
msgid "Can not apply advertisement data. status: 0x%02x"
781781
msgstr ""
782782

783783
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
784784
#, c-format
785-
msgid "Can not start advertisment. status: 0x%02x"
785+
msgid "Can not start advertisement. status: 0x%02x"
786786
msgstr ""
787787

788788
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
789789
#, c-format
790-
msgid "Can not stop advertisment. status: 0x%02x"
790+
msgid "Can not stop advertisement. status: 0x%02x"
791791
msgstr ""
792792

793793
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

Diff for: ‎locale/fil.po

+7-7
Original file line numberDiff line numberDiff line change
@@ -768,28 +768,28 @@ msgstr "Hindi ma-encode UUID, para suriin ang haba."
768768

769769
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
770770
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
771-
msgid "Can encode UUID into the advertisment packet."
771+
msgid "Can encode UUID into the advertisement packet."
772772
msgstr "Maaring i-encode ang UUID sa advertisement packet."
773773

774774
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
775-
msgid "Can not fit data into the advertisment packet."
775+
msgid "Can not fit data into the advertisement packet."
776776
msgstr "Hindi makasya ang data sa loob ng advertisement packet."
777777

778778
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
779779
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
780780
#, c-format
781-
msgid "Can not apply advertisment data. status: 0x%02x"
782-
msgstr "Hindi ma i-apply ang advertisment data. status: 0x%02x"
781+
msgid "Can not apply advertisement data. status: 0x%02x"
782+
msgstr "Hindi ma i-apply ang advertisement data. status: 0x%02x"
783783

784784
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
785785
#, c-format
786-
msgid "Can not start advertisment. status: 0x%02x"
786+
msgid "Can not start advertisement. status: 0x%02x"
787787
msgstr "Hindi masimulaan ang advertisement. status 0x%02x"
788788

789789
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
790790
#, c-format
791-
msgid "Can not stop advertisment. status: 0x%02x"
792-
msgstr "Hindi mahinto ang advertisment. status: 0x%02x"
791+
msgid "Can not stop advertisement. status: 0x%02x"
792+
msgstr "Hindi mahinto ang advertisement. status: 0x%02x"
793793

794794
#: ports/nrf/drivers/bluetooth/ble_drv.c:650
795795
#: ports/nrf/drivers/bluetooth/ble_drv.c:726

Diff for: ‎locale/fr.po

+5-5
Original file line numberDiff line numberDiff line change
@@ -764,27 +764,27 @@ msgstr "Impossible d'encoder l'UUID pour vérifier la longueur."
764764

765765
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
766766
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
767-
msgid "Can encode UUID into the advertisment packet."
767+
msgid "Can encode UUID into the advertisement packet."
768768
msgstr ""
769769

770770
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
771-
msgid "Can not fit data into the advertisment packet."
771+
msgid "Can not fit data into the advertisement packet."
772772
msgstr ""
773773

774774
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
775775
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
776776
#, c-format
777-
msgid "Can not apply advertisment data. status: 0x%02x"
777+
msgid "Can not apply advertisement data. status: 0x%02x"
778778
msgstr ""
779779

780780
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
781781
#, c-format
782-
msgid "Can not start advertisment. status: 0x%02x"
782+
msgid "Can not start advertisement. status: 0x%02x"
783783
msgstr ""
784784

785785
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
786786
#, c-format
787-
msgid "Can not stop advertisment. status: 0x%02x"
787+
msgid "Can not stop advertisement. status: 0x%02x"
788788
msgstr ""
789789

790790
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

Diff for: ‎locale/pt_BR.po

+5-5
Original file line numberDiff line numberDiff line change
@@ -751,27 +751,27 @@ msgstr ""
751751

752752
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
753753
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
754-
msgid "Can encode UUID into the advertisment packet."
754+
msgid "Can encode UUID into the advertisement packet."
755755
msgstr ""
756756

757757
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
758-
msgid "Can not fit data into the advertisment packet."
758+
msgid "Can not fit data into the advertisement packet."
759759
msgstr ""
760760

761761
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
762762
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
763763
#, c-format
764-
msgid "Can not apply advertisment data. status: 0x%02x"
764+
msgid "Can not apply advertisement data. status: 0x%02x"
765765
msgstr ""
766766

767767
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
768768
#, c-format
769-
msgid "Can not start advertisment. status: 0x%02x"
769+
msgid "Can not start advertisement. status: 0x%02x"
770770
msgstr ""
771771

772772
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
773773
#, c-format
774-
msgid "Can not stop advertisment. status: 0x%02x"
774+
msgid "Can not stop advertisement. status: 0x%02x"
775775
msgstr ""
776776

777777
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

Diff for: ‎ports/nrf/drivers/bluetooth/ble_drv.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
467467
// do encoding into the adv buffer
468468
if (sd_ble_uuid_encode(&uuid, &encoded_size, &adv_data[byte_pos]) != 0) {
469469
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
470-
translate("Can encode UUID into the advertisment packet.")));
470+
translate("Can encode UUID into the advertisement packet.")));
471471
}
472472

473473
BLE_DRIVER_LOG("encoded uuid for service %u: ", 0);
@@ -517,7 +517,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
517517
// do encoding into the adv buffer
518518
if (sd_ble_uuid_encode(&uuid, &encoded_size, &adv_data[byte_pos]) != 0) {
519519
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
520-
translate("Can encode UUID into the advertisment packet.")));
520+
translate("Can encode UUID into the advertisement packet.")));
521521
}
522522

523523
BLE_DRIVER_LOG("encoded uuid for service %u: ", 0);
@@ -542,7 +542,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
542542
if ((p_adv_params->data_len > 0) && (p_adv_params->p_data != NULL)) {
543543
if (p_adv_params->data_len + byte_pos > BLE_GAP_ADV_MAX_SIZE) {
544544
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
545-
translate("Can not fit data into the advertisment packet.")));
545+
translate("Can not fit data into the advertisement packet.")));
546546
}
547547

548548
memcpy(adv_data, p_adv_params->p_data, p_adv_params->data_len);
@@ -555,7 +555,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
555555
if ((err_code = sd_ble_gap_adv_data_set(adv_data, byte_pos, NULL, 0)) != 0) {
556556

557557
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
558-
translate("Can not apply advertisment data. status: 0x%02x"), (uint16_t)err_code));
558+
translate("Can not apply advertisement data. status: 0x%02x"), (uint16_t)err_code));
559559
}
560560
BLE_DRIVER_LOG("Set Adv data size: " UINT_FMT "\n", byte_pos);
561561
#endif
@@ -586,7 +586,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
586586
m_adv_params.primary_phy = BLE_GAP_PHY_1MBPS;
587587
#else
588588
m_adv_params.fp = BLE_GAP_ADV_FP_ANY;
589-
m_adv_params.timeout = 0; // infinite advertisment
589+
m_adv_params.timeout = 0; // infinite advertisement
590590
#endif
591591

592592
ble_drv_advertise_stop();
@@ -601,7 +601,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
601601

602602
if ((err_code = sd_ble_gap_adv_set_configure(&m_adv_handle, &ble_gap_adv_data, &m_adv_params)) != 0) {
603603
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
604-
translate("Can not apply advertisment data. status: 0x%02x"), (uint16_t)err_code));
604+
translate("Can not apply advertisement data. status: 0x%02x"), (uint16_t)err_code));
605605
}
606606
err_code = sd_ble_gap_adv_start(m_adv_handle, BLE_CONN_CFG_TAG_DEFAULT);
607607
#elif (BLUETOOTH_SD == 132 && BLE_API_VERSION == 4)
@@ -611,7 +611,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
611611
#endif
612612
if (err_code != 0) {
613613
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
614-
translate("Can not start advertisment. status: 0x%02x"), (uint16_t)err_code));
614+
translate("Can not start advertisement. status: 0x%02x"), (uint16_t)err_code));
615615
}
616616

617617
m_adv_in_progress = true;
@@ -628,7 +628,7 @@ void ble_drv_advertise_stop(void) {
628628
if ((err_code = sd_ble_gap_adv_stop()) != 0) {
629629
#endif
630630
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_OSError,
631-
translate("Can not stop advertisment. status: 0x%02x"), (uint16_t)err_code));
631+
translate("Can not stop advertisement. status: 0x%02x"), (uint16_t)err_code));
632632
}
633633
}
634634
m_adv_in_progress = false;

Diff for: ‎ports/nrf/examples/ubluepy_eddystone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def generate_eddystone_adv_packet(url):
4444
service_data = uuid + eddystone_data
4545
packet_service_data = gen_ad_type_content(constants.ad_types.AD_TYPE_SERVICE_DATA, service_data)
4646

47-
# generate advertisment packet
47+
# generate advertisement packet
4848
packet = bytearray([])
4949
packet.extend(packet_flags)
5050
packet.extend(packet_uuid16)

Diff for: ‎ports/nrf/examples/ubluepy_temp.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def event_handler(id, handle, data):
4141
rtc.stop()
4242
# indicate 'disconnected'
4343
LED(1).off()
44-
# restart advertisment
44+
# restart advertisement
4545
periph.advertise(device_name="micr_temp", services=[serv_env_sense])
4646

4747
elif id == constants.EVT_GATTS_WRITE:

Diff for: ‎ports/nrf/modules/ubluepy/ubluepy_peripheral.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(ubluepy_peripheral_set_conn_handler_obj, periph
166166
#if MICROPY_PY_UBLUEPY_PERIPHERAL
167167

168168
/// \method advertise(device_name, [service=[service1, service2, ...]], [data=bytearray], [connectable=True])
169-
/// Start advertising. Connectable advertisment type by default.
169+
/// Start advertising. Connectable advertisement type by default.
170170
///
171171
STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
172172
static const mp_arg_t allowed_args[] = {
@@ -236,7 +236,7 @@ STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args,
236236
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(ubluepy_peripheral_advertise_obj, 0, peripheral_advertise);
237237

238238
/// \method advertise_stop()
239-
/// Stop advertisment if any onging advertisment.
239+
/// Stop advertisement if any onging advertisement.
240240
///
241241
STATIC mp_obj_t peripheral_advertise_stop(mp_obj_t self_in) {
242242
ubluepy_peripheral_obj_t *self = MP_OBJ_TO_PTR(self_in);

0 commit comments

Comments
 (0)