diff --git a/ble/GattCharacteristic.h b/ble/GattCharacteristic.h index 2154eb7..01e8df5 100644 --- a/ble/GattCharacteristic.h +++ b/ble/GattCharacteristic.h @@ -457,9 +457,13 @@ private: template class ReadOnlyGattCharacteristic : public GattCharacteristic { public: - ReadOnlyGattCharacteristic(const UUID &uuid, T *valuePtr, uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, - GattAttribute *descriptors[] = NULL, unsigned numDescriptors = 0) : - GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T), sizeof(T), GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | additionalProperties, descriptors, numDescriptors) { + ReadOnlyGattCharacteristic(const UUID &uuid, + T *valuePtr, + uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, + GattAttribute *descriptors[] = NULL, + unsigned numDescriptors = 0) : + GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T), sizeof(T), + BLE_GATT_CHAR_PROPERTIES_READ | additionalProperties, descriptors, numDescriptors) { /* empty */ } }; @@ -467,9 +471,13 @@ public: template class WriteOnlyGattCharacteristic : public GattCharacteristic { public: - WriteOnlyGattCharacteristic(const UUID &uuid, T *valuePtr, uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, - GattAttribute *descriptors[] = NULL, unsigned numDescriptors = 0) : - GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T), sizeof(T), GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { + WriteOnlyGattCharacteristic(const UUID &uuid, + T *valuePtr, + uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, + GattAttribute *descriptors[] = NULL, + unsigned numDescriptors = 0) : + GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T), sizeof(T), + BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { /* empty */ } }; @@ -477,10 +485,13 @@ public: template class ReadWriteGattCharacteristic : public GattCharacteristic { public: - ReadWriteGattCharacteristic(const UUID &uuid, T *valuePtr, uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, - GattAttribute *descriptors[] = NULL, unsigned numDescriptors = 0) : + ReadWriteGattCharacteristic(const UUID &uuid, + T *valuePtr, + uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, + GattAttribute *descriptors[] = NULL, + unsigned numDescriptors = 0) : GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T), sizeof(T), - GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { + BLE_GATT_CHAR_PROPERTIES_READ | BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { /* empty */ } }; @@ -488,10 +499,13 @@ public: template class WriteOnlyArrayGattCharacteristic : public GattCharacteristic { public: - WriteOnlyArrayGattCharacteristic(const UUID &uuid, T valuePtr[NUM_ELEMENTS], uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, - GattAttribute *descriptors[] = NULL, unsigned numDescriptors = 0) : + WriteOnlyArrayGattCharacteristic(const UUID &uuid, + T valuePtr[NUM_ELEMENTS], + uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, + GattAttribute *descriptors[] = NULL, + unsigned numDescriptors = 0) : GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T) * NUM_ELEMENTS, sizeof(T) * NUM_ELEMENTS, - GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { + BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { /* empty */ } }; @@ -499,10 +513,13 @@ public: template class ReadOnlyArrayGattCharacteristic : public GattCharacteristic { public: - ReadOnlyArrayGattCharacteristic(const UUID &uuid, T valuePtr[NUM_ELEMENTS], uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, - GattAttribute *descriptors[] = NULL, unsigned numDescriptors = 0) : + ReadOnlyArrayGattCharacteristic(const UUID &uuid, + T valuePtr[NUM_ELEMENTS], + uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, + GattAttribute *descriptors[] = NULL, + unsigned numDescriptors = 0) : GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T) * NUM_ELEMENTS, sizeof(T) * NUM_ELEMENTS, - GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | additionalProperties, descriptors, numDescriptors) { + BLE_GATT_CHAR_PROPERTIES_READ | additionalProperties, descriptors, numDescriptors) { /* empty */ } }; @@ -510,10 +527,13 @@ public: template class ReadWriteArrayGattCharacteristic : public GattCharacteristic { public: - ReadWriteArrayGattCharacteristic(const UUID &uuid, T valuePtr[NUM_ELEMENTS], uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, - GattAttribute *descriptors[] = NULL, unsigned numDescriptors = 0) : + ReadWriteArrayGattCharacteristic(const UUID &uuid, + T valuePtr[NUM_ELEMENTS], + uint8_t additionalProperties = BLE_GATT_CHAR_PROPERTIES_NONE, + GattAttribute *descriptors[] = NULL, + unsigned numDescriptors = 0) : GattCharacteristic(uuid, reinterpret_cast(valuePtr), sizeof(T) * NUM_ELEMENTS, sizeof(T) * NUM_ELEMENTS, - GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_READ | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { + BLE_GATT_CHAR_PROPERTIES_READ | BLE_GATT_CHAR_PROPERTIES_WRITE | additionalProperties, descriptors, numDescriptors) { /* empty */ } };