Schoumi/BLE_API
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

use types like ReadOnlyGattCharacteristic<TemperatureType_t>

Browse source
This commit is contained in:
Rohit Grover 2015-10-30 09:42:56 +00:00
parent bdc1ca08cd
commit be09e51698
1 changed files with 13 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
ble/services/EnvironmentalService.h
View file

@ -40,26 +40,11 @@ public:
* @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) :
EnvironmentalService(BLE& _ble) :
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)
temperatureCharacteristic(GattCharacteristic::UUID_TEMPERATURE_CHAR, &temperature),
humidityCharacteristic(GattCharacteristic::UUID_HUMIDITY_CHAR, &humidity),
pressureCharacteristic(GattCharacteristic::UUID_PRESSURE_CHAR, &pressure)
{
static bool serviceAdded = false; /* We should only ever need to add the information service once. */
if (serviceAdded) {
@ -70,8 +55,7 @@ public:
&pressureCharacteristic,
&temperatureCharacteristic };
GattService environmentalService(GattService::UUID_ENVIRONMENTAL_SERVICE, charTable,
sizeof(charTable) / sizeof(GattCharacteristic *));
GattService environmentalService(GattService::UUID_ENVIRONMENTAL_SERVICE, charTable, sizeof(charTable) / sizeof(GattCharacteristic *));
ble.gattServer().addService(environmentalService);
serviceAdded = true;
@ -108,14 +92,15 @@ public:
}
private:
BLE & ble;
BLE& ble;
int16_t temperature;
GattCharacteristic temperatureCharacteristic;
uint16_t humidity;
GattCharacteristic humidityCharacteristic;
uint32_t pressure;
GattCharacteristic pressureCharacteristic;
TemperatureType_t temperature;
HumidityType_t humidity;
PressureType_t pressure;
ReadOnlyGattCharacteristic<TemperatureType_t> temperatureCharacteristic;
ReadOnlyGattCharacteristic<HumidityType_t> humidityCharacteristic;
ReadOnlyGattCharacteristic<PressureType_t> pressureCharacteristic;
};
#endif /* #ifndef __BLE_ENVIRONMENTAL_SERVICE_H__*/