diff --git a/src/apps/ble_demo/src/ble_demo_scan.c b/src/apps/ble_demo/src/ble_demo_scan.c index 8a77fe09..85da1920 100644 --- a/src/apps/ble_demo/src/ble_demo_scan.c +++ b/src/apps/ble_demo/src/ble_demo_scan.c @@ -367,7 +367,7 @@ static void window_load(Window *window) { layer_add_child(window_layer, menu_layer_get_layer(s_menu_layer)); - // Start scanning. Advertisments will be delivered in the callback. + // Start scanning. Advertisements will be delivered in the callback. toggle_scan(); } diff --git a/src/fw/applib/bluetooth/ble_ad_parse.h b/src/fw/applib/bluetooth/ble_ad_parse.h index 0fd992b0..72f4d235 100644 --- a/src/fw/applib/bluetooth/ble_ad_parse.h +++ b/src/fw/applib/bluetooth/ble_ad_parse.h @@ -19,7 +19,7 @@ #include //! @file ble_ad_parse.h -//! API to serialize and deserialize advertisment and scan response payloads. +//! API to serialize and deserialize advertisement and scan response payloads. //! //! Inbound payloads, as received using the ble_scan.h public API, can be //! consumed/deserialized using the functions below. @@ -81,7 +81,7 @@ bool ble_ad_get_tx_power_level(const BLEAdData *ad, int8_t *tx_power_level_out); size_t ble_ad_copy_local_name(const BLEAdData *ad, char *buffer, size_t size); -//! If the Local Name is present in the advertisment data, returns the number +//! If the Local Name is present in the advertisement data, returns the number //! of bytes a C-string needs to be to hold the full name. //! @param ad The advertisement data //! @return The size of the Local Name in bytes, *including* zero terminator. @@ -108,7 +108,7 @@ size_t ble_ad_copy_manufacturer_specific_data(const BLEAdData *ad, uint16_t *company_id_out, uint8_t *buffer, size_t size); -//! Gets the size in bytes of Manufacturer Specific data in the advertisment. +//! Gets the size in bytes of Manufacturer Specific data in the advertisement. //! @param ad The advertisement data //! @return The size of the data, in bytes. If the Manufacturer Specific data is //! not present, zero is returned. diff --git a/src/fw/applib/bluetooth/ble_ibeacon.h b/src/fw/applib/bluetooth/ble_ibeacon.h index f4e4227a..17800ed9 100644 --- a/src/fw/applib/bluetooth/ble_ibeacon.h +++ b/src/fw/applib/bluetooth/ble_ibeacon.h @@ -45,7 +45,7 @@ typedef struct { //! The calibrated power of the iBeacon. This is the RSSI measured at 1 meter //! distance from the iBeacon. The iBeacon transmits this information in its - //! advertisment. Using this and the actual RSSI, the distance is estimated. + //! advertisement. Using this and the actual RSSI, the distance is estimated. int8_t calibrated_tx_power; } BLEiBeacon; diff --git a/src/fw/applib/bluetooth/ble_scan.h b/src/fw/applib/bluetooth/ble_scan.h index f66585e2..8cadf127 100644 --- a/src/fw/applib/bluetooth/ble_scan.h +++ b/src/fw/applib/bluetooth/ble_scan.h @@ -18,9 +18,9 @@ #include -//! Callback that is called for each advertisment that is found while scanning +//! Callback that is called for each advertisement that is found while scanning //! using ble_scan_start(). -//! @param device The device from which the advertisment originated. +//! @param device The device from which the advertisement originated. //! @param rssi The RSSI (Received Signal Strength Indication) of the //! advertisement. //! @param advertisement_data The payload of the advertisement. When there was @@ -38,7 +38,7 @@ typedef void (*BLEScanHandler)(BTDevice device, //! Start scanning for advertisements. Pebble will scan actively, meaning it //! will perform scan requests whenever the advertisement is scannable. -//! @param handler The callback to handle the found advertisments. It must not +//! @param handler The callback to handle the found advertisements. It must not //! be NULL. //! @return BTErrnoOK if scanning started successfully, BTErrnoInvalidParameter //! if the handler was invalid or BTErrnoInvalidState if scanning had already diff --git a/src/fw/comm/ble/gap_le_scan.h b/src/fw/comm/ble/gap_le_scan.h index 84be6dff..dd558c15 100644 --- a/src/fw/comm/ble/gap_le_scan.h +++ b/src/fw/comm/ble/gap_le_scan.h @@ -22,7 +22,7 @@ //! @internal //! The number of reports that the circular reports buffer can contain. -//! Accomodate for 4 reports with advertisment and scan reponse data: +//! Accomodate for 4 reports with advertisement and scan reponse data: #define GAP_LE_SCAN_REPORTS_BUFFER_SIZE (4 * (sizeof(GAPLERawAdReport) + \ (2 * GAP_LE_AD_REPORT_DATA_MAX_LENGTH))) diff --git a/src/include/bluetooth/bluetooth_types.h b/src/include/bluetooth/bluetooth_types.h index d19bb3fa..32c2cc55 100644 --- a/src/include/bluetooth/bluetooth_types.h +++ b/src/include/bluetooth/bluetooth_types.h @@ -237,7 +237,7 @@ typedef struct __attribute__((__packed__)) BTDeviceInternal { _Static_assert(sizeof(BTDeviceInternal) == sizeof(BTDevice), "BTDeviceInternal should be equal in size to BTDevice"); -//! Opaque data structure representing an advertisment report and optional +//! Opaque data structure representing an advertisement report and optional //! scan response. Use the ble_ad... functions to query its contents. struct BLEAdData; @@ -257,10 +257,10 @@ struct BLEAdData; #define LL_CONN_INTV_MAX_SLOTS (3200) // 1.25ms / slot #define LL_SUPERVISION_TIMEOUT_MIN_MS (100) -//! Advertisment and scan response data +//! Advertisement and scan response data //! @internal Exported as forward struct typedef struct BLEAdData { - //! Lengths of the raw advertisment data + //! Lengths of the raw advertisement data uint8_t ad_data_length; //! Lengths of the raw scan response data diff --git a/tests/fw/comm/test_gap_le_advert.c b/tests/fw/comm/test_gap_le_advert.c index 8d3d2872..877ae22e 100644 --- a/tests/fw/comm/test_gap_le_advert.c +++ b/tests/fw/comm/test_gap_le_advert.c @@ -96,7 +96,7 @@ void test_gap_le_advert__initialize(void) { s_unscheduled_completed = false; // This bypasses the work-around for the CC2564 advertising bug, that pauses the round-robinning - // through scheduled advertisment jobs: + // through scheduled advertisement jobs: s_is_connected_as_slave = true; regular_timer_init();