From f0f42d110bbc9b25f6a0f28ce4c973e66bf4af79 Mon Sep 17 00:00:00 2001 From: Xabi Crespo Date: Thu, 24 Sep 2015 16:39:24 +0200 Subject: [PATCH] Support for Environmental Service (temperature, pressure and humidity characteristics) --- ble/GattCharacteristic.h | 5 +- ble/GattService.h | 1 + ble/services/EnvironmentalService.h | 102 ++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 ble/services/EnvironmentalService.h diff --git a/ble/GattCharacteristic.h b/ble/GattCharacteristic.h index 2e27c19..37d745f 100644 --- a/ble/GattCharacteristic.h +++ b/ble/GattCharacteristic.h @@ -57,6 +57,7 @@ public: UUID_HEART_RATE_MEASUREMENT_CHAR = 0x2A37, UUID_HID_CONTROL_POINT_CHAR = 0x2A4C, UUID_HID_INFORMATION_CHAR = 0x2A4A, + UUID_HUMIDITY_CHAR = 0x2A6F, UUID_IEEE_REGULATORY_CERTIFICATION_DATA_LIST_CHAR = 0x2A2A, UUID_INTERMEDIATE_CUFF_PRESSURE_CHAR = 0x2A36, UUID_INTERMEDIATE_TEMPERATURE_CHAR = 0x2A1E, @@ -67,6 +68,7 @@ public: UUID_UNREAD_ALERT_CHAR = 0x2A45, UUID_NEW_ALERT_CHAR = 0x2A46, UUID_PNP_ID_CHAR = 0x2A50, + UUID_PRESSURE_CHAR = 0x2A6D, UUID_PROTOCOL_MODE_CHAR = 0x2A4E, UUID_RECORD_ACCESS_CONTROL_POINT_CHAR = 0x2A52, UUID_REFERENCE_TIME_INFORMATION_CHAR = 0x2A14, @@ -81,6 +83,7 @@ public: UUID_SUPPORTED_NEW_ALERT_CATEGORY_CHAR = 0x2A47, UUID_SUPPORTED_UNREAD_ALERT_CATEGORY_CHAR = 0x2A48, UUID_SYSTEM_ID_CHAR = 0x2A23, + UUID_TEMPERATURE_CHAR = 0x2A6E, UUID_TEMPERATURE_MEASUREMENT_CHAR = 0x2A1C, UUID_TEMPERATURE_TYPE_CHAR = 0x2A1D, UUID_TIME_ACCURACY_CHAR = 0x2A12, @@ -93,7 +96,7 @@ public: UUID_CSC_FEATURE_CHAR = 0x2A5C, UUID_CSC_MEASUREMENT_CHAR = 0x2A5B, UUID_RSC_FEATURE_CHAR = 0x2A54, - UUID_RSC_MEASUREMENT_CHAR = 0x2A53, + UUID_RSC_MEASUREMENT_CHAR = 0x2A53 }; /**************************************************************************/ diff --git a/ble/GattService.h b/ble/GattService.h index f3d3b85..d2ff649 100644 --- a/ble/GattService.h +++ b/ble/GattService.h @@ -29,6 +29,7 @@ public: UUID_CURRENT_TIME_SERVICE = 0x1805, UUID_CYCLING_SPEED_AND_CADENCE = 0x1816, UUID_DEVICE_INFORMATION_SERVICE = 0x180A, + UUID_ENVIRONMENTAL_SERVICE = 0x181A, UUID_GLUCOSE_SERVICE = 0x1808, UUID_HEALTH_THERMOMETER_SERVICE = 0x1809, UUID_HEART_RATE_SERVICE = 0x180D, diff --git a/ble/services/EnvironmentalService.h b/ble/services/EnvironmentalService.h new file mode 100644 index 0000000..61d9b3e --- /dev/null +++ b/ble/services/EnvironmentalService.h @@ -0,0 +1,102 @@ + +#ifndef __BLE_ENVIRONMENTAL_SERVICE_H__ +#define __BLE_ENVIRONMENTAL_SERVICE_H__ + +#include "ble/BLE.h" + + /** +* @class EnvironmentalService +* @brief BLE Environmental Service. This service provides the location of the thermometer and the temperature.
+* Service: https://developer.bluetooth.org/gatt/services/Pages/ServiceViewer.aspx?u=org.bluetooth.service.environmental_sensing.xml
+* Temperature: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.temperature.xml
+* Humidity: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.humidity.xml
+* Pressure: https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.pressure.xml +*/ +class EnvironmentalService { +public: + /** + * @brief EnvironmentalService constructor. + * @param ble Reference to BLE device. + * @param temperature_en Enable this characteristic. + * @param humidity_en Enable this characteristic. + * @param pressure_en Enable this characteristic. + */ + EnvironmentalService(BLE &_ble, + bool temperature_en = false, + bool humidity_en = false, + bool pressure_en = false) : + ble(_ble), + temperatureCharacteristic(GattCharacteristic::UUID_TEMPERATURE_CHAR, + (uint8_t *) &temperature, + (temperature_en) ? 2 : 0, // minLength + (temperature_en) ? 2 : 0, // maxLength + GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ), + humidityCharacteristic(GattCharacteristic::UUID_HUMIDITY_CHAR, + (uint8_t *) &humidity, + (humidity_en) ? 2 : 0, // minLength + (humidity_en) ? 2 : 0, // maxLength + GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ), + pressureCharacteristic(GattCharacteristic::UUID_PRESSURE_CHAR, + (uint8_t *) &pressure, + (pressure_en) ? 4 : 0, // minLength + (pressure_en) ? 4 : 0, // maxLength + GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ) + { + static bool serviceAdded = false; /* We should only ever need to add the information service once. */ + if (serviceAdded) { + return; + } + + GattCharacteristic *charTable[] = { &humidityCharacteristic, + &pressureCharacteristic, + &temperatureCharacteristic }; + + GattService environmentalService(GattService::UUID_ENVIRONMENTAL_SERVICE, charTable, + sizeof(charTable) / sizeof(GattCharacteristic *)); + + ble.gattServer().addService(environmentalService); + serviceAdded = true; + } + + /** + * @brief Update humidity characteristic. + * @param newHumidityVal New humidity measurement. + */ + void updateHumidity(uint16_t newHumidityVal) + { + humidity = (uint32_t) (newHumidityVal*100); + ble.gattServer().write(humidityCharacteristic.getValueHandle(), (uint8_t *) &humidity, 2); + } + + /** + * @brief Update pressure characteristic. + * @param newPressureVal New pressure measurement. + */ + void updatePressure(uint32_t newPressureVal) + { + pressure = (uint32_t) (newPressureVal*10); + ble.gattServer().write(pressureCharacteristic.getValueHandle(), (uint8_t *) &pressure, 4); + } + + /** + * @brief Update temperature characteristic. + * @param newTemperatureVal New temperature measurement. + */ + void updateTemperature(float newTemperatureVal) + { + temperature = (int16_t) (newTemperatureVal*100); + ble.gattServer().write(temperatureCharacteristic.getValueHandle(), (uint8_t *) &temperature, 2); + } + +private: + BLE &ble; + + int16_t temperature; + GattCharacteristic temperatureCharacteristic; + uint16_t humidity; + GattCharacteristic humidityCharacteristic; + uint32_t pressure; + GattCharacteristic pressureCharacteristic; +}; + +#endif /* #ifndef __BLE_ENVIRONMENTAL_SERVICE_H__*/ \ No newline at end of file