Index: third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp |
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp |
index 3e284b403c61958a9ae7271c0743b0d88be16aef..599dd0039dcdd976fbf55863c232c80df5604b01 100644 |
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp |
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothUUID.cpp |
@@ -23,7 +23,7 @@ enum class GATTAttribute { Service, Characteristic, Descriptor }; |
NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() { |
DEFINE_THREAD_SAFE_STATIC_LOCAL(NameToAssignedNumberMap, servicesMap, []() { |
- // https://developer.bluetooth.org/gatt/services/Pages/ServicesHome.aspx |
+ // https://www.bluetooth.com/specifications/gatt/services |
NameToAssignedNumberMap* services = new NameToAssignedNumberMap(); |
services->add("alert_notification", 0x1811); |
services->add("automation_io", 0x1815); |
@@ -37,11 +37,13 @@ NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() { |
services->add("cycling_speed_and_cadence", 0x1816); |
services->add("device_information", 0x180A); |
services->add("environmental_sensing", 0x181A); |
+ services->add("fitness_machine", 0x1826); |
services->add("generic_access", 0x1800); |
services->add("generic_attribute", 0x1801); |
services->add("glucose", 0x1808); |
services->add("health_thermometer", 0x1809); |
services->add("heart_rate", 0x180D); |
+ services->add("http_proxy", 0x1823); |
services->add("human_interface_device", 0x1812); |
services->add("immediate_alert", 0x1802); |
services->add("indoor_positioning", 0x1821); |
@@ -49,11 +51,13 @@ NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() { |
services->add("link_loss", 0x1803); |
services->add("location_and_navigation", 0x1819); |
services->add("next_dst_change", 0x1807); |
+ services->add("object_transfer", 0x1825); |
services->add("phone_alert_status", 0x180E); |
services->add("pulse_oximeter", 0x1822); |
services->add("reference_time_update", 0x1806); |
services->add("running_speed_and_cadence", 0x1814); |
services->add("scan_parameters", 0x1813); |
+ services->add("transport_discovery", 0x1824); |
services->add("tx_power", 0x1804); |
services->add("user_data", 0x181C); |
services->add("weight_scale", 0x181D); |
@@ -66,7 +70,7 @@ NameToAssignedNumberMap* getAssignedNumberToServiceNameMap() { |
NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
DEFINE_THREAD_SAFE_STATIC_LOCAL( |
NameToAssignedNumberMap, characteristicsMap, []() { |
- // https://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicsHome.aspx |
+ // https://www.bluetooth.com/specifications/gatt/characteristics |
NameToAssignedNumberMap* characteristics = |
new NameToAssignedNumberMap(); |
characteristics->add("aerobic_heart_rate_lower_limit", 0x2A7E); |
@@ -106,6 +110,7 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("cgm_session_start_time", 0x2AAA); |
characteristics->add("cgm_specific_ops_control_point", 0x2AAC); |
characteristics->add("cgm_status", 0x2AA9); |
+ characteristics->add("cross_trainer_data", 0x2ACE); |
characteristics->add("csc_feature", 0x2A5C); |
characteristics->add("csc_measurement", 0x2A5B); |
characteristics->add("current_time", 0x2A2B); |
@@ -131,6 +136,9 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("fat_burn_heart_rate_upper_limit", 0x2A89); |
characteristics->add("firmware_revision_string", 0x2A26); |
characteristics->add("first_name", 0x2A8A); |
+ characteristics->add("fitness_machine_control_point", 0x2AD9); |
+ characteristics->add("fitness_machine_feature", 0x2ACC); |
+ characteristics->add("fitness_machine_status", 0x2ADA); |
characteristics->add("five_zone_heart_rate_limits", 0x2A8B); |
characteristics->add("floor_number", 0x2AB2); |
characteristics->add("gender", 0x2A8C); |
@@ -147,9 +155,15 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("hid_control_point", 0x2A4C); |
characteristics->add("hid_information", 0x2A4A); |
characteristics->add("hip_circumference", 0x2A8F); |
+ characteristics->add("http_control_point", 0x2ABA); |
+ characteristics->add("http_entity_body", 0x2AB9); |
+ characteristics->add("http_headers", 0x2AB7); |
+ characteristics->add("http_status_code", 0x2AB8); |
+ characteristics->add("https_security", 0x2ABB); |
characteristics->add("humidity", 0x2A6F); |
characteristics->add( |
"ieee_11073-20601_regulatory_certification_data_list", 0x2A2A); |
+ characteristics->add("indoor_bike_data", 0x2AD2); |
characteristics->add("indoor_positioning_configuration", 0x2AAD); |
characteristics->add("intermediate_blood_pressure", 0x2A36); |
characteristics->add("intermediate_temperature", 0x2A1E); |
@@ -174,6 +188,17 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("model_number_string", 0x2A24); |
characteristics->add("navigation", 0x2A68); |
characteristics->add("new_alert", 0x2A46); |
+ characteristics->add("object_action_control_point", 0x2AC5); |
+ characteristics->add("object_changed", 0x2AC8); |
+ characteristics->add("object_first_created", 0x2AC1); |
+ characteristics->add("object_id", 0x2AC3); |
+ characteristics->add("object_last_modified", 0x2AC2); |
+ characteristics->add("object_list_control_point", 0x2AC6); |
+ characteristics->add("object_list_filter", 0x2AC7); |
+ characteristics->add("object_name", 0x2ABE); |
+ characteristics->add("object_properties", 0x2AC4); |
+ characteristics->add("object_size", 0x2AC0); |
+ characteristics->add("ots_feature", 0x2ABD); |
characteristics->add("gap.peripheral_preferred_connection_parameters", |
0x2A04); |
characteristics->add("gap.peripheral_privacy_flag", 0x2A02); |
@@ -191,9 +216,11 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("reference_time_information", 0x2A14); |
characteristics->add("report", 0x2A4D); |
characteristics->add("report_map", 0x2A4B); |
+ characteristics->add("resolvable_private_address_only", 0x2AC9); |
characteristics->add("resting_heart_rate", 0x2A92); |
characteristics->add("ringer_control_point", 0x2A40); |
characteristics->add("ringer_setting", 0x2A41); |
+ characteristics->add("rower_data", 0x2AD1); |
characteristics->add("rsc_feature", 0x2A54); |
characteristics->add("rsc_measurement", 0x2A53); |
characteristics->add("sc_control_point", 0x2A55); |
@@ -205,9 +232,17 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("software_revision_string", 0x2A28); |
characteristics->add("sport_type_for_aerobic_and_anaerobic_thresholds", |
0x2A93); |
+ characteristics->add("stair_climber_data", 0x2AD0); |
+ characteristics->add("step_climber_data", 0x2ACF); |
+ characteristics->add("supported_heart_rate_range", 0x2AD7); |
+ characteristics->add("supported_inclination_range", 0x2AD5); |
characteristics->add("supported_new_alert_category", 0x2A47); |
+ characteristics->add("supported_power_range", 0x2AD8); |
+ characteristics->add("supported_resistance_level_range", 0x2AD6); |
+ characteristics->add("supported_speed_range", 0x2AD4); |
characteristics->add("supported_unread_alert_category", 0x2A48); |
characteristics->add("system_id", 0x2A23); |
+ characteristics->add("tds_control_point", 0x2ABC); |
characteristics->add("temperature", 0x2A6E); |
characteristics->add("temperature_measurement", 0x2A1C); |
characteristics->add("temperature_type", 0x2A1D); |
@@ -218,12 +253,15 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
characteristics->add("time_update_state", 0x2A17); |
characteristics->add("time_with_dst", 0x2A11); |
characteristics->add("time_zone", 0x2A0E); |
+ characteristics->add("training_status", 0x2AD3); |
+ characteristics->add("treadmill_data", 0x2ACD); |
characteristics->add("true_wind_direction", 0x2A71); |
characteristics->add("true_wind_speed", 0x2A70); |
characteristics->add("two_zone_heart_rate_limit", 0x2A95); |
characteristics->add("tx_power_level", 0x2A07); |
characteristics->add("uncertainty", 0x2AB4); |
characteristics->add("unread_alert_status", 0x2A45); |
+ characteristics->add("uri", 0x2AB6); |
characteristics->add("user_control_point", 0x2A9F); |
characteristics->add("user_index", 0x2A9A); |
characteristics->add("uv_index", 0x2A76); |
@@ -242,21 +280,23 @@ NameToAssignedNumberMap* getAssignedNumberForCharacteristicNameMap() { |
NameToAssignedNumberMap* getAssignedNumberForDescriptorNameMap() { |
DEFINE_THREAD_SAFE_STATIC_LOCAL( |
NameToAssignedNumberMap, descriptorsMap, []() { |
- // https://developer.bluetooth.org/gatt/descriptors/Pages/DescriptorsHomePage.aspx |
+ // https://www.bluetooth.com/specifications/gatt/descriptors |
NameToAssignedNumberMap* descriptors = new NameToAssignedNumberMap(); |
+ descriptors->add("gatt.characteristic_aggregate_format", 0x2905); |
descriptors->add("gatt.characteristic_extended_properties", 0x2900); |
+ descriptors->add("gatt.characteristic_presentation_format", 0x2904); |
descriptors->add("gatt.characteristic_user_description", 0x2901); |
descriptors->add("gatt.client_characteristic_configuration", 0x2902); |
- descriptors->add("gatt.server_characteristic_configuration", 0x2903); |
- descriptors->add("gatt.characteristic_presentation_format", 0x2904); |
- descriptors->add("gatt.characteristic_aggregate_format", 0x2905); |
- descriptors->add("valid_range", 0x2906); |
- descriptors->add("external_report_reference", 0x2907); |
- descriptors->add("report_reference", 0x2908); |
- descriptors->add("value_trigger_setting", 0x290A); |
descriptors->add("es_configuration", 0x290B); |
descriptors->add("es_measurement", 0x290C); |
descriptors->add("es_trigger_setting", 0x290D); |
+ descriptors->add("external_report_reference", 0x2907); |
+ descriptors->add("number_of_digitals", 0x2909); |
+ descriptors->add("report_reference", 0x2908); |
+ descriptors->add("gatt.server_characteristic_configuration", 0x2903); |
ortuno
2017/03/29 21:00:31
I think this belongs further up.
|
+ descriptors->add("time_trigger_setting", 0x290E); |
+ descriptors->add("valid_range", 0x2906); |
+ descriptors->add("value_trigger_setting", 0x290A); |
return descriptors; |
}()); |
@@ -318,20 +358,17 @@ String getUUIDForGATTAttribute(GATTAttribute attribute, |
switch (attribute) { |
case GATTAttribute::Service: |
errorMessage.append( |
- "https://developer.bluetooth.org/gatt/services/Pages/" |
- "ServicesHome.aspx" |
+ "https://www.bluetooth.com/specifications/gatt/services" |
" e.g. 'alert_notification'."); |
break; |
case GATTAttribute::Characteristic: |
errorMessage.append( |
- "https://developer.bluetooth.org/gatt/characteristics/Pages/" |
- "CharacteristicsHome.aspx" |
+ "https://www.bluetooth.com/specifications/gatt/characteristics" |
" e.g. 'aerobic_heart_rate_lower_limit'."); |
break; |
case GATTAttribute::Descriptor: |
errorMessage.append( |
- "https://developer.bluetooth.org/gatt/descriptors/Pages/" |
- "DescriptorsHomePage.aspx" |
+ "https://www.bluetooth.com/specifications/gatt/descriptors" |
" e.g. 'gatt.characteristic_presentation_format'."); |
break; |
} |