Diff: nordic/nrf-sdk/s110/ble_types.h

Revision:

37:c29c330d942c

Parent:

0:eff01767de02

Child:

53:1e5c300cec7f

diff -r bd0186ce644a -r c29c330d942c nordic/nrf-sdk/s110/ble_types.h
--- a/nordic/nrf-sdk/s110/ble_types.h	Thu Jul 03 10:01:02 2014 +0100
+++ b/nordic/nrf-sdk/s110/ble_types.h	Mon Jul 07 13:43:31 2014 +0100
@@ -18,7 +18,6 @@
 #define BLE_TYPES_H__
 
 #include <stdint.h>
-#include "nordic_global.h"
 
 /** @addtogroup BLE_COMMON_DEFINES Defines
  * @{ */
@@ -68,8 +67,8 @@
 /** @defgroup BLE_APPEARANCES Bluetooth Appearance values
  *  @note Retrieved from http://developer.bluetooth.org/gatt/characteristics/Pages/CharacteristicViewer.aspx?u=org.bluetooth.characteristic.gap.appearance.xml
  * @{ */
-#define BLE_APPEARANCE_UNKNOWN                              0   /**< Unknown. */
-#define BLE_APPEARANCE_GENERIC_PHONE                        64  /**< Generic Phone. */
+#define BLE_APPEARANCE_UNKNOWN                                0 /**< Unknown. */
+#define BLE_APPEARANCE_GENERIC_PHONE                         64 /**< Generic Phone. */
 #define BLE_APPEARANCE_GENERIC_COMPUTER                     128 /**< Generic Computer. */
 #define BLE_APPEARANCE_GENERIC_WATCH                        192 /**< Generic Watch. */
 #define BLE_APPEARANCE_WATCH_SPORTS_WATCH                   193 /**< Watch: Sports Watch. */
@@ -108,6 +107,15 @@
 #define BLE_APPEARANCE_CYCLING_CADENCE_SENSOR              1155 /**< Cycling: Cadence Sensor. */
 #define BLE_APPEARANCE_CYCLING_POWER_SENSOR                1156 /**< Cycling: Power Sensor. */
 #define BLE_APPEARANCE_CYCLING_SPEED_CADENCE_SENSOR        1157 /**< Cycling: Speed and Cadence Sensor. */
+#define BLE_APPEARANCE_GENERIC_PULSE_OXIMETER              3136 /**< Generic Pulse Oximeter. */
+#define BLE_APPEARANCE_PULSE_OXIMETER_FINGERTIP            3137 /**< Fingertip (Pulse Oximeter subtype). */
+#define BLE_APPEARANCE_PULSE_OXIMETER_WRIST_WORN           3138 /**< Wrist Worn(Pulse Oximeter subtype). */
+#define BLE_APPEARANCE_GENERIC_WEIGHT_SCALE                3200 /**< Generic Weight Scale. */
+#define BLE_APPEARANCE_GENERIC_OUTDOOR_SPORTS_ACT          5184 /**< Generic Outdoor Sports Activity. */
+#define BLE_APPEARANCE_OUTDOOR_SPORTS_ACT_LOC_DISP         5185 /**< Location Display Device (Outdoor Sports Activity subtype). */
+#define BLE_APPEARANCE_OUTDOOR_SPORTS_ACT_LOC_AND_NAV_DISP 5186 /**< Location and Navigation Display Device (Outdoor Sports Activity subtype). */
+#define BLE_APPEARANCE_OUTDOOR_SPORTS_ACT_LOC_POD          5187 /**< Location Pod (Outdoor Sports Activity subtype). */
+#define BLE_APPEARANCE_OUTDOOR_SPORTS_ACT_LOC_AND_NAV_POD  5188 /**< Location and Navigation Pod (Outdoor Sports Activity subtype). */
 /** @} */
 
 /** @brief Set .type and .uuid fields of ble_uuid_struct to specified uuid value. */
@@ -135,6 +143,9 @@
 
 /** @} */
 
+/** @addtogroup BLE_TYPES_STRUCTURES Structures
+ * @{ */
+
 /** @brief 128 bit UUID values. */
 typedef struct
 { 
@@ -148,7 +159,7 @@
     uint8_t     type; /**< UUID type, see @ref BLE_UUID_TYPES. If type is BLE_UUID_TYPE_UNKNOWN, the value of uuid is undefined. */
 } ble_uuid_t;
 
-
+/** @} */
 
 #endif /* BLE_TYPES_H__ */