Add new environmental sensing descriptor types

Change-Id: Id0ed9503da1cff66a04a83196cf61863289b98ab
Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

2 files changed, 16 insertions, 2 deletions

diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index 3199ef34..b13c35fe 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -466,7 +466,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     Descriptors are attributes that describe Bluetooth Low Energy characteristic values.
 
     This enum is a convienience type for descriptor class UUIDs. Values of this type
-    will be implicitly converted into a QBluetoothUuid when necessary.
+    will be implicitly converted into a QBluetoothUuid when necessary. The detailed type specifications
+    can be found on \l{https://developer.bluetooth.org/gatt/descriptors/Pages/DescriptorsHomePage.aspx}{bluetooth.org}.
 
     \value CharacteristicExtendedProperties  Descriptor defines additional Characteristic Properties.
                                              The existence of this descriptor is indicated by the
@@ -485,6 +486,14 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value ReportReference                   Mapping information in the form of a Report ID and Report Type which maps the
                                              current parent characteristic to the Report ID(s) and Report Type (s) defined
                                              within the Report Map characteristic.
+    \value EnvironmentalSensingConfiguration Descriptor defines how multiple trigger settings descriptors are combined. Therefore
+                                             this descriptor works together with the \l EnvironmentalSensingTriggerSetting descriptor
+                                             to define the conditions under which the associated characteristic value can be notified.
+    \value EnvironmentalSensingMeasurement   Descriptor defines the additional information for the environmental sensing server
+                                             such as the intended application, sampling functions or measurement period and uncertainty.
+    \value EnvironmentalSensingTriggerSetting Descriptor defines under which conditions an environmental sensing server (ESS) should
+                                             trigger notifications. Examples of such conditions are certain thresholds being reached
+                                             or timers having expired. This implies that the ESS characteristic supports notifications.
     \value UnknownDescriptorType             The descriptor type is unknown.
 */
 
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index 4985d9d9..94e14d0e 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -352,7 +352,12 @@ public:
         CharacteristicAggregateFormat = 0x2905,
         ValidRange = 0x2906,
         ExternalReportReference = 0x2907,
-        ReportReference = 0x2908
+        ReportReference = 0x2908,
+        /* 0x2909 not defined */
+        /* 0x290a not defined */
+        EnvironmentalSensingConfiguration = 0x290b,
+        EnvironmentalSensingMeasurement = 0x290c,
+        EnvironmentalSensingTriggerSetting = 0x290d
     };
 
     QBluetoothUuid();