bugfix for duplicate symbol
Fork of nRF51822 by
Diff: btle/custom/custom_helper.cpp
- Revision:
- 19:c5b5cb65cc6f
- Parent:
- 18:465e0419c178
- Child:
- 21:84599842b5fb
--- a/btle/custom/custom_helper.cpp Thu Jun 05 08:50:55 2014 +0100 +++ b/btle/custom/custom_helper.cpp Thu Jun 05 08:53:18 2014 +0100 @@ -24,7 +24,7 @@ */ typedef struct { LongUUID_t uuid; - uint8_t type; + uint8_t type; } converted_uuid_table_entry_t; static const unsigned UUID_TABLE_MAX_ENTRIES = 8; /* This is the maximum number * of 128-bit UUIDs with distinct bases that @@ -189,12 +189,12 @@ @retval ERROR_NONE Everything executed normally */ /**************************************************************************/ -error_t custom_add_in_characteristic(uint16_t service_handle, - ble_uuid_t *p_uuid, - uint8_t properties, - uint8_t *p_data, - uint16_t min_length, - uint16_t max_length, +error_t custom_add_in_characteristic(uint16_t service_handle, + ble_uuid_t *p_uuid, + uint8_t properties, + uint8_t *p_data, + uint16_t min_length, + uint16_t max_length, ble_gatts_char_handles_t *p_char_handle) { /* Characteristic metadata */ @@ -239,7 +239,6 @@ attr_char_value.max_len = max_length; attr_char_value.p_value = p_data; - ASSERT_STATUS ( sd_ble_gatts_characteristic_add(service_handle, &char_md, &attr_char_value,