Javier Vargas
Test
Revision 1:72c60abef7e7, committed 2016-07-28
- Comitter:
- mbed_official
- Date:
- Thu Jul 28 23:14:44 2016 +0100
- Parent:
- 0:fb66cae3e9a1
- Child:
- 2:9571b22ed03b
- Commit message:
- Merge branch 'master' of https://github.com/ARMmbed/mbed-os-example-ble
Commit copied from ./src/github.com/ARMmbed/mbed-os-example-ble
Changed in this revision
--- a/.mbed Tue Jul 26 14:45:32 2016 +0100 +++ b/.mbed Thu Jul 28 23:14:44 2016 +0100 @@ -1,3 +1,3 @@ -ROOT=. -TARGET=NRF51_DK -TOOLCHAIN=GCC_ARM +ROOT=. +TARGET=NRF51_DK +TOOLCHAIN=GCC_ARM
--- a/.mbedignore Tue Jul 26 14:45:32 2016 +0100 +++ b/.mbedignore Thu Jul 28 23:14:44 2016 +0100 @@ -1,4 +1,4 @@ -mbed-os/features/net/* -mbed-os/uvisor-mbed-lib/* -mbed-os/frameworks/* -mbed-os/features/mbedtls/* +mbed-os/features/net/* +mbed-os/uvisor-mbed-lib/* +mbed-os/frameworks/* +mbed-os/features/mbedtls/*
--- a/mbed-events.lib Tue Jul 26 14:45:32 2016 +0100 +++ b/mbed-events.lib Thu Jul 28 23:14:44 2016 +0100 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/mbed-events.git#c621d7f80bb282ab1814e727f9c4f81a8538bf6f +https://github.com/ARMmbed/mbed-events.git#6be60bf880c11a0beafcc2064bf467f8d897529a
--- a/mbed-os.lib Tue Jul 26 14:45:32 2016 +0100 +++ b/mbed-os.lib Thu Jul 28 23:14:44 2016 +0100 @@ -1,1 +1,1 @@ -https://github.com/mbedmicro/mbed#5fea6e69ec1aec4c56852f2e959002dc815eb480 +https://github.com/mbedmicro/mbed#36468c9acbfeabb717d2cc7d2a7ea7d17df1ac09
--- a/mbed_app.json Tue Jul 26 14:45:32 2016 +0100
+++ b/mbed_app.json Thu Jul 28 23:14:44 2016 +0100
@@ -1,13 +1,13 @@
-{
- "target_overrides": {
- "K64F": {
- "target.features_add": ["BLE"],
- "target.extra_labels_add": ["ST_BLUENRG"],
- "target.macros_add": ["IDB0XA1_D13_PATCH"]
- },
- "NUCLEO_F401RE": {
- "target.features_add": ["BLE"],
- "target.extra_labels_add": ["ST_BLUENRG"]
- }
- }
-}
+{
+ "target_overrides": {
+ "K64F": {
+ "target.features_add": ["BLE"],
+ "target.extra_labels_add": ["ST_BLUENRG"],
+ "target.macros_add": ["IDB0XA1_D13_PATCH"]
+ },
+ "NUCLEO_F401RE": {
+ "target.features_add": ["BLE"],
+ "target.extra_labels_add": ["ST_BLUENRG"]
+ }
+ }
+}
--- a/module.json Tue Jul 26 14:45:32 2016 +0100
+++ b/module.json Thu Jul 28 23:14:44 2016 +0100
@@ -1,16 +1,16 @@
-{
- "name": "ble-heartrate",
- "version": "0.0.1",
- "description": "BLE Heartreate example, building with yotta",
- "licenses": [
- {
- "url": "https://spdx.org/licenses/Apache-2.0",
- "type": "Apache-2.0"
- }
- ],
- "dependencies": {
- "ble": "^2.0.0"
- },
- "targetDependencies": {},
- "bin": "./source"
-}
+{
+ "name": "ble-heartrate",
+ "version": "0.0.1",
+ "description": "BLE Heartreate example, building with yotta",
+ "licenses": [
+ {
+ "url": "https://spdx.org/licenses/Apache-2.0",
+ "type": "Apache-2.0"
+ }
+ ],
+ "dependencies": {
+ "ble": "^2.0.0"
+ },
+ "targetDependencies": {},
+ "bin": "./source"
+}
--- a/readme.md Tue Jul 26 14:45:32 2016 +0100 +++ b/readme.md Thu Jul 28 23:14:44 2016 +0100 @@ -1,66 +1,66 @@ -# BLE Heart Rate Monitor - -This application transmits a heart rate value using the [Bluetooth SIG Heart Rate Profile](https://developer.bluetooth.org/TechnologyOverview/Pages/HRP.aspx). The heart rate value is provided by the application itself, not by a sensor, so that you don't have to get a sensor just to run the example. - -Technical details are better presented [in the mbed Classic equivalent of this example](https://developer.mbed.org/teams/Bluetooth-Low-Energy/code/BLE_HeartRate/). - -# Running the application - -## Requirements - -To see the heart rate information on your phone, download Panobike for [iOS](https://itunes.apple.com/gb/app/panobike/id567403997?mt=8) or [Android](https://play.google.com/store/apps/details?id=com.topeak.panobike&hl=en). - -You could also use a generic BLE scanners: - -- [nRF Master Control Panel](https://play.google.com/store/apps/details?id=no.nordicsemi.android.mcp) for Android. - -- [LightBlue](https://itunes.apple.com/gb/app/lightblue-bluetooth-low-energy/id557428110?mt=8) for iPhone. - -Hardware requirements are in the [main readme](https://github.com/ARMmbed/mbed-os-example-ble/blob/master/README.md). - -## Building instructions - -Building instructions for all samples are in the [main readme](https://github.com/ARMmbed/mbed-os-example-ble/blob/master/README.md). - -## Checking for success - -**Note:** Screens captures depicted below show what is expected from this example if the scanner used is *nRF Master Control Panel* version 4.0.5. If you encounter any difficulties consider trying another scanner or another version of nRF Master Control Panel. Alternative scanners may require reference to their manuals. - -1. Build the application and install it on your board as explained in the building instructions. -1. Open the BLE scanner on your phone. -1. Start a scan. - -  - - **figure 1** How to start scan using nRF Master Control Panel 4.0.5 - -1. Find your device; it should be named `HRM`. - -  - - **figure 2** Scan results using nRF Master Control Panel 4.0.5 - -1. Establish a connection with your device. - -  - - **figure 3** How to establish a connection using Master Control Panel 4.0.5 - -1. Discover the services and the characteristics on the device. The *Heart Rate* service has the UUID `0x180D` and includes the *Heart Rate Measurement* characteristic which has the UUID `0x2A37`. - -  - - **figure 4** Representation of the Heart Rate service using Master Control Panel 4.0.5 - -1. Register for the notifications sent by the *Heart Rate Measurement* characteristic. - -  - - **figure 5** How to register to notifications using Master Control Panel 4.0.5 - - -1. You should see the heart rate value change every half second. It begins at 100, goes up to 175 (in steps of 1), resets to 100 and so on. - -  - - **figure 6** Notifications view using Master Control Panel 4.0.5 +# BLE Heart Rate Monitor + +This application transmits a heart rate value using the [Bluetooth SIG Heart Rate Profile](https://developer.bluetooth.org/TechnologyOverview/Pages/HRP.aspx). The heart rate value is provided by the application itself, not by a sensor, so that you don't have to get a sensor just to run the example. + +Technical details are better presented [in the mbed Classic equivalent of this example](https://developer.mbed.org/teams/Bluetooth-Low-Energy/code/BLE_HeartRate/). + +# Running the application + +## Requirements + +To see the heart rate information on your phone, download Panobike for [iOS](https://itunes.apple.com/gb/app/panobike/id567403997?mt=8) or [Android](https://play.google.com/store/apps/details?id=com.topeak.panobike&hl=en). + +You could also use a generic BLE scanners: + +- [nRF Master Control Panel](https://play.google.com/store/apps/details?id=no.nordicsemi.android.mcp) for Android. + +- [LightBlue](https://itunes.apple.com/gb/app/lightblue-bluetooth-low-energy/id557428110?mt=8) for iPhone. + +Hardware requirements are in the [main readme](https://github.com/ARMmbed/mbed-os-example-ble/blob/master/README.md). + +## Building instructions + +Building instructions for all samples are in the [main readme](https://github.com/ARMmbed/mbed-os-example-ble/blob/master/README.md). + +## Checking for success + +**Note:** Screens captures depicted below show what is expected from this example if the scanner used is *nRF Master Control Panel* version 4.0.5. If you encounter any difficulties consider trying another scanner or another version of nRF Master Control Panel. Alternative scanners may require reference to their manuals. + +1. Build the application and install it on your board as explained in the building instructions. +1. Open the BLE scanner on your phone. +1. Start a scan. + +  + + **figure 1** How to start scan using nRF Master Control Panel 4.0.5 + +1. Find your device; it should be named `HRM`. + +  + + **figure 2** Scan results using nRF Master Control Panel 4.0.5 + +1. Establish a connection with your device. + +  + + **figure 3** How to establish a connection using Master Control Panel 4.0.5 + +1. Discover the services and the characteristics on the device. The *Heart Rate* service has the UUID `0x180D` and includes the *Heart Rate Measurement* characteristic which has the UUID `0x2A37`. + +  + + **figure 4** Representation of the Heart Rate service using Master Control Panel 4.0.5 + +1. Register for the notifications sent by the *Heart Rate Measurement* characteristic. + +  + + **figure 5** How to register to notifications using Master Control Panel 4.0.5 + + +1. You should see the heart rate value change every half second. It begins at 100, goes up to 175 (in steps of 1), resets to 100 and so on. + +  + + **figure 6** Notifications view using Master Control Panel 4.0.5
--- a/shields/TARGET_ST_BLUENRG.lib Tue Jul 26 14:45:32 2016 +0100 +++ b/shields/TARGET_ST_BLUENRG.lib Thu Jul 28 23:14:44 2016 +0100 @@ -1,1 +1,1 @@ -https://github.com/ARMmbed/ble-x-nucleo-idb0xa1#947ff7cf03846721ec9970f16d373390cbf71f39 +https://github.com/ARMmbed/ble-x-nucleo-idb0xa1#6781fbb835912132d7fed0d78606c7090ae03959
--- a/source/main.cpp Tue Jul 26 14:45:32 2016 +0100
+++ b/source/main.cpp Thu Jul 28 23:14:44 2016 +0100
@@ -1,116 +1,116 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2015 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <mbed-events/events.h>
-#include <mbed.h>
-#include "ble/BLE.h"
-#include "ble/Gap.h"
-#include "ble/services/HeartRateService.h"
-
-DigitalOut led1(LED1, 1);
-
-const static char DEVICE_NAME[] = "HRM";
-static const uint16_t uuid16_list[] = {GattService::UUID_HEART_RATE_SERVICE};
-
-static uint8_t hrmCounter = 100; // init HRM to 100bps
-static HeartRateService *hrServicePtr;
-
-static EventQueue eventQueue(
- /* event count */ 16 * /* event size */ 32
-);
-
-void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
-{
- BLE::Instance().gap().startAdvertising(); // restart advertising
-}
-
-void updateSensorValue() {
- // Do blocking calls or whatever is necessary for sensor polling.
- // In our case, we simply update the HRM measurement.
- hrmCounter++;
-
- // 100 <= HRM bps <=175
- if (hrmCounter == 175) {
- hrmCounter = 100;
- }
-
- hrServicePtr->updateHeartRate(hrmCounter);
-}
-
-void periodicCallback(void)
-{
- led1 = !led1; /* Do blinky on LED1 while we're waiting for BLE events */
-
- if (BLE::Instance().getGapState().connected) {
- eventQueue.post(updateSensorValue);
- }
-}
-
-void onBleInitError(BLE &ble, ble_error_t error)
-{
- (void)ble;
- (void)error;
- /* Initialization error handling should go here */
-}
-
-void bleInitComplete(BLE::InitializationCompleteCallbackContext *params)
-{
- BLE& ble = params->ble;
- ble_error_t error = params->error;
-
- if (error != BLE_ERROR_NONE) {
- onBleInitError(ble, error);
- return;
- }
-
- if (ble.getInstanceID() != BLE::DEFAULT_INSTANCE) {
- return;
- }
-
- ble.gap().onDisconnection(disconnectionCallback);
-
- /* Setup primary service. */
- hrServicePtr = new HeartRateService(ble, hrmCounter, HeartRateService::LOCATION_FINGER);
-
- /* Setup advertising. */
- ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
- ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS, (uint8_t *)uuid16_list, sizeof(uuid16_list));
- ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::GENERIC_HEART_RATE_SENSOR);
- ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)DEVICE_NAME, sizeof(DEVICE_NAME));
- ble.gap().setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
- ble.gap().setAdvertisingInterval(1000); /* 1000ms */
- ble.gap().startAdvertising();
-}
-
-void scheduleBleEventsProcessing(BLE::OnEventsToProcessCallbackContext* context) {
- BLE &ble = BLE::Instance();
- eventQueue.post(Callback<void()>(&ble, &BLE::processEvents));
-}
-
-int main()
-{
- eventQueue.post_every(periodicCallback, 500);
-
- BLE &ble = BLE::Instance();
- ble.onEventsToProcess(scheduleBleEventsProcessing);
- ble.init(bleInitComplete);
-
- while (true) {
- eventQueue.dispatch();
- }
-
- return 0;
-}
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2015 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <mbed-events/events.h>
+#include <mbed.h>
+#include "ble/BLE.h"
+#include "ble/Gap.h"
+#include "ble/services/HeartRateService.h"
+
+DigitalOut led1(LED1, 1);
+
+const static char DEVICE_NAME[] = "HRM";
+static const uint16_t uuid16_list[] = {GattService::UUID_HEART_RATE_SERVICE};
+
+static uint8_t hrmCounter = 100; // init HRM to 100bps
+static HeartRateService *hrServicePtr;
+
+static EventQueue eventQueue(
+ /* event count */ 16 * /* event size */ 32
+);
+
+void disconnectionCallback(const Gap::DisconnectionCallbackParams_t *params)
+{
+ BLE::Instance().gap().startAdvertising(); // restart advertising
+}
+
+void updateSensorValue() {
+ // Do blocking calls or whatever is necessary for sensor polling.
+ // In our case, we simply update the HRM measurement.
+ hrmCounter++;
+
+ // 100 <= HRM bps <=175
+ if (hrmCounter == 175) {
+ hrmCounter = 100;
+ }
+
+ hrServicePtr->updateHeartRate(hrmCounter);
+}
+
+void periodicCallback(void)
+{
+ led1 = !led1; /* Do blinky on LED1 while we're waiting for BLE events */
+
+ if (BLE::Instance().getGapState().connected) {
+ eventQueue.post(updateSensorValue);
+ }
+}
+
+void onBleInitError(BLE &ble, ble_error_t error)
+{
+ (void)ble;
+ (void)error;
+ /* Initialization error handling should go here */
+}
+
+void bleInitComplete(BLE::InitializationCompleteCallbackContext *params)
+{
+ BLE& ble = params->ble;
+ ble_error_t error = params->error;
+
+ if (error != BLE_ERROR_NONE) {
+ onBleInitError(ble, error);
+ return;
+ }
+
+ if (ble.getInstanceID() != BLE::DEFAULT_INSTANCE) {
+ return;
+ }
+
+ ble.gap().onDisconnection(disconnectionCallback);
+
+ /* Setup primary service. */
+ hrServicePtr = new HeartRateService(ble, hrmCounter, HeartRateService::LOCATION_FINGER);
+
+ /* Setup advertising. */
+ ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::BREDR_NOT_SUPPORTED | GapAdvertisingData::LE_GENERAL_DISCOVERABLE);
+ ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS, (uint8_t *)uuid16_list, sizeof(uuid16_list));
+ ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::GENERIC_HEART_RATE_SENSOR);
+ ble.gap().accumulateAdvertisingPayload(GapAdvertisingData::COMPLETE_LOCAL_NAME, (uint8_t *)DEVICE_NAME, sizeof(DEVICE_NAME));
+ ble.gap().setAdvertisingType(GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED);
+ ble.gap().setAdvertisingInterval(1000); /* 1000ms */
+ ble.gap().startAdvertising();
+}
+
+void scheduleBleEventsProcessing(BLE::OnEventsToProcessCallbackContext* context) {
+ BLE &ble = BLE::Instance();
+ eventQueue.post(Callback<void()>(&ble, &BLE::processEvents));
+}
+
+int main()
+{
+ eventQueue.post_every(500, periodicCallback);
+
+ BLE &ble = BLE::Instance();
+ ble.onEventsToProcess(scheduleBleEventsProcessing);
+ ble.init(bleInitComplete);
+
+ while (true) {
+ eventQueue.dispatch();
+ }
+
+ return 0;
+}