Revision 83:fd58c1fe7849, committed 2014-06-11

Comitter:

Rohit Grover

Date:

Wed Jun 11 08:32:18 2014 +0100

Parent:

82:9853676a88e6

Child:

84:d1903e73a42c

Commit message:

merge GattCharacteristic.cpp into the .hpp file

Changed in this revision

--- a/GattCharacteristic.cpp	Wed Jun 11 08:28:14 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "GattCharacteristic.h"
-
-/**************************************************************************/
-/*!
-    @brief  Creates a new GattCharacteristic using the specified 16-bit
-            UUID, value length, and properties
-
-    @note   The UUID value must be unique in the service and is normally >1
-
-    @param[in]  uuid
-                The UUID to use for this characteristic
-    @param[in]  initialLen
-                The min length in bytes of this characteristic's value
-    @param[in]  maxLen
-                The max length in bytes of this characteristic's value
-    @param[in]  props
-                The 8-bit bit field containing the characteristic's properties
-
-    @section EXAMPLE
-
-    @code
-
-    // UUID = 0x2A19, Min length 2, Max len = 2, Properties = write
-    GattCharacteristic c = GattCharacteristic( 0x2A19, 2, 2, BLE_GATT_CHAR_PROPERTIES_WRITE );
-
-    @endcode
-*/
-/**************************************************************************/
-GattCharacteristic::GattCharacteristic(const UUID &id, uint16_t initialLen, uint16_t maxLen, uint8_t props) :
-    _uuid(id), _lenMin(initialLen), _lenMax(maxLen), _handle(), _properties(props)
-{
-    /* empty */
-}

--- a/GattCharacteristic.h	Wed Jun 11 08:28:14 2014 +0100
+++ b/GattCharacteristic.h	Wed Jun 11 08:32:18 2014 +0100
@@ -302,7 +302,35 @@
         uint16_t gatt_nsdesc;    /**< Namespace description from Bluetooth Assigned Numbers, normally '0', see @ref BLE_GATT_CPF_NAMESPACES. */
     } presentation_format_t;
 
-    GattCharacteristic(const UUID &uuid, uint16_t initialLen = 1, uint16_t maxLen = 1, uint8_t properties = 0);
+    /**
+     *  @brief  Creates a new GattCharacteristic using the specified 16-bit
+     *          UUID, value length, and properties
+     *
+     *  @note   The UUID value must be unique in the service and is normally >1
+     *
+     *  @param[in]  uuid
+     *              The UUID to use for this characteristic
+     *  @param[in]  initialLen
+     *              The min length in bytes of this characteristic's value
+     *  @param[in]  maxLen
+     *              The max length in bytes of this characteristic's value
+     *  @param[in]  props
+     *              The 8-bit bit field containing the characteristic's properties
+     *
+     *  @section EXAMPLE
+     *
+     *  @code
+     *
+     *  // UUID = 0x2A19, Min length 2, Max len = 2, Properties = write
+     *  GattCharacteristic c = GattCharacteristic( 0x2A19, 2, 2, BLE_GATT_CHAR_PROPERTIES_WRITE );
+     *
+     *  @endcode
+    */
+    /**************************************************************************/
+    GattCharacteristic(const UUID &uuid, uint16_t initialLen, uint16_t maxLen, uint8_t props) :
+        _uuid(uuid), _lenMin(initialLen), _lenMax(maxLen), _handle(), _properties(props) {
+        /* empty */
+    }
 
 public:
     uint16_t getHandle(void) const {