remove BLE related tests;

They were only demos; not real tests.
pull/317/head
Rohit Grover 2014-05-20 14:53:57 +01:00
parent 61a72711eb
commit c057be6709
4 changed files with 1 additions and 507 deletions

View File

@ -1,159 +0,0 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2014 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.h"
#include "TMP102.h"
#include "nRF51822n.h"
nRF51822n nrf; /* BLE radio driver */
TMP102 healthThemometer(p22, p20, 0x90); /* The TMP102 connected to our board */
/* LEDs for indication: */
DigitalOut oneSecondLed(LED1); /* LED1 is toggled every second. */
DigitalOut advertisingStateLed(LED2); /* LED2 is on when we are advertising, otherwise off. */
/* Health Thermometer Service */
uint8_t thermTempPayload[5] = { 0, 0, 0, 0, 0 };
GattService thermService (GattService::UUID_HEALTH_THERMOMETER_SERVICE);
GattCharacteristic thermTemp (GattCharacteristic::UUID_TEMPERATURE_MEASUREMENT_CHAR,
5, 5, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_INDICATE);
/* Battery Level Service */
uint8_t batt = 100; /* Battery level */
uint8_t read_batt = 0; /* Variable to hold battery level reads */
GattService battService ( GattService::UUID_BATTERY_SERVICE );
GattCharacteristic battLevel ( GattCharacteristic::UUID_BATTERY_LEVEL_CHAR, 1, 1,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY |
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ);
/* Advertising data and parameters */
GapAdvertisingData advData;
GapAdvertisingData scanResponse;
GapAdvertisingParams advParams ( GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED );
uint16_t uuid16_list[] = {GattService::UUID_HEALTH_THERMOMETER_SERVICE,
GattService::UUID_BATTERY_SERVICE};
uint32_t quick_ieee11073_from_float(float temperature);
void updateServiceValues(void);
/**************************************************************************/
/*!
@brief This custom class can be used to override any GapEvents
that you are interested in handling on an application level.
*/
/**************************************************************************/
class GapEventHandler : public GapEvents
{
//virtual void onTimeout(void) {}
virtual void onConnected(void)
{
advertisingStateLed = 0;
}
/* When a client device disconnects we need to start advertising again. */
virtual void onDisconnected(void)
{
nrf.getGap().startAdvertising(advParams);
advertisingStateLed = 1;
}
};
/**************************************************************************/
/*!
@brief Program entry point
*/
/**************************************************************************/
int main(void)
{
/* Setup blinky led */
oneSecondLed=1;
/* Setup an event handler for GAP events i.e. Client/Server connection events. */
nrf.getGap().setEventHandler(new GapEventHandler());
/* Initialise the nRF51822 */
nrf.init();
/* Make sure we get a clean start */
nrf.reset();
/* Add BLE-Only flag and complete service list to the advertising data */
advData.addFlags(GapAdvertisingData::BREDR_NOT_SUPPORTED);
advData.addData(GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS,
(uint8_t*)uuid16_list, sizeof(uuid16_list));
advData.addAppearance(GapAdvertisingData::GENERIC_THERMOMETER);
nrf.getGap().setAdvertisingData(advData, scanResponse);
/* Health Thermometer Service */
thermService.addCharacteristic(thermTemp);
nrf.getGattServer().addService(thermService);
/* Add the Battery Level service */
battService.addCharacteristic(battLevel);
nrf.getGattServer().addService(battService);
/* Start advertising (make sure you've added all your data first) */
nrf.getGap().startAdvertising(advParams);
advertisingStateLed = 1;
for (;;)
{
/* Now that we're live, update the battery level & temperature characteristics */
updateServiceValues();
wait(1);
}
}
/**************************************************************************/
/*!
@brief Ticker callback to switch advertisingStateLed state
*/
/**************************************************************************/
void updateServiceValues(void)
{
/* Toggle the one second LEDs */
oneSecondLed = !oneSecondLed;
/* Update battery level */
nrf.getGattServer().updateValue(battLevel.handle, (uint8_t*)&batt, sizeof(batt));
/* Decrement the battery level. */
batt <=50 ? batt=100 : batt--;;
/* Update the temperature. Note that we need to convert to an ieee11073 format float. */
float temperature = healthThemometer.read();
uint32_t temp_ieee11073 = quick_ieee11073_from_float(temperature);
memcpy(thermTempPayload+1, &temp_ieee11073, 4);
nrf.getGattServer().updateValue(thermTemp.handle, thermTempPayload, sizeof(thermTempPayload));
}
/**
* @brief A very quick conversion between a float temperature and 11073-20601 FLOAT-Type.
* @param temperature The temperature as a float.
* @return The temperature in 11073-20601 FLOAT-Type format.
*/
uint32_t quick_ieee11073_from_float(float temperature)
{
uint8_t exponent = 0xFF; //exponent is -1
uint32_t mantissa = (uint32_t)(temperature*10);
return ( ((uint32_t)exponent) << 24) | mantissa;
}

View File

@ -1,243 +0,0 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2013 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.h"
#include "nRF51822n.h"
nRF51822n nrf; /* BLE radio driver */
DigitalOut led1(LED1);
DigitalOut led2(LED2);
Ticker flipper;
Serial pc(USBTX,USBRX);
/* Battery Level Service */
uint8_t batt = 72; /* Battery level */
uint8_t read_batt = 0; /* Variable to hold battery level reads */
GattService battService ( GattService::UUID_BATTERY_SERVICE );
GattCharacteristic battLevel ( GattCharacteristic::UUID_BATTERY_LEVEL_CHAR, 1, 1,
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY |
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ);
/* Heart Rate Service */
/* Service: https://developer.bluetooth.org/gatt/services/Pages/ServiceViewer.aspx?u=org.bluetooth.service.heart_rate.xml */
/* HRM Char: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.heart_rate_measurement.xml */
/* Location: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.body_sensor_location.xml */
GattService hrmService ( GattService::UUID_HEART_RATE_SERVICE );
GattCharacteristic hrmRate ( GattCharacteristic::UUID_HEART_RATE_MEASUREMENT_CHAR, 2, 3, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY );
GattCharacteristic hrmLocation ( GattCharacteristic::UUID_BODY_SENSOR_LOCATION_CHAR, 1, 1, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ );
/* Device Information service */
uint8_t deviceName[4] = { 'm', 'b', 'e', 'd' };
GattService deviceInformationService ( GattService::UUID_DEVICE_INFORMATION_SERVICE );
GattCharacteristic deviceManufacturer ( GattCharacteristic::UUID_MANUFACTURER_NAME_STRING_CHAR,
sizeof(deviceName), sizeof(deviceName),
GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ);
/* Health Thermometer Service */
uint32_t temp_ieee11073 = 0xFF00016C; // 36.4C in IEEE-11073 32-bit float!
uint8_t thermTempPayload[5] = { 0, 0, 0, 0, 0 };
GattService thermService (GattService::UUID_HEALTH_THERMOMETER_SERVICE);
GattCharacteristic thermTemp (GattCharacteristic::UUID_TEMPERATURE_MEASUREMENT_CHAR,
5, 5, GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_INDICATE);
/* Advertising data and parameters */
GapAdvertisingData advData;
GapAdvertisingData scanResponse;
GapAdvertisingParams advParams ( GapAdvertisingParams::ADV_CONNECTABLE_UNDIRECTED );
uint16_t uuid16_list[] = { GattService::UUID_BATTERY_SERVICE,
GattService::UUID_DEVICE_INFORMATION_SERVICE,
GattService::UUID_HEART_RATE_SERVICE,
GattService::UUID_HEALTH_THERMOMETER_SERVICE };
void tickerCallback(void);
/**************************************************************************/
/*!
@brief This custom class can be used to override any GapEvents
that you are interested in handling on an application level.
*/
/**************************************************************************/
class GapEventHandler : public GapEvents
{
virtual void onTimeout(void)
{
pc.printf("Advertising Timeout!\n\r");
// Restart the advertising process with a much slower interval,
// only start advertising again after a button press, etc.
}
virtual void onConnected(void)
{
pc.printf("Connected!\n\r");
}
virtual void onDisconnected(void)
{
pc.printf("Disconnected!\n\r");
pc.printf("Restarting the advertising process\n\r");
nrf.getGap().startAdvertising(advParams);
}
};
/**************************************************************************/
/*!
@brief This custom class can be used to override any GattServerEvents
that you are interested in handling on an application level.
*/
/**************************************************************************/
class GattServerEventHandler : public GattServerEvents
{
//virtual void onDataSent(uint16_t charHandle) {}
//virtual void onDataWritten(uint16_t charHandle) {}
virtual void onUpdatesEnabled(uint16_t charHandle)
{
if (charHandle == thermTemp.handle)
{
pc.printf("Temperature indication enabled\n\r");
}
if (charHandle == hrmRate.handle)
{
pc.printf("Heart rate notify enabled\n\r");
}
}
virtual void onUpdatesDisabled(uint16_t charHandle)
{
if (charHandle == thermTemp.handle)
{
pc.printf("Temperature indication disabled\n\r");
}
if (charHandle == hrmRate.handle)
{
pc.printf("Heart rate notify disabled\n\r");
}
}
virtual void onConfirmationReceived(uint16_t charHandle)
{
if (charHandle == thermTemp.handle)
{
pc.printf("Temperature indication received\n\r");
}
}
};
/**************************************************************************/
/*!
@brief Program entry point
*/
/**************************************************************************/
int main(void)
{
*(uint32_t *)0x40000504 = 0xC007FFDF;
*(uint32_t *)0x40006C18 = 0x00008000;
/* Setup blinky: led1 is toggled in main, led2 is toggled via Ticker */
led1=1;
led2=1;
flipper.attach(&tickerCallback, 1.0);
/* Setup the local GAP/GATT event handlers */
nrf.getGap().setEventHandler(new GapEventHandler());
nrf.getGattServer().setEventHandler(new GattServerEventHandler());
/* Initialise the nRF51822 */
pc.printf("Initialising the nRF51822\n\r");
nrf.init();
/* Make sure we get a clean start */
nrf.reset();
/* Add BLE-Only flag and complete service list to the advertising data */
advData.addFlags(GapAdvertisingData::BREDR_NOT_SUPPORTED);
advData.addData(GapAdvertisingData::COMPLETE_LIST_16BIT_SERVICE_IDS,
(uint8_t*)uuid16_list, sizeof(uuid16_list));
advData.addAppearance(GapAdvertisingData::HEART_RATE_SENSOR_HEART_RATE_BELT);
nrf.getGap().setAdvertisingData(advData, scanResponse);
/* Add the Battery Level service */
battService.addCharacteristic(battLevel);
nrf.getGattServer().addService(battService);
/* Add the Device Information service */
deviceInformationService.addCharacteristic(deviceManufacturer);
nrf.getGattServer().addService(deviceInformationService);
/* Add the Heart Rate service */
hrmService.addCharacteristic(hrmRate);
hrmService.addCharacteristic(hrmLocation);
nrf.getGattServer().addService(hrmService);
/* Health Thermometer Service */
thermService.addCharacteristic(thermTemp);
nrf.getGattServer().addService(thermService);
/* Start advertising (make sure you've added all your data first) */
nrf.getGap().startAdvertising(advParams);
/* Now that we're live, update the battery level characteristic, and */
/* change the device manufacturer characteristic to 'mbed' */
nrf.getGattServer().updateValue(battLevel.handle, (uint8_t*)&batt, sizeof(batt));
nrf.getGattServer().updateValue(deviceManufacturer.handle, deviceName, sizeof(deviceName));
nrf.getGattServer().updateValue(thermTemp.handle, thermTempPayload, sizeof(thermTempPayload));
/* Set the heart rate monitor location (one time only) */
/* See --> https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.body_sensor_location.xml */
uint8_t location = 0x03; /* Finger */
uint8_t hrmCounter = 100;
nrf.getGattServer().updateValue(hrmLocation.handle, (uint8_t*)&location, sizeof(location));
/* Do blinky on LED1 while we're waiting for BLE events */
for (;;)
{
led1 = !led1;
wait(1);
//nrf.getGattServer().readValue(battLevel.handle, (uint8_t*)&read_batt, sizeof(read_batt));
//pc.printf("Battery Level = %d\n\r", read_batt);
/* Update battery level */
batt++;
if (batt > 100) batt = 72;
nrf.getGattServer().updateValue(battLevel.handle, (uint8_t*)&batt, sizeof(batt));
/* Update the HRM measurement */
/* First byte = 8-bit values, no extra info, Second byte = uint8_t HRM value */
/* See --> https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.heart_rate_measurement.xml */
hrmCounter++;
if (hrmCounter == 175) hrmCounter = 100;
uint8_t bpm[2] = { 0x00, hrmCounter };
nrf.getGattServer().updateValue(hrmRate.handle, bpm, sizeof(bpm));
/* Update the temperature */
memcpy(thermTempPayload+1, &temp_ieee11073, 4);
nrf.getGattServer().updateValue(thermTemp.handle, thermTempPayload, sizeof(thermTempPayload));
temp_ieee11073++;
if (temp_ieee11073 > 0xFF000200) temp_ieee11073 = 0xFF00016C;
}
}
/**************************************************************************/
/*!
@brief Ticker callback to switch led2 state
*/
/**************************************************************************/
void tickerCallback(void)
{
led2 = !led2;
}

View File

@ -1,87 +0,0 @@
/* mbed Microcontroller Library
* Copyright (c) 2006-2013 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.h"
#include "nRF51822n.h"
nRF51822n nrf; /* BLE radio driver */
DigitalOut led1(LED1);
DigitalOut led2(LED2);
Ticker flipper;
Serial pc(USBTX,USBRX);
void tickerCallback(void);
/**************************************************************************/
/*!
@brief Program entry point
*/
/**************************************************************************/
int main(void)
{
*(uint32_t *)0x40000504 = 0xC007FFDF;
*(uint32_t *)0x40006C18 = 0x00008000;
/* Setup blinky: led1 is toggled in main, led2 is toggled via Ticker */
led1=1;
led2=1;
flipper.attach(&tickerCallback, 1.0);
/* Initialise the nRF51822 */
pc.printf("Initialising the nRF51822\n\r");
nrf.init();
GapAdvertisingParams advParams ( GapAdvertisingParams::ADV_NON_CONNECTABLE_UNDIRECTED );
GapAdvertisingData advData;
GapAdvertisingData scanResponse;
/* Define an iBeacon payload
--------------------------------------------------------------
128-Bit UUID = E2 0A 39 F4 73 F5 4B C4 A1 2F 17 D1 AD 07 A9 61
Major/Minor = 0000 / 0000
Tx Power = C8
*/
uint8_t iBeaconPayload[25] = { 0x4C, 0x00, 0x02, 0x15, 0xE2, 0x0A, 0x39, 0xF4, 0x73, 0xF5, 0x4B, 0xC4, 0xA1, 0x2F, 0x17, 0xD1, 0xAD, 0x07, 0xA9, 0x61, 0x00, 0x00, 0x00, 0x00, 0xC8 };
/* Make sure we get a clean start */
nrf.reset();
/* iBeacon includes the FLAG and MSD fields */
advData.addFlags(GapAdvertisingData::BREDR_NOT_SUPPORTED);
advData.addData(GapAdvertisingData::MANUFACTURER_SPECIFIC_DATA, iBeaconPayload, sizeof(iBeaconPayload));
/* Start advertising! */
nrf.getGap().setAdvertisingData(advData, scanResponse);
nrf.getGap().startAdvertising(advParams);
/* Do blinky on LED1 while we're waiting for BLE events */
for (;;)
{
led1 = !led1;
wait(1);
}
}
/**************************************************************************/
/*!
@brief Ticker callback to switch led2 state
*/
/**************************************************************************/
void tickerCallback(void)
{
led2 = !led2;
}

View File

@ -25,8 +25,6 @@ BENCHMARKS_DIR = join(TEST_DIR, "benchmarks")
SD = join(TEST_DIR, "sd")
TMP102 = join(PERIPHERALS, 'TMP102')
BLE_API = join(LIB_DIR, "ble", "ble-api")
BLE_NRF51822 = join(LIB_DIR, "ble", "nRF51822")
"""
Wiring:
@ -808,22 +806,7 @@ TESTS = [
"id": "EXAMPLE_2", "description": "FS + RTOS",
"source_dir": join(TEST_DIR, "mbed", "fs"),
"dependencies": [MBED_LIBRARIES, RTOS_LIBRARIES, TEST_MBED_LIB, SD_FS, FAT_FS],
},
{
"id": "NORDIC_1", "description": "BLE Health Thermometer",
"source_dir": join(TEST_DIR, "ble", "Health_Thermometer"),
"dependencies": [MBED_LIBRARIES, TMP102, BLE_API, BLE_NRF51822],
},
{
"id": "NORDIC_2", "description": "BLE Heart Rate Monitor",
"source_dir": join(TEST_DIR, "ble", "HeartRate"),
"dependencies": [MBED_LIBRARIES, BLE_API, BLE_NRF51822],
},
{
"id": "NORDIC_3", "description": "BLE iBeacon",
"source_dir": join(TEST_DIR, "ble", "iBeacon"),
"dependencies": [MBED_LIBRARIES, BLE_API, BLE_NRF51822],
},
}
]
# Group tests with the same goals into categories