Add newly adopted BTLE service/characteristic type uuids

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

2 files changed, 191 insertions, 11 deletions

diff --git a/src/bluetooth/qbluetoothuuid.cpp b/src/bluetooth/qbluetoothuuid.cpp
index f4840428..3199ef34 100644
--- a/src/bluetooth/qbluetoothuuid.cpp
+++ b/src/bluetooth/qbluetoothuuid.cpp
@@ -211,6 +211,18 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
                                       sensor intended for sports and fitness applications.
     \value LocationAndNavigation      Location Navigation UUID (service). The service exposes location and navigation-related
                                       data from a Location and Navigation sensor intended for outdoor activity applications.
+    \value EnvironmentalSensing       Environmental sensor UUID (service). The service exposes data from an environmental sensor
+                                      for sports and fitness applications.
+    \value BodyComposition            Body composition UUID (service). The service exposes data about the body composition intended
+                                      for consumer healthcare applications.
+    \value UserData                   User Data UUID (service). The User Data service provides user-related data such as name,
+                                      gender or weight in sports and fitness environments.
+    \value WeightScale                Weight Scale UUID (service). The Weight Scale service exposes weight-related data from
+                                      a scale for consumer healthcare, sports and fitness applications.
+    \value BondManagement             Bond Management UUID (service). The Bond Management service enables user to manage the
+                                      storage of bond information on Bluetooth devices.
+    \value ContinuousGlucoseMonitoring Continuous Glucose Monitoring UUID (service). The Continuous Glucose Monitoring service
+                                      exposes glucose data from a monitoring sensor for use in healthcare applications.
 */
 
 /*!
@@ -218,8 +230,20 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \since 5.4
 
     This enum is a convienience type for Bluetooth low energy service characteristics 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 descriptions can be found
+    on \l{https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicsHome.aspx}{bluetooth.org}.
+
+    \value AerobicHeartRateLowerLimit    The lower limit of the heart rate where the user improves his endurance while
+                                         exercising.
+    \value AerobicHeartRateUpperLimit    The upper limit of the heart rate where the user improves his endurance while
+                                         exercising.
+    \value AerobicThreshold              This characteristic states the first metabolic threshold.
+    \value Age                           This characteristic states the age of the user.
+    \value AnaerobicHeartRateLowerLimit  The lower limit of the heart rate where the user enhances his anaerobic
+                                         tolerance while exercising.
+    \value AnaerobicHeartRateUpperLimit  The upper limit of the heart rate where the user enhances his anaerobic
+                                         tolerance while exercising.
+    \value AnaerobicThreshold            This characteristic states the second metabolic threshold.
     \value AlertCategoryID               Categories of alerts/messages.
     \value AlertCategoryIDBitMask        Categories of alerts/messages.
     \value AlertLevel                    The level of an alert a device is to sound.
@@ -229,8 +253,14 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
                                          Client can write the command here to request the several
                                          functions toward the server.
     \value AlertStatus                   The Alert Status characteristic defines the Status of alert.
+    \value ApparentWindDirection         The characteristic exposes the apparent wind direction. The apparent wind is
+                                         experienced by an observer in motion. This characteristic states the direction
+                                         of the wind with an angle measured clockwise relative to the observers heading.
+    \value ApparentWindSpeed             The characteristic exposes the apparent wind speed in meters per second.
+                                         The apparent wind is experienced by an observer in motion.
     \value Appearance                    The external appearance of this device. The values are composed
                                          of a category (10-bits) and sub-categories (6-bits).
+    \value BarometricPressureTrend       This characteristic exposes the trend the barometric pressure is taking.
     \value BatteryLevel                  The current charge level of a battery. 100% represents fully charged
                                          while 0% represents fully discharged.
     \value BloodPressureFeature          The Blood Pressure Feature characteristic is used to describe the supported
@@ -239,7 +269,12 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
                                          containing a Flags field, a Blood Pressure Measurement Compound Value field,
                                          and contains additional fields such as Time Stamp, Pulse Rate and User ID
                                          as determined by the contents of the Flags field.
-    \value BodySensorLocation
+    \value BodyCompositionFeature        This characteristic describes the available features in the \l BodyCompositionMeasurement
+                                         characteristic.
+    \value BodyCompositionMeasurement    This characteristic describes the body composition such as muscle percentage
+                                         or the body water mass.
+    \value BodySensorLocation            The Body Sensor Location characteristic describes the location of a sensor on
+                                         the body (e.g.: chest, finger or hand).
     \value BootKeyboardInputReport       The Boot Keyboard Input Report characteristic is used to transfer fixed format
                                          and length Input Report data between a HID Host operating in Boot Protocol Mode
                                          and a HID Service corresponding to a boot keyboard.
@@ -255,7 +290,8 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
                                          is a variable length structure containing a Flags field and, based on the contents
                                          of the Flags field, may contain one or more additional fields as shown in the tables
                                          below.
-    \value CurrentTime
+    \value CurrentTime                   The Current Time characteristic shows the same information as the \l ExactTime256
+                                         characteristic and information on timezone, DST and the method of update employed.
     \value CyclingPowerControlPoint      The Cycling Power Control Point characteristic is used to request a specific function
                                          to be executed on the receiving device.
     \value CyclingPowerFeature           The CP Feature characteristic is used to report a list of features supported by
@@ -266,14 +302,28 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value CyclingPowerVector            The Cycling Power Vector characteristic is a variable length structure containing
                                          a Flags fieldand based on the contents of the Flags field, may contain one or more
                                          additional fields as shown in the table below.
+    \value DatabaseChangeIncrement
+    \value DateOfBirth                   This characteristic states the user's date of birth.
+    \value DateOfThresholdAssessment
     \value DateTime                      The Date Time characteristic is used to represent time.
-    \value DayDateTime
-    \value DayOfWeek
-    \value DeviceName
-    \value DSTOffset
-    \value ExactTime256
+    \value DayDateTime                   The Day Date Time characteristic presents the date, time and day of the week.
+    \value DayOfWeek                     The Day of Week characteristic describes the day of the week (Monday - Sunday).
+    \value DescriptorValueChanged        This characteristic is related to the Environmental Sensing Service.
+    \value DeviceName                    The Device Name characteristic contains the name of the device.
+    \value DewPoint                      This characteristic states the dew point in degree Celsius.
+    \value DSTOffset                     The DST Offset characteristic describes the offset employed by the daylight saving time.
+    \value Elevation                     The Elevation characteristic states the elevation above/below sea level.
+    \value EmailAddress                  This characteristic states the email of the user.
+    \value ExactTime256                  The Exact Time 256 characteristic describes the data, day and time
+                                         with an accuracy of 1/256th of a second.
+    \value FatBurnHeartRateLowerLimit    The lower limit of the heart rate where the user maximizes the fat burn while exercising.
+    \value FatBurnHeartRateUpperLimit    The upper limit of the heart rate where the user maximizes the fat burn while exercising.
     \value FirmwareRevisionString        The value of this characteristic is a UTF-8 string representing the firmware revision
                                          for the firmware within the device.
+    \value FirstName                     This characteristic exposes the user's first name.
+    \value FiveZoneHeartRateLimits       This characteristic contains the limits between the heart rate zones for the
+                                         5-zone heart rate definition.
+    \value Gender                        This characteristic states the user's gender.
     \value GlucoseFeature                The Glucose Feature characteristic is used to describe the supported features
                                          of the Server. When read, the Glucose Feature characteristic returns a value
                                          that is used by a Client to determine the supported features of the Server.
@@ -282,20 +332,31 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
                                          of the Flags field, may contain a Time Offset field, Glucose Concentration field,
                                          Type-Sample Location field and a Sensor Status Annunciation field.
     \value GlucoseMeasurementContext
+    \value GustFactor                    The characteristic states a factor of wind speed increase between average wind speed in
+                                         maximum gust speed.
     \value HardwareRevisionString        The value of this characteristic is a UTF-8 string representing the hardware revision
                                          for the hardware within the device.
+    \value MaximumRecommendedHeartRate   This characteristic exposes the maximum recommended heart rate that limits exertion.
     \value HeartRateControlPoint
+    \value HeartRateMax                  This characteristic states the maximum heart rate a user can reach in beats per minute.
     \value HeartRateMeasurement
+    \value HeatIndex                     This characteristic provides a heat index in degree Celsius.
+    \value Height                        This characteristic states the user's height.
     \value HIDControlPoint               The HID Control Point characteristic is a control-point attribute that defines the
                                          HID Commands when written.
     \value HIDInformation                The HID Information Characteristic returns the HID attributes when read.
+    \value HipCircumference              This characteristic states the user's hip circumference in meters.
+    \value Humidity                      The characteristic states the humidity in percent.
     \value IEEE1107320601RegulatoryCertificationDataList The value of the characteristic is an opaque structure listing
                                          various regulatory and/or certification compliance items to which the device
                                          claims adherence.
     \value IntermediateCuffPressure      This characteristic has the same format as the Blood Pressure Measurement
                                          characteristic.
     \value IntermediateTemperature       The Intermediate Temperature characteristic has the same format as the
-                                         Temperature Measurement characteristic
+                                         Temperature Measurement characteristic.
+    \value Irradiance                    This characteristic states the power of electromagnetic radiation in watt per square meter.
+    \value Language                      This characteristic contains the language definition based on ISO639-1.
+    \value LastName                      This characteristic states the user's last name.
     \value LNControlPoint                The LN Control Point characteristic is used to request a specific function
                                          to be executed on the receiving device.
     \value LNFeature                     The LN Feature characteristic is used to report a list of features supported
@@ -304,6 +365,11 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value LocationAndSpeed              The Location and Speed characteristic is a variable length structure containing
                                          a Flags field and, based on the contents of the Flags field, may contain a combination
                                          of data fields.
+    \value MagneticDeclination           The characteristic contains the angle on the horizontal plane between the direction of
+                                         the (Geographic) True North and the Magnetic North, measured clockwise from True North
+                                         to Magnetic North.
+    \value MagneticFluxDensity2D         This characteristic states the magnetic flux density on an x and y axis.
+    \value MagneticFluxDensity3D         This characteristic states the magnetic flux density on an x, y and z axis.
     \value ManufacturerNameString        The value of this characteristic is a UTF-8 string representing the name of the
                                          manufacturer of the device.
     \value MeasurementInterval           The Measurement Interval characteristic defines the time between measurements.
@@ -317,11 +383,14 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value PeripheralPrivacyFlag
     \value PnPID                         The PnP_ID characteristic returns its value when read using the GATT Characteristic
                                          Value Read procedure.
+    \value PollenConcentration           The characteristic exposes the pollen concentration count per cubic meter.
     \value PositionQuality               The Position Quality characteristic is a variable length structure containing a
-                                         Flags field and at least one of the optional data
+                                         Flags field and at least one of the optional data.
+    \value Pressure                      The Pressure characteristic states the value of a pressure sensor.
     \value ProtocolMode                  The Protocol Mode characteristic is used to expose the current protocol mode of
                                          the HID Service with which it is associated, or to set the desired protocol
                                          mode of the HID Service.
+    \value Rainfall                      This characteristic exposes the rainfall in meters.
     \value ReconnectionAddress           The Information included in this page is informative. The normative descriptions
                                          are contained in the applicable specification.
     \value RecordAccessControlPoint      This control point is used with a service to provide basic management functionality
@@ -329,6 +398,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value ReferenceTimeInformation
     \value Report                        The Report characteristic is used to exchange data between a HID Device and a HID Host.
     \value ReportMap                     Only a single instance of this characteristic exists as part of a HID Service.
+    \value RestingHeartRate              This characteristic exposes the lowest heart rate a user can reach.
     \value RingerControlPoint            The Ringer Control Point characteristic defines the Control Point of Ringer.
     \value RingerSetting                 The Ringer Setting characteristic defines the Setting of the Ringer.
     \value RSCFeature                    The RSC (Running Speed and Cadence) Feature characteristic is used to describe the
@@ -347,26 +417,46 @@ Q_GLOBAL_STATIC_WITH_ARGS(QUuid, baseUuid, ("{00000000-0000-1000-8000-00805F9B34
     \value ServiceChanged
     \value SoftwareRevisionString        The value of this characteristic is a UTF-8 string representing the software
                                          revision for the software within the device.
+    \value SportTypeForAerobicAnaerobicThresholds This characteristic is used to preset the various Aerobic and Anaerobic
+                                         threshold characteristics based on the to-be-performed sport type.
     \value SupportedNewAlertCategory     Category that the server supports for new alert.
     \value SupportedUnreadAlertCategory  Category that the server supports for unread alert.
     \value SystemID                      If the system ID is based of a Bluetooth Device Address with a Company Identifier
                                          (OUI) is 0x123456 and the Company Assigned Identifier is 0x9ABCDE, then the System
                                          Identifier is required to be 0x123456FFFE9ABCDE.
+    \value Temperature                   The value of this characteristic states the temperature in degree Celsius.
     \value TemperatureMeasurement        The Temperature Measurement characteristic is a variable length structure containing
                                          a Flags field, a Temperature Measurement Value field and, based upon the contents of
                                          the Flags field, optionally a Time Stamp field and/or a Temperature Type field.
     \value TemperatureType               The Temperature Type characteristic is an enumeration that indicates where the
                                          temperature was measured.
+    \value ThreeZoneHeartRateLimits      This characteristic contains the limits between the heart rate zones for the
+                                         3-zone heart rate definition.
     \value TimeAccuracy
     \value TimeSource
     \value TimeUpdateControlPoint
     \value TimeUpdateState
     \value TimeWithDST
     \value TimeZone
+    \value TrueWindDirection             The characteristic states the direction of the wind with an angle measured clockwise
+                                         relative to (Geographic) True North. A wind coming from the east is given as 90 degrees.
+    \value TrueWindSpeed                 The characteristic states the wind speed in meters per seconds.
+    \value TwoZoneHeartRateLimits        This characteristic contains the limits between the heart rate zones for the
+                                         2-zone heart rate definition.
     \value TxPowerLevel                  The value of the characteristic is a signed 8 bit integer that has a fixed point
                                          exponent of 0.
     \value UnreadAlertStatus             This characteristic shows how many numbers of unread alerts exist in the specific
                                          category in the device.
+    \value UserControlPoint
+    \value UserIndex                     This characteristic states the index of the user.
+    \value UVIndex                       This characteristic exposes the UV index.
+    \value VO2Max                        This characteristic exposes the maximum Oxygen uptake of a user.
+    \value WaistCircumference            This characteristic states the user's waist circumference in meters.
+    \value Weight                        This characteristic exposes the user's weight in kilograms.
+    \value WeightMeasurement             This characteristic provides weight related data such as BMI or the user's weight.
+    \value WeightScaleFeature            This characteristic describes the available data in the \l WeightMeasurement
+                                         characteristic.
+    \value WindChill                     This characteristic states the wind chill in degree Celsius
 */
 
 /*!
diff --git a/src/bluetooth/qbluetoothuuid.h b/src/bluetooth/qbluetoothuuid.h
index 2c035ffa..4985d9d9 100644
--- a/src/bluetooth/qbluetoothuuid.h
+++ b/src/bluetooth/qbluetoothuuid.h
@@ -166,6 +166,13 @@ public:
         CyclingSpeedAndCadence = 0x1816,
         CyclingPower = 0x1818,
         LocationAndNavigation = 0x1819,
+        EnvironmentalSensing = 0x181a,
+        BodyComposition = 0x181b,
+        UserData = 0x181c,
+        WeightScale = 0x181d,
+        BondManagement = 0x181e,
+        ContinuousGlucoseMonitoring = 0x181f,
+
     };
 
     enum CharacteristicType {
@@ -180,21 +187,28 @@ public:
         DateTime = 0x2a08,
         DayOfWeek = 0x2a09,
         DayDateTime = 0x2a0a,
+        /* 0x2a0b not defined */
         ExactTime256 = 0x2a0c,
         DSTOffset = 0x2a0d,
         TimeZone = 0x2a0e,
         LocalTimeInformation = 0x2a0f,
+        /* 0x2a10 not defined */
         TimeWithDST = 0x2a11,
         TimeAccuracy = 0x2a12,
         TimeSource = 0x2a13,
         ReferenceTimeInformation = 0x2a14,
+        /* 0x2a15 not defined */
         TimeUpdateControlPoint = 0x2a16,
         TimeUpdateState = 0x2a17,
         GlucoseMeasurement = 0x2a18,
         BatteryLevel = 0x2a19,
+        /* 0x2a1a not defined */
+        /* 0x2a1b not defined */
         TemperatureMeasurement = 0x2a1c,
         TemperatureType = 0x2a1d,
         IntermediateTemperature = 0x2a1e,
+        /* 0x2a1f not defined */
+        /* 0x2a20 not defined */
         MeasurementInterval = 0x2a21,
         BootKeyboardInputReport = 0x2a22,
         SystemID = 0x2a23,
@@ -206,6 +220,11 @@ public:
         ManufacturerNameString = 0x2a29,
         IEEE1107320601RegulatoryCertificationDataList = 0x2a2a,
         CurrentTime = 0x2a2b,
+        MagneticDeclination = 0x2a2c,
+        /* 0x2a2d not defined */
+        /* 0x2a2e not defined */
+        /* 0x2a2f not defined */
+        /* 0x2a30 not defined */
         ScanRefresh = 0x2a31,
         BootKeyboardOutputReport = 0x2a32,
         BootMouseInputReport = 0x2a33,
@@ -215,6 +234,11 @@ public:
         HeartRateMeasurement = 0x2a37,
         BodySensorLocation = 0x2a38,
         HeartRateControlPoint = 0x2a39,
+        /* 0x2a3a not defined */
+        /* 0x2a3b not defined */
+        /* 0x2a3c not defined */
+        /* 0x2a3d not defined */
+        /* 0x2a3e not defined */
         AlertStatus = 0x2a3f,
         RingerControlPoint = 0x2a40,
         RingerSetting = 0x2a41,
@@ -238,9 +262,19 @@ public:
         RSCMeasurement = 0x2a53,
         RSCFeature = 0x2a54,
         SCControlPoint = 0x2a55,
+        /* 0x2a56 not defined */
+        /* 0x2a57 not defined */
+        /* 0x2a58 not defined */
+        /* 0x2a59 not defined */
+        /* 0x2a5a not defined */
         CSCMeasurement = 0x2a5b,
         CSCFeature = 0x2a5c,
         SensorLocation = 0x2a5d,
+        /* 0x2a5e not defined */
+        /* 0x2a5f not defined */
+        /* 0x2a60 not defined */
+        /* 0x2a61 not defined */
+        /* 0x2a62 not defined */
         CyclingPowerMeasurement = 0x2a63,
         CyclingPowerVector = 0x2a64,
         CyclingPowerFeature = 0x2a65,
@@ -250,6 +284,62 @@ public:
         PositionQuality = 0x2a69,
         LNFeature = 0x2a6a,
         LNControlPoint = 0x2a6b,
+        Elevation = 0x2a6c,
+        Pressure = 0x2a6d,
+        Temperature = 0x2a6e,
+        Humidity = 0x2a6f,
+        TrueWindSpeed = 0x2a70,
+        TrueWindDirection = 0x2a71,
+        ApparentWindSpeed = 0x2a72,
+        ApparentWindDirection = 0x2a73,
+        GustFactor = 0x2a74,
+        PollenConcentration = 0x2a75,
+        UVIndex = 0x2a76,
+        Irradiance = 0x2a77,
+        Rainfall = 0x2a78,
+        WindChill = 0x2a79,
+        HeatIndex = 0x2a7a,
+        DewPoint = 0x2a7b,
+        /* 0x2a7c not defined */
+        DescriptorValueChanged = 0x2a7d,
+        AerobicHeartRateLowerLimit = 0x2a7e,
+        AerobicThreshold = 0x2a7f,
+        Age = 0x2a80,
+        AnaerobicHeartRateLowerLimit = 0x2a81,
+        AnaerobicHeartRateUpperLimit = 0x2a82,
+        AnaerobicThreshold = 0x2a83,
+        AerobicHeartRateUpperLimit = 0x2a84,
+        DateOfBirth = 0x2a85,
+        DateOfThresholdAssessment = 0x2a86,
+        EmailAddress = 0x2a87,
+        FatBurnHeartRateLowerLimit = 0x2a88,
+        FatBurnHeartRateUpperLimit = 0x2a89,
+        FirstName = 0x2a8a,
+        FiveZoneHeartRateLimits = 0x2a8b,
+        Gender = 0x2a8c,
+        HeartRateMax = 0x2a8d,
+        Height = 0x2a8e,
+        HipCircumference = 0x2a8f,
+        LastName = 0x2a90,
+        MaximumRecommendedHeartRate = 0x2a91,
+        RestingHeartRate = 0x2a92,
+        SportTypeForAerobicAnaerobicThresholds = 0x2a93,
+        ThreeZoneHeartRateLimits = 0x2a94,
+        TwoZoneHeartRateLimits = 0x2a95,
+        VO2Max = 0x2a96,
+        WaistCircumference = 0x2a97,
+        Weight = 0x2a98,
+        DatabaseChangeIncrement = 0x2a99,
+        UserIndex = 0x2a9a,
+        BodyCompositionFeature = 0x2a9b,
+        BodyCompositionMeasurement = 0x2a9c,
+        WeightMeasurement = 0x2a9d,
+        WeightScaleFeature = 0x2a9e,
+        UserControlPoint = 0x2a9f,
+        MagneticFluxDensity2D = 0x2aa0,
+        MagneticFluxDensity3D = 0x2aa1,
+        Language = 0x2aa2,
+        BarometricPressureTrend = 0x2aa3
     };
 
     enum DescriptorType {