Taouil Yassine
Nordic nrf51 sdk sources. Mirrored from https://github.com/ARMmbed/nrf51-sdk.
Fork of
nrf51-sdk
by 
Nordic Semiconductor
Revision 32:6335323e4327, committed 2016-04-07
- Comitter:
- vcoubard
- Date:
- Thu Apr 07 17:38:06 2016 +0100
- Parent:
- 31:c05fa48ed560
- Child:
- 33:0d31ee7f1af0
- Commit message:
- Synchronized with git rev 8a57aa2d
Author: Liyou Zhou
Change README to point to sdk v10
Changed in this revision
--- a/README.md Thu Apr 07 17:38:04 2016 +0100 +++ b/README.md Thu Apr 07 17:38:06 2016 +0100 @@ -1,5 +1,5 @@ # nrf51-sdk -Module to contain files provided by the nordic nRF51 SDK. The latest version of this module uses files from Nordic SDK 9.0.0. The files are extracted from [here](https://developer.nordicsemi.com/nRF51_SDK/nRF51_SDK_v9.x.x/nRF51_SDK_9.0.0_2e23562.zip). +Module to contain files provided by the nordic nRF51 SDK. The latest version of this module uses files from Nordic SDK 10.0.0. The files are extracted from [here](https://developer.nordicsemi.com/nRF5_SDK/nRF51_SDK_v10.x.x/nRF51_SDK_10.0.0_dc26b5e.zip). ## Changes made to Nordic files The files are kept the same as much as possible to the Nordic SDK. Modifications are made in order to integrate with mbed.
--- a/source/nordic_sdk/components/ble/common/ble_advdata.c Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/ble/common/ble_advdata.c Thu Apr 07 17:38:06 2016 +0100
@@ -37,54 +37,159 @@
#include "ble_srv_common.h"
#include "app_util.h"
+// NOTE: For now, Security Manager Out of Band Flags (OOB) are omitted from the advertising data.
-// Offset from where advertisement data other than flags information can start.
-#define ADV_FLAG_OFFSET 2
+// Types of LE Bluetooth Device Address AD type
+#define AD_TYPE_BLE_DEVICE_ADDR_TYPE_PUBLIC 0UL
+#define AD_TYPE_BLE_DEVICE_ADDR_TYPE_RANDOM 1UL
+
+static uint32_t tk_value_encode(ble_advdata_tk_value_t * p_tk_value,
+ uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
+{
+ int8_t i;
+
+ // Check for buffer overflow.
+ if (((*p_offset) + AD_TYPE_TK_VALUE_SIZE) > max_size)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+
+ // Encode LE Role.
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + AD_TYPE_TK_VALUE_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_SECURITY_MANAGER_TK_VALUE;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+
+ for (i = AD_TYPE_TK_VALUE_DATA_SIZE - 1; i >= 0; i--, (*p_offset)++)
+ {
+ p_encoded_data[*p_offset] = p_tk_value->tk[i];
+ }
+
+ return NRF_SUCCESS;
+}
+
+static uint32_t le_role_encode(ble_advdata_le_role_t le_role,
+ uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
+{
+ // Check for buffer overflow.
+ if (((*p_offset) + AD_TYPE_LE_ROLE_SIZE) > max_size)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
-// Offset for Advertising Data.
-// Offset is 2 as each Advertising Data contain 1 octet of Adveritising Data Type and
-// one octet Advertising Data Length.
-#define ADV_DATA_OFFSET 2
+ // Encode LE Role.
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + AD_TYPE_LE_ROLE_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_LE_ROLE;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ switch(le_role)
+ {
+ case BLE_ADVDATA_ROLE_ONLY_PERIPH:
+ p_encoded_data[*p_offset] = 0;
+ break;
+ case BLE_ADVDATA_ROLE_ONLY_CENTRAL:
+ p_encoded_data[*p_offset] = 1;
+ break;
+ case BLE_ADVDATA_ROLE_BOTH_PERIPH_PREFERRED:
+ p_encoded_data[*p_offset] = 2;
+ break;
+ case BLE_ADVDATA_ROLE_BOTH_CENTRAL_PREFERRED:
+ p_encoded_data[*p_offset] = 3;
+ break;
+ default:
+ return NRF_ERROR_INVALID_PARAM;
+ }
+ *p_offset += AD_TYPE_LE_ROLE_DATA_SIZE;
+
+ return NRF_SUCCESS;
+}
+
+static uint32_t ble_device_addr_encode(uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
+{
+ uint32_t err_code;
+ ble_gap_addr_t device_addr;
-// NOTE: For now, Security Manager TK Value and Security Manager Out of Band Flags (OOB) are omitted
-// from the advertising data.
+ // Check for buffer overflow.
+ if (((*p_offset) + AD_TYPE_BLE_DEVICE_ADDR_SIZE) > max_size)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+
+ // Get BLE address
+ err_code = sd_ble_gap_address_get(&device_addr);
+ if (err_code != NRF_SUCCESS)
+ {
+ return err_code;
+ }
+ // Encode LE Bluetooth Device Address
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE +
+ AD_TYPE_BLE_DEVICE_ADDR_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_LE_BLUETOOTH_DEVICE_ADDRESS;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ memcpy(&p_encoded_data[*p_offset], &device_addr.addr[0], BLE_GAP_ADDR_LEN);
+ *p_offset += BLE_GAP_ADDR_LEN;
+ if(BLE_GAP_ADDR_TYPE_PUBLIC == device_addr.addr_type)
+ {
+ p_encoded_data[*p_offset] = AD_TYPE_BLE_DEVICE_ADDR_TYPE_PUBLIC;
+ }
+ else
+ {
+ p_encoded_data[*p_offset] = AD_TYPE_BLE_DEVICE_ADDR_TYPE_RANDOM;
+ }
+ *p_offset += AD_TYPE_BLE_DEVICE_ADDR_TYPE_SIZE;
+
+ return NRF_SUCCESS;
+}
static uint32_t name_encode(const ble_advdata_t * p_advdata,
uint8_t * p_encoded_data,
- uint8_t * p_len)
+ uint16_t * p_offset,
+ uint16_t max_size)
{
uint32_t err_code;
uint16_t rem_adv_data_len;
uint16_t actual_length;
uint8_t adv_data_format;
- uint8_t adv_offset;
-
- adv_offset = *p_len;
+ // Validate parameters
+ if((BLE_ADVDATA_SHORT_NAME == p_advdata->name_type) && (0 == p_advdata->short_name_len))
+ {
+ return NRF_ERROR_INVALID_PARAM;
+ }
+
// Check for buffer overflow.
- if ((adv_offset + ADV_DATA_OFFSET > BLE_GAP_ADV_MAX_SIZE) ||
- ((p_advdata->short_name_len + ADV_DATA_OFFSET) > BLE_GAP_ADV_MAX_SIZE))
+ if ( (((*p_offset) + ADV_AD_DATA_OFFSET) > max_size) ||
+ ( (BLE_ADVDATA_SHORT_NAME == p_advdata->name_type) &&
+ (((*p_offset) + ADV_AD_DATA_OFFSET + p_advdata->short_name_len) > max_size)))
{
return NRF_ERROR_DATA_SIZE;
}
- actual_length = rem_adv_data_len = (BLE_GAP_ADV_MAX_SIZE - adv_offset - ADV_FLAG_OFFSET);
+
+ rem_adv_data_len = max_size - (*p_offset) - ADV_AD_DATA_OFFSET;
+ actual_length = rem_adv_data_len;
// Get GAP device name and length
- err_code = sd_ble_gap_device_name_get(&p_encoded_data[adv_offset + ADV_DATA_OFFSET],
+ err_code = sd_ble_gap_device_name_get(&p_encoded_data[(*p_offset) + ADV_AD_DATA_OFFSET],
&actual_length);
if (err_code != NRF_SUCCESS)
{
return err_code;
}
- // Check if device internd to use short name and it can fit available data size.
+ // Check if device intend to use short name and it can fit available data size.
if ((p_advdata->name_type == BLE_ADVDATA_FULL_NAME) && (actual_length <= rem_adv_data_len))
{
// Complete device name can fit, setting Complete Name in Adv Data.
- adv_data_format = BLE_GAP_AD_TYPE_COMPLETE_LOCAL_NAME;
- rem_adv_data_len = actual_length;
+ adv_data_format = BLE_GAP_AD_TYPE_COMPLETE_LOCAL_NAME;
}
else
{
@@ -93,34 +198,45 @@
// If application has set a preference on the short name size, it needs to be considered,
// else fit what can be fit.
- if ((p_advdata->short_name_len != 0) && (p_advdata->short_name_len <= rem_adv_data_len))
+ if ((BLE_ADVDATA_SHORT_NAME == p_advdata->name_type) &&
+ (p_advdata->short_name_len <= rem_adv_data_len))
{
// Short name fits available size.
- rem_adv_data_len = p_advdata->short_name_len;
+ actual_length = p_advdata->short_name_len;
}
// Else whatever can fit the data buffer will be packed.
else
{
- rem_adv_data_len = actual_length;
+ actual_length = rem_adv_data_len;
}
}
+ // There is only 1 byte intended to encode length which is (actual_length + ADV_AD_TYPE_FIELD_SIZE)
+ if(actual_length > (0x00FF - ADV_AD_TYPE_FIELD_SIZE))
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+
// Complete name field in encoded data.
- p_encoded_data[adv_offset++] = rem_adv_data_len + 1;
- p_encoded_data[adv_offset++] = adv_data_format;
- (*p_len) += (rem_adv_data_len + ADV_DATA_OFFSET);
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + actual_length);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = adv_data_format;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ *p_offset += actual_length;
return NRF_SUCCESS;
}
-static uint32_t appearance_encode(uint8_t * p_encoded_data, uint8_t * p_len)
+static uint32_t appearance_encode(uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
{
uint32_t err_code;
uint16_t appearance;
// Check for buffer overflow.
- if ((*p_len) + 4 > BLE_GAP_ADV_MAX_SIZE)
+ if (((*p_offset) + AD_TYPE_APPEARANCE_SIZE) > max_size)
{
return NRF_ERROR_DATA_SIZE;
}
@@ -133,29 +249,78 @@
}
// Encode Length, AD Type and Appearance.
- p_encoded_data[(*p_len)++] = 3;
- p_encoded_data[(*p_len)++] = BLE_GAP_AD_TYPE_APPEARANCE;
-
- (*p_len) += uint16_encode(appearance, &p_encoded_data[*p_len]);
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + AD_TYPE_APPEARANCE_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_APPEARANCE;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ *p_offset += uint16_encode(appearance, &p_encoded_data[*p_offset]);
return NRF_SUCCESS;
}
-
-static uint32_t tx_power_level_encode(int8_t tx_power_level,
- uint8_t * p_encoded_data,
- uint8_t * p_len)
+static uint32_t flags_encode(int8_t flags,
+ uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
{
// Check for buffer overflow.
- if ((*p_len) + 3 > BLE_GAP_ADV_MAX_SIZE)
+ if (((*p_offset) + AD_TYPE_FLAGS_SIZE) > max_size)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+
+ // Encode flags.
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + AD_TYPE_FLAGS_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_FLAGS;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ p_encoded_data[*p_offset] = flags;
+ *p_offset += AD_TYPE_FLAGS_DATA_SIZE;
+
+ return NRF_SUCCESS;
+}
+
+static uint32_t sec_mgr_oob_flags_encode(uint8_t oob_flags,
+ uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
+{
+ // Check for buffer overflow.
+ if (((*p_offset) + AD_TYPE_OOB_FLAGS_SIZE) > max_size)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+
+ // Encode flags.
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + AD_TYPE_OOB_FLAGS_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_SECURITY_MANAGER_OOB_FLAGS;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ p_encoded_data[*p_offset] = oob_flags;
+ *p_offset += AD_TYPE_OOB_FLAGS_DATA_SIZE;
+
+ return NRF_SUCCESS;
+}
+
+static uint32_t tx_power_level_encode(int8_t tx_power_level,
+ uint8_t * p_encoded_data,
+ uint16_t * p_offset,
+ uint16_t max_size)
+{
+ // Check for buffer overflow.
+ if (((*p_offset) + AD_TYPE_TX_POWER_LEVEL_SIZE) > max_size)
{
return NRF_ERROR_DATA_SIZE;
}
// Encode TX Power Level.
- p_encoded_data[(*p_len)++] = 2;
- p_encoded_data[(*p_len)++] = BLE_GAP_AD_TYPE_TX_POWER_LEVEL;
- p_encoded_data[(*p_len)++] = (uint8_t)tx_power_level;
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE +
+ AD_TYPE_TX_POWER_LEVEL_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_TX_POWER_LEVEL;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
+ p_encoded_data[*p_offset] = tx_power_level;
+ *p_offset += AD_TYPE_TX_POWER_LEVEL_DATA_SIZE;
return NRF_SUCCESS;
}
@@ -165,11 +330,13 @@
uint8_t adv_type,
uint8_t uuid_size,
uint8_t * p_encoded_data,
- uint8_t * p_len)
+ uint16_t * p_offset,
+ uint16_t max_size)
{
- int i;
- bool is_heading_written = false;
- uint8_t start_pos = *p_len;
+ int i;
+ bool is_heading_written = false;
+ uint16_t start_pos = *p_offset;
+ uint16_t length;
for (i = 0; i < p_uuid_list->uuid_cnt; i++)
{
@@ -187,10 +354,10 @@
// Check size.
if (encoded_size == uuid_size)
{
- uint8_t heading_bytes = (is_heading_written) ? 0 : 2;
+ uint8_t heading_bytes = (is_heading_written) ? 0 : ADV_AD_DATA_OFFSET;
// Check for buffer overflow
- if (*p_len + encoded_size + heading_bytes > BLE_GAP_ADV_MAX_SIZE)
+ if (((*p_offset) + encoded_size + heading_bytes) > max_size)
{
return NRF_ERROR_DATA_SIZE;
}
@@ -198,25 +365,32 @@
if (!is_heading_written)
{
// Write AD structure heading.
- (*p_len)++;
- p_encoded_data[(*p_len)++] = adv_type;
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = adv_type;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
is_heading_written = true;
}
// Write UUID.
- err_code = sd_ble_uuid_encode(&uuid, &encoded_size, &p_encoded_data[*p_len]);
+ err_code = sd_ble_uuid_encode(&uuid, &encoded_size, &p_encoded_data[*p_offset]);
if (err_code != NRF_SUCCESS)
{
return err_code;
}
- (*p_len) += encoded_size;
+ *p_offset += encoded_size;
}
}
if (is_heading_written)
{
// Write length.
- p_encoded_data[start_pos] = (*p_len) - (start_pos + 1);
+ length = (*p_offset) - (start_pos + ADV_LENGTH_FIELD_SIZE);
+ // There is only 1 byte intended to encode length
+ if(length > 0x00FF)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+ p_encoded_data[start_pos] = (uint8_t)length;
}
return NRF_SUCCESS;
@@ -227,7 +401,8 @@
uint8_t adv_type_16,
uint8_t adv_type_128,
uint8_t * p_encoded_data,
- uint8_t * p_len)
+ uint16_t * p_offset,
+ uint16_t max_size)
{
uint32_t err_code;
@@ -236,7 +411,8 @@
adv_type_16,
sizeof(uint16_le_t),
p_encoded_data,
- p_len);
+ p_offset,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -247,7 +423,8 @@
adv_type_128,
sizeof(ble_uuid128_t),
p_encoded_data,
- p_len);
+ p_offset,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -296,12 +473,13 @@
static uint32_t conn_int_encode(const ble_advdata_conn_int_t * p_conn_int,
uint8_t * p_encoded_data,
- uint8_t * p_len)
+ uint16_t * p_offset,
+ uint16_t max_size)
{
uint32_t err_code;
// Check for buffer overflow.
- if ((*p_len) + ADV_DATA_OFFSET + 2 * sizeof(uint16_le_t) > BLE_GAP_ADV_MAX_SIZE)
+ if (((*p_offset) + AD_TYPE_CONN_INT_SIZE) > max_size)
{
return NRF_ERROR_DATA_SIZE;
}
@@ -314,12 +492,14 @@
}
// Encode Length and AD Type.
- p_encoded_data[(*p_len)++] = 1 + 2 * sizeof(uint16_le_t);
- p_encoded_data[(*p_len)++] = BLE_GAP_AD_TYPE_SLAVE_CONNECTION_INTERVAL_RANGE;
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + AD_TYPE_CONN_INT_DATA_SIZE);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_SLAVE_CONNECTION_INTERVAL_RANGE;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
// Encode Minimum and Maximum Connection Intervals.
- (*p_len) += uint16_encode(p_conn_int->min_conn_interval, &p_encoded_data[*p_len]);
- (*p_len) += uint16_encode(p_conn_int->max_conn_interval, &p_encoded_data[*p_len]);
+ *p_offset += uint16_encode(p_conn_int->min_conn_interval, &p_encoded_data[*p_offset]);
+ *p_offset += uint16_encode(p_conn_int->max_conn_interval, &p_encoded_data[*p_offset]);
return NRF_SUCCESS;
}
@@ -327,22 +507,31 @@
static uint32_t manuf_specific_data_encode(const ble_advdata_manuf_data_t * p_manuf_sp_data,
uint8_t * p_encoded_data,
- uint8_t * p_len)
+ uint16_t * p_offset,
+ uint16_t max_size)
{
- uint8_t data_size = sizeof(uint16_le_t) + p_manuf_sp_data->data.size;
+ uint32_t data_size = AD_TYPE_MANUF_SPEC_DATA_ID_SIZE + p_manuf_sp_data->data.size;
// Check for buffer overflow.
- if ((*p_len) + ADV_DATA_OFFSET + data_size > BLE_GAP_ADV_MAX_SIZE)
+ if (((*p_offset) + ADV_AD_DATA_OFFSET + data_size) > max_size)
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
+
+ // There is only 1 byte intended to encode length which is (data_size + ADV_AD_TYPE_FIELD_SIZE)
+ if(data_size > (0x00FF - ADV_AD_TYPE_FIELD_SIZE))
{
return NRF_ERROR_DATA_SIZE;
}
// Encode Length and AD Type.
- p_encoded_data[(*p_len)++] = 1 + data_size;
- p_encoded_data[(*p_len)++] = BLE_GAP_AD_TYPE_MANUFACTURER_SPECIFIC_DATA;
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + data_size);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_MANUFACTURER_SPECIFIC_DATA;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
// Encode Company Identifier.
- (*p_len) += uint16_encode(p_manuf_sp_data->company_identifier, &p_encoded_data[*p_len]);
+ *p_offset += uint16_encode(p_manuf_sp_data->company_identifier, &p_encoded_data[*p_offset]);
// Encode additional manufacturer specific data.
if (p_manuf_sp_data->data.size > 0)
@@ -351,17 +540,18 @@
{
return NRF_ERROR_INVALID_PARAM;
}
- memcpy(&p_encoded_data[*p_len], p_manuf_sp_data->data.p_data, p_manuf_sp_data->data.size);
- (*p_len) += p_manuf_sp_data->data.size;
+ memcpy(&p_encoded_data[*p_offset], p_manuf_sp_data->data.p_data, p_manuf_sp_data->data.size);
+ *p_offset += p_manuf_sp_data->data.size;
}
return NRF_SUCCESS;
}
-
+// Implemented only for 16-bit UUIDs
static uint32_t service_data_encode(const ble_advdata_t * p_advdata,
uint8_t * p_encoded_data,
- uint8_t * p_len)
+ uint16_t * p_offset,
+ uint16_t max_size)
{
uint8_t i;
@@ -374,17 +564,26 @@
for (i = 0; i < p_advdata->service_data_count; i++)
{
ble_advdata_service_data_t * p_service_data;
- uint8_t data_size;
+ uint32_t data_size;
p_service_data = &p_advdata->p_service_data_array[i];
- data_size = sizeof(uint16_le_t) + p_service_data->data.size;
+ // For now implemented only for 16-bit UUIDs
+ data_size = AD_TYPE_SERV_DATA_16BIT_UUID_SIZE + p_service_data->data.size;
+
+ // There is only 1 byte intended to encode length which is (data_size + ADV_AD_TYPE_FIELD_SIZE)
+ if(data_size > (0x00FF - ADV_AD_TYPE_FIELD_SIZE))
+ {
+ return NRF_ERROR_DATA_SIZE;
+ }
// Encode Length and AD Type.
- p_encoded_data[(*p_len)++] = 1 + data_size;
- p_encoded_data[(*p_len)++] = BLE_GAP_AD_TYPE_SERVICE_DATA;
+ p_encoded_data[*p_offset] = (uint8_t)(ADV_AD_TYPE_FIELD_SIZE + data_size);
+ *p_offset += ADV_LENGTH_FIELD_SIZE;
+ p_encoded_data[*p_offset] = BLE_GAP_AD_TYPE_SERVICE_DATA;
+ *p_offset += ADV_AD_TYPE_FIELD_SIZE;
- // Encode service UUID.
- (*p_len) += uint16_encode(p_service_data->service_uuid, &p_encoded_data[*p_len]);
+ // Encode service 16-bit UUID.
+ *p_offset += uint16_encode(p_service_data->service_uuid, &p_encoded_data[*p_offset]);
// Encode additional service data.
if (p_service_data->data.size > 0)
@@ -393,27 +592,59 @@
{
return NRF_ERROR_INVALID_PARAM;
}
- memcpy(&p_encoded_data[*p_len], p_service_data->data.p_data, p_service_data->data.size);
- (*p_len) += p_service_data->data.size;
+ memcpy(&p_encoded_data[*p_offset], p_service_data->data.p_data, p_service_data->data.size);
+ *p_offset += p_service_data->data.size;
}
}
return NRF_SUCCESS;
}
-
-static uint32_t adv_data_encode(const ble_advdata_t * p_advdata,
- uint8_t * p_encoded_data,
- uint8_t * p_len)
+uint32_t adv_data_encode(ble_advdata_t const * const p_advdata,
+ uint8_t * const p_encoded_data,
+ uint16_t * const p_len)
{
uint32_t err_code = NRF_SUCCESS;
-
+ uint16_t max_size = *p_len;
*p_len = 0;
- // Encode name.
- if (p_advdata->name_type != BLE_ADVDATA_NO_NAME)
+ //Encode Security Manager OOB Flags
+ if (p_advdata->p_sec_mgr_oob_flags != NULL)
+ {
+ err_code = sec_mgr_oob_flags_encode(*p_advdata->p_sec_mgr_oob_flags,
+ p_encoded_data,
+ p_len,
+ max_size);
+ if (err_code != NRF_SUCCESS)
+ {
+ return err_code;
+ }
+ }
+
+ // Encode Security Manager TK value
+ if (NULL != p_advdata->p_tk_value)
{
- err_code = name_encode(p_advdata, p_encoded_data, p_len);
+ err_code = tk_value_encode(p_advdata->p_tk_value, p_encoded_data, p_len, max_size);
+ if (err_code != NRF_SUCCESS)
+ {
+ return err_code;
+ }
+ }
+
+ // Encode LE Role
+ if (BLE_ADVDATA_ROLE_NOT_PRESENT != p_advdata->le_role)
+ {
+ err_code = le_role_encode(p_advdata->le_role, p_encoded_data, p_len, max_size);
+ if (err_code != NRF_SUCCESS)
+ {
+ return err_code;
+ }
+ }
+
+ // Encode LE Bluetooth Device Address
+ if (p_advdata->include_ble_device_addr)
+ {
+ err_code = ble_device_addr_encode(p_encoded_data, p_len, max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -423,25 +654,30 @@
// Encode appearance.
if (p_advdata->include_appearance)
{
- err_code = appearance_encode(p_encoded_data, p_len);
+ err_code = appearance_encode(p_encoded_data, p_len, max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
}
}
+ //Encode Flags
if(p_advdata->flags != 0 )
{
- // Encode flags.
- p_encoded_data[(*p_len)++] = 1 + sizeof(uint8_t);
- p_encoded_data[(*p_len)++] = BLE_GAP_AD_TYPE_FLAGS;
- p_encoded_data[(*p_len)++] = p_advdata->flags;
+ err_code = flags_encode(p_advdata->flags, p_encoded_data, p_len, max_size);
+ if (err_code != NRF_SUCCESS)
+ {
+ return err_code;
+ }
}
// Encode TX power level.
if (p_advdata->p_tx_power_level != NULL)
{
- err_code = tx_power_level_encode(*p_advdata->p_tx_power_level, p_encoded_data, p_len);
+ err_code = tx_power_level_encode(*p_advdata->p_tx_power_level,
+ p_encoded_data,
+ p_len,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -455,7 +691,8 @@
BLE_GAP_AD_TYPE_16BIT_SERVICE_UUID_MORE_AVAILABLE,
BLE_GAP_AD_TYPE_128BIT_SERVICE_UUID_MORE_AVAILABLE,
p_encoded_data,
- p_len);
+ p_len,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -469,7 +706,8 @@
BLE_GAP_AD_TYPE_16BIT_SERVICE_UUID_COMPLETE,
BLE_GAP_AD_TYPE_128BIT_SERVICE_UUID_COMPLETE,
p_encoded_data,
- p_len);
+ p_len,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -483,7 +721,8 @@
BLE_GAP_AD_TYPE_SOLICITED_SERVICE_UUIDS_16BIT,
BLE_GAP_AD_TYPE_SOLICITED_SERVICE_UUIDS_128BIT,
p_encoded_data,
- p_len);
+ p_len,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -493,7 +732,7 @@
// Encode Slave Connection Interval Range.
if (p_advdata->p_slave_conn_int != NULL)
{
- err_code = conn_int_encode(p_advdata->p_slave_conn_int, p_encoded_data, p_len);
+ err_code = conn_int_encode(p_advdata->p_slave_conn_int, p_encoded_data, p_len, max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -505,7 +744,8 @@
{
err_code = manuf_specific_data_encode(p_advdata->p_manuf_specific_data,
p_encoded_data,
- p_len);
+ p_len,
+ max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -515,7 +755,17 @@
// Encode Service Data.
if (p_advdata->service_data_count > 0)
{
- err_code = service_data_encode(p_advdata, p_encoded_data, p_len);
+ err_code = service_data_encode(p_advdata, p_encoded_data, p_len, max_size);
+ if (err_code != NRF_SUCCESS)
+ {
+ return err_code;
+ }
+ }
+
+ // Encode name. WARNING: it is encoded last on purpose since too long device name is truncated.
+ if (p_advdata->name_type != BLE_ADVDATA_NO_NAME)
+ {
+ err_code = name_encode(p_advdata, p_encoded_data, p_len, max_size);
if (err_code != NRF_SUCCESS)
{
return err_code;
@@ -555,8 +805,8 @@
uint32_t ble_advdata_set(const ble_advdata_t * p_advdata, const ble_advdata_t * p_srdata)
{
uint32_t err_code;
- uint8_t len_advdata = 0;
- uint8_t len_srdata = 0;
+ uint16_t len_advdata = BLE_GAP_ADV_MAX_SIZE;
+ uint16_t len_srdata = BLE_GAP_ADV_MAX_SIZE;
uint8_t encoded_advdata[BLE_GAP_ADV_MAX_SIZE];
uint8_t encoded_srdata[BLE_GAP_ADV_MAX_SIZE];
uint8_t * p_encoded_advdata;
@@ -581,6 +831,7 @@
else
{
p_encoded_advdata = NULL;
+ len_advdata = 0;
}
// Encode scan response data (if supplied).
@@ -602,6 +853,7 @@
else
{
p_encoded_srdata = NULL;
+ len_srdata = 0;
}
// Pass encoded advertising data and/or scan response data to the stack.
--- a/source/nordic_sdk/components/ble/common/ble_advdata.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/ble/common/ble_advdata.h Thu Apr 07 17:38:06 2016 +0100
@@ -32,11 +32,11 @@
/** @file
*
- * @defgroup ble_sdk_lib_advdata Advertising Data Encoder
+ * @defgroup ble_sdk_lib_advdata Advertising and Scan Response Data Encoder
* @{
* @ingroup ble_sdk_lib
- * @brief Function for encoding the advertising data and/or scan response data, and passing them to
- * the stack.
+ * @brief Functions for encoding data in the Advertising and Scan Response Data format,
+ * and for passing the data to the stack.
*/
#ifndef BLE_ADVDATA_H__
@@ -48,7 +48,68 @@
#include "ble.h"
#include "app_util.h"
-/**@brief Advertising data name type. This contains the options available for the device name inside
+
+#define ADV_LENGTH_FIELD_SIZE 1UL /**< Advertising Data and Scan Response format contains 1 octet for the length. */
+#define ADV_AD_TYPE_FIELD_SIZE 1UL /**< Advertising Data and Scan Response format contains 1 octet for the AD type. */
+#define ADV_AD_DATA_OFFSET (ADV_LENGTH_FIELD_SIZE + \
+ ADV_AD_TYPE_FIELD_SIZE) /**< Offset for the AD data field of the Advertising Data and Scan Response format. */
+#define AD_TYPE_TK_VALUE_DATA_SIZE (sizeof(ble_advdata_tk_value_t)) /**< Data size (in octets) of the Security Manager TK value AD type. */
+#define AD_TYPE_TK_VALUE_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_TK_VALUE_DATA_SIZE) /**< Size (in octets) of the Security Manager TK value AD type. */
+#define AD_TYPE_LE_ROLE_DATA_SIZE 1UL /**< Data size (in octets) of the LE Bluetooth Device Address AD type. */
+#define AD_TYPE_LE_ROLE_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_LE_ROLE_DATA_SIZE) /**< Size (in octets) of the LE Bluetooth Device Address AD type. */
+#define AD_TYPE_BLE_DEVICE_ADDR_TYPE_SIZE 1UL /**< Data size (in octets) of the Address type of the LE Bluetooth Device Address AD type. */
+#define AD_TYPE_BLE_DEVICE_ADDR_DATA_SIZE (BLE_GAP_ADDR_LEN + \
+ AD_TYPE_BLE_DEVICE_ADDR_TYPE_SIZE) /**< Data size (in octets) of the LE Bluetooth Device Address AD type. */
+#define AD_TYPE_BLE_DEVICE_ADDR_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_BLE_DEVICE_ADDR_DATA_SIZE) /**< Size (in octets) of the LE Bluetooth Device Address AD type. */
+#define AD_TYPE_APPEARANCE_DATA_SIZE 2UL /**< Data size (in octets) of the Appearance AD type. */
+#define AD_TYPE_APPEARANCE_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_APPEARANCE_DATA_SIZE) /**< Size (in octets) of the Appearance AD type. */
+#define AD_TYPE_FLAGS_DATA_SIZE 1UL /**< Data size (in octets) of the Flags AD type. */
+#define AD_TYPE_FLAGS_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_FLAGS_DATA_SIZE) /**< Size (in octets) of the Flags AD type. */
+#define AD_TYPE_TX_POWER_LEVEL_DATA_SIZE 1UL /**< Data size (in octets) of the TX Power Level AD type. */
+#define AD_TYPE_TX_POWER_LEVEL_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_TX_POWER_LEVEL_DATA_SIZE) /**< Size (in octets) of the TX Power Level AD type. */
+#define AD_TYPE_CONN_INT_DATA_SIZE 4UL /**< Data size (in octets) of the Slave Connection Interval Range AD type. */
+#define AD_TYPE_CONN_INT_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_CONN_INT_DATA_SIZE) /**< Data size (in octets) of the Slave Connection Interval Range AD type. */
+#define AD_TYPE_MANUF_SPEC_DATA_ID_SIZE 2UL /**< Size (in octets) of the Company Identifier Code, which is a part of the Manufacturer Specific Data AD type. */
+#define AD_TYPE_SERV_DATA_16BIT_UUID_SIZE 2UL /**< Size (in octets) of the 16-bit UUID, which is a part of the Service Data AD type. */
+#define AD_TYPE_OOB_FLAGS_DATA_SIZE 1UL /**< Data size (in octets) of the Security Manager OOB Flags AD type. */
+#define AD_TYPE_OOB_FLAGS_SIZE (ADV_AD_DATA_OFFSET + \
+ AD_TYPE_OOB_FLAGS_DATA_SIZE) /**< Size (in octets) of the Security Manager OOB Flags AD type. */
+
+#define AD_TYPE_SEC_MGR_OOB_FLAG_SET 1U /**< Security Manager OOB Flag set. Flag selection is done using _POS defines */
+#define AD_TYPE_SEC_MGR_OOB_FLAG_CLEAR 0U /**< Security Manager OOB Flag clear. Flag selection is done using _POS defines */
+#define AD_TYPE_SEC_MGR_OOB_FLAG_OOB_DATA_PRESENT_POS 0UL /**< Security Manager OOB Data Present Flag position. */
+#define AD_TYPE_SEC_MGR_OOB_FLAG_OOB_LE_SUPPORTED_POS 1UL /**< Security Manager OOB Low Energy Supported Flag position. */
+#define AD_TYPE_SEC_MGR_OOB_FLAG_SIM_LE_AND_EP_POS 2UL /**< Security Manager OOB Simultaneous LE and BR/EDR to Same Device Capable Flag position. */
+#define AD_TYPE_SEC_MGR_OOB_ADDRESS_TYPE_PUBLIC 0UL /**< Security Manager OOB Public Address type. */
+#define AD_TYPE_SEC_MGR_OOB_ADDRESS_TYPE_RANDOM 1UL /**< Security Manager OOB Random Address type. */
+#define AD_TYPE_SEC_MGR_OOB_FLAG_ADDRESS_TYPE_POS 3UL /**< Security Manager OOB Address type Flag (0 = Public Address, 1 = Random Address) position. */
+
+
+/**@brief Security Manager TK value. */
+typedef struct
+{
+ uint8_t tk[BLE_GAP_SEC_KEY_LEN]; /**< Array containing TK value. */
+} ble_advdata_tk_value_t;
+
+/**@brief Advertising data LE Role types. This enumeration contains the options available for the LE role inside
+ * the advertising data. */
+typedef enum
+{
+ BLE_ADVDATA_ROLE_NOT_PRESENT = 0, /**< LE Role AD structure not present. */
+ BLE_ADVDATA_ROLE_ONLY_PERIPH, /**< Only Peripheral Role supported. */
+ BLE_ADVDATA_ROLE_ONLY_CENTRAL, /**< Only Central Role supported. */
+ BLE_ADVDATA_ROLE_BOTH_PERIPH_PREFERRED, /**< Peripheral and Central Role supported. Peripheral Role preferred for connection establishment. */
+ BLE_ADVDATA_ROLE_BOTH_CENTRAL_PREFERRED /**< Peripheral and Central Role supported. Central Role preferred for connection establishment */
+} ble_advdata_le_role_t;
+
+/**@brief Advertising data name type. This enumeration contains the options available for the device name inside
* the advertising data. */
typedef enum
{
@@ -67,14 +128,14 @@
/**@brief Connection interval range structure. */
typedef struct
{
- uint16_t min_conn_interval; /**< Minimum Connection Interval, in units of 1.25ms, range 6 to 3200 (i.e. 7.5ms to 4s). */
- uint16_t max_conn_interval; /**< Maximum Connection Interval, in units of 1.25ms, range 6 to 3200 (i.e. 7.5ms to 4s). Value of 0xFFFF indicates no specific maximum. */
+ uint16_t min_conn_interval; /**< Minimum connection interval, in units of 1.25 ms, range 6 to 3200 (7.5 ms to 4 s). */
+ uint16_t max_conn_interval; /**< Maximum connection interval, in units of 1.25 ms, range 6 to 3200 (7.5 ms to 4 s). The value 0xFFFF indicates no specific maximum. */
} ble_advdata_conn_int_t;
/**@brief Manufacturer specific data structure. */
typedef struct
{
- uint16_t company_identifier; /**< Company Identifier Code. */
+ uint16_t company_identifier; /**< Company identifier code. */
uint8_array_t data; /**< Additional manufacturer specific data. */
} ble_advdata_manuf_data_t;
@@ -85,7 +146,7 @@
uint8_array_t data; /**< Additional service data. */
} ble_advdata_service_data_t;
-/**@brief Advertising data structure. This contains all options and data needed for encoding and
+/**@brief Advertising data structure. This structure contains all options and data needed for encoding and
* setting the advertising data. */
typedef struct
{
@@ -96,13 +157,49 @@
int8_t * p_tx_power_level; /**< TX Power Level field. */
ble_advdata_uuid_list_t uuids_more_available; /**< List of UUIDs in the 'More Available' list. */
ble_advdata_uuid_list_t uuids_complete; /**< List of UUIDs in the 'Complete' list. */
- ble_advdata_uuid_list_t uuids_solicited; /**< List of solcited UUIDs. */
+ ble_advdata_uuid_list_t uuids_solicited; /**< List of solicited UUIDs. */
ble_advdata_conn_int_t * p_slave_conn_int; /**< Slave Connection Interval Range. */
ble_advdata_manuf_data_t * p_manuf_specific_data; /**< Manufacturer specific data. */
ble_advdata_service_data_t * p_service_data_array; /**< Array of Service data structures. */
uint8_t service_data_count; /**< Number of Service data structures. */
+ bool include_ble_device_addr; /**< Determines if LE Bluetooth Device Address shall be included. */
+ ble_advdata_le_role_t le_role; /**< LE Role field. Included when different from @ref BLE_ADVDATA_ROLE_NOT_PRESENT.*/
+ ble_advdata_tk_value_t * p_tk_value; /**< Security Manager TK value field. Included when different from NULL.*/
+ uint8_t * p_sec_mgr_oob_flags; /**< Security Manager Out Of Band Flags field. Included when different from NULL.*/
} ble_advdata_t;
+/**@brief Function for encoding data in the Advertising and Scan Response data format
+ * (AD structures).
+ *
+ * @details This function encodes data into the Advertising and Scan Response data format
+ * (AD structures) based on the selections in the supplied structures. This function can be used to
+ * create a payload of Advertising packet or Scan Response packet, or a payload of NFC
+ * message intended for initiating the Out-of-Band pairing.
+ *
+ * @param[in] p_advdata Pointer to the structure for specifying the content of encoded data.
+ * @param[out] p_encoded_data Pointer to the buffer where encoded data will be returned.
+ * @param[in,out] p_len \c in: Size of \p p_encoded_data buffer.
+ * \c out: Length of encoded data.
+ *
+ * @retval NRF_SUCCESS If the operation was successful.
+ * @retval NRF_ERROR_INVALID_PARAM If the operation failed because a wrong parameter was provided in \p p_advdata.
+ * @retval NRF_ERROR_DATA_SIZE If the operation failed because not all the requested data could fit into the
+ * provided buffer or some encoded AD structure is too long and its
+ * length cannot be encoded with one octet.
+ *
+ * @warning This API may override the application's request to use the long name and use a short name
+ * instead. This truncation will occur in case the long name does not fit the provided buffer size.
+ * The application can specify a preferred short name length if truncation is required.
+ * For example, if the complete device name is ABCD_HRMonitor, the application can specify the short name
+ * length to be 8, so that the short device name appears as ABCD_HRM instead of ABCD_HRMo or ABCD_HRMoni
+ * if the available size for the short name is 9 or 12 respectively, to have a more appropriate short name.
+ * However, it should be noted that this is just a preference that the application can specify, and
+ * if the preference is too large to fit in the provided buffer, the name can be truncated further.
+ */
+uint32_t adv_data_encode(ble_advdata_t const * const p_advdata,
+ uint8_t * const p_encoded_data,
+ uint16_t * const p_len);
+
/**@brief Function for encoding and setting the advertising data and/or scan response data.
*
* @details This function encodes advertising data and/or scan response data based on the selections
@@ -113,18 +210,20 @@
* @param[in] p_srdata Structure for specifying the content of the scan response data.
* Set to NULL if scan response data is not to be set.
*
- * @return NRF_SUCCESS on success, NRF_ERROR_DATA_SIZE if not all the requested data could fit
- * into the advertising packet. The maximum size of the advertisement packet is @ref
- * BLE_GAP_ADV_MAX_SIZE.
+ * @retval NRF_SUCCESS If the operation was successful.
+ * @retval NRF_ERROR_INVALID_PARAM If the operation failed because a wrong parameter was provided in \p p_advdata.
+ * @retval NRF_ERROR_DATA_SIZE If the operation failed because not all the requested data could fit into the
+ * advertising packet. The maximum size of the advertisement packet
+ * is @ref BLE_GAP_ADV_MAX_SIZE.
*
- * @warning This API may override application's request to use the long name and use a short name
- * instead. This truncation will occur in case the long name does not fit advertisement data size.
- * Application is permitted to specify a preferred short name length in case truncation is required.
- * For example, if the complete device name is ABCD_HRMonitor, application can specify short name
- * length to 8 such that short device name appears as ABCD_HRM instead of ABCD_HRMo or ABCD_HRMoni
- * etc if available size for short name is 9 or 12 respectively to have more apporpriate short name.
- * However, it should be noted that this is just a preference that application can specify and
- * if the preference too large to fit in Advertisement Data, this can be further truncated.
+ * @warning This API may override the application's request to use the long name and use a short name
+ * instead. This truncation will occur in case the long name does not fit the provided buffer size.
+ * The application can specify a preferred short name length if truncation is required.
+ * For example, if the complete device name is ABCD_HRMonitor, the application can specify the short name
+ * length to be 8, so that the short device name appears as ABCD_HRM instead of ABCD_HRMo or ABCD_HRMoni
+ * if the available size for the short name is 9 or 12 respectively, to have a more appropriate short name.
+ * However, it should be noted that this is just a preference that the application can specify, and
+ * if the preference is too large to fit in the provided buffer, the name can be truncated further.
*/
uint32_t ble_advdata_set(const ble_advdata_t * p_advdata, const ble_advdata_t * p_srdata);
--- a/source/nordic_sdk/components/ble/common/ble_advdata_parser.c Thu Apr 07 17:38:04 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) Nordic Semiconductor ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "ble_advdata_parser.h"
-
-uint32_t ble_advdata_parser_field_find(uint8_t type,
- uint8_t * p_advdata,
- uint8_t * len,
- uint8_t ** pp_field_data)
-{
- uint32_t index = 0;
-
- while (index < *len)
- {
- uint8_t field_length = p_advdata[index];
- uint8_t field_type = p_advdata[index + 1];
-
- if (field_type == type)
- {
- *pp_field_data = &p_advdata[index + 2];
- *len = field_length - 1;
- return NRF_SUCCESS;
- }
- index += field_length + 1;
- }
- return NRF_ERROR_NOT_FOUND;
-}
\ No newline at end of file
--- a/source/nordic_sdk/components/ble/common/ble_advdata_parser.h Thu Apr 07 17:38:04 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -/* - * Copyright (c) Nordic Semiconductor ASA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, this - * list of conditions and the following disclaimer in the documentation and/or - * other materials provided with the distribution. - * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef BLE_ADVDATA_PARSER_H_ -#define BLE_ADVDATA_PARSER_H_ - -#include "ble_advdata.h" - -uint32_t ble_advdata_parse(uint8_t * p_data, uint8_t len, ble_advdata_t * advdata); -uint32_t ble_advdata_parser_field_find(uint8_t type, uint8_t * p_advdata, uint8_t * len, uint8_t ** pp_field_data); - -#endif \ No newline at end of file
--- a/source/nordic_sdk/components/ble/common/ble_srv_common.c Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/ble/common/ble_srv_common.c Thu Apr 07 17:38:06 2016 +0100
@@ -63,37 +63,38 @@
/**@brief Function for setting security requirements of a characteristic.
*
- * @param[in] level required security level.
+ * @param[in] level required security level.
+ * @param[out] p_perm Characteristic security requirements.
*
* @return encoded security level and security mode.
*/
-static inline ble_gap_conn_sec_mode_t set_security_req(security_req_t level)
+static inline void set_security_req(security_req_t level, ble_gap_conn_sec_mode_t * p_perm)
{
- ble_gap_conn_sec_mode_t perm;
+
- BLE_GAP_CONN_SEC_MODE_SET_NO_ACCESS(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_NO_ACCESS(p_perm);
switch (level)
{
case SEC_NO_ACCESS:
- BLE_GAP_CONN_SEC_MODE_SET_NO_ACCESS(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_NO_ACCESS(p_perm);
break;
case SEC_OPEN:
- BLE_GAP_CONN_SEC_MODE_SET_OPEN(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_OPEN(p_perm);
break;
case SEC_JUST_WORKS:
- BLE_GAP_CONN_SEC_MODE_SET_ENC_NO_MITM(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_ENC_NO_MITM(p_perm);
break;
case SEC_MITM:
- BLE_GAP_CONN_SEC_MODE_SET_ENC_WITH_MITM(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_ENC_WITH_MITM(p_perm);
break;
case SEC_SIGNED:
- BLE_GAP_CONN_SEC_MODE_SET_SIGNED_NO_MITM(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_SIGNED_NO_MITM(p_perm);
break;
case SEC_SIGNED_MITM:
- BLE_GAP_CONN_SEC_MODE_SET_SIGNED_WITH_MITM(&perm);
+ BLE_GAP_CONN_SEC_MODE_SET_SIGNED_WITH_MITM(p_perm);
break;
}
- return(perm);
+ return;
}
@@ -105,6 +106,8 @@
ble_gatts_attr_t attr_char_value;
ble_uuid_t char_uuid;
ble_gatts_attr_md_t attr_md;
+ ble_gatts_attr_md_t user_descr_attr_md;
+ ble_gatts_attr_md_t cccd_md;
if (p_char_props->uuid_type == 0)
{
@@ -116,22 +119,21 @@
}
char_uuid.uuid = p_char_props->uuid;
- memset(&attr_md, 0, sizeof(attr_md));
- attr_md.read_perm = set_security_req(p_char_props->read_access);
- attr_md.write_perm = set_security_req(p_char_props->write_access);
+ memset(&attr_md, 0, sizeof(ble_gatts_attr_md_t));
+ set_security_req(p_char_props->read_access, &attr_md.read_perm);
+ set_security_req(p_char_props->write_access, & attr_md.write_perm);
attr_md.rd_auth = (p_char_props->is_defered_read ? 1 : 0);
attr_md.wr_auth = (p_char_props->is_defered_write ? 1 : 0);
attr_md.vlen = (p_char_props->is_var_len ? 1 : 0);
- attr_md.vloc = (p_char_props->is_value_local ? BLE_GATTS_VLOC_USER : BLE_GATTS_VLOC_STACK);
+ attr_md.vloc = (p_char_props->is_value_user ? BLE_GATTS_VLOC_USER : BLE_GATTS_VLOC_STACK);
- memset(&char_md, 0, sizeof(char_md));
+ memset(&char_md, 0, sizeof(ble_gatts_char_md_t));
if ((p_char_props->char_props.notify == 1)||(p_char_props->char_props.indicate == 1))
{
- ble_gatts_attr_md_t cccd_md;
memset(&cccd_md, 0, sizeof(cccd_md));
- cccd_md.write_perm = set_security_req(p_char_props->cccd_write_access);
+ set_security_req(p_char_props->cccd_write_access, &cccd_md.write_perm);
BLE_GAP_CONN_SEC_MODE_SET_OPEN(&cccd_md.read_perm);
cccd_md.vloc = BLE_GATTS_VLOC_STACK;
@@ -140,7 +142,7 @@
}
char_md.char_props = p_char_props->char_props;
- memset(&attr_char_value, 0, sizeof(attr_char_value));
+ memset(&attr_char_value, 0, sizeof(ble_gatts_attr_t));
attr_char_value.p_uuid = &char_uuid;
attr_char_value.p_attr_md = &attr_md;
attr_char_value.max_len = p_char_props->max_len;
@@ -149,9 +151,67 @@
attr_char_value.init_len = p_char_props->init_len;
attr_char_value.p_value = p_char_props->p_init_value;
}
+ if (p_char_props->p_user_descr != NULL)
+ {
+ memset(&user_descr_attr_md, 0, sizeof(ble_gatts_attr_md_t));
+ char_md.char_user_desc_max_size = p_char_props->p_user_descr->max_size;
+ char_md.char_user_desc_size = p_char_props->p_user_descr->size;
+ char_md.p_char_user_desc = p_char_props->p_user_descr->p_char_user_desc;
+
+ char_md.p_user_desc_md = &user_descr_attr_md;
+
+ set_security_req(p_char_props->p_user_descr->read_access, &user_descr_attr_md.read_perm);
+ set_security_req(p_char_props->p_user_descr->write_access, &user_descr_attr_md.write_perm);
+
+ user_descr_attr_md.rd_auth = (p_char_props->p_user_descr->is_defered_read ? 1 : 0);
+ user_descr_attr_md.wr_auth = (p_char_props->p_user_descr->is_defered_write ? 1 : 0);
+ user_descr_attr_md.vlen = (p_char_props->p_user_descr->is_var_len ? 1 : 0);
+ user_descr_attr_md.vloc = (p_char_props->p_user_descr->is_value_user ? BLE_GATTS_VLOC_USER : BLE_GATTS_VLOC_STACK);
+ }
+ if (p_char_props->p_presentation_format != NULL)
+ {
+ char_md.p_char_pf = p_char_props->p_presentation_format;
+ }
return sd_ble_gatts_characteristic_add(service_handle,
&char_md,
&attr_char_value,
p_char_handle);
}
-
\ No newline at end of file
+
+
+uint32_t descriptor_add(uint16_t char_handle,
+ ble_add_descr_params_t * p_descr_props,
+ uint16_t * p_descr_handle)
+{
+ ble_gatts_attr_t descr_params;
+ ble_uuid_t desc_uuid;
+ ble_gatts_attr_md_t attr_md;
+
+ memset(&descr_params, 0, sizeof(descr_params));
+ if (p_descr_props->uuid_type == 0)
+ {
+ desc_uuid.type = BLE_UUID_TYPE_BLE;
+ }
+ else
+ {
+ desc_uuid.type = p_descr_props->uuid_type;
+ }
+ desc_uuid.uuid = p_descr_props->uuid;
+ descr_params.p_uuid = &desc_uuid;
+
+ set_security_req(p_descr_props->read_access, &attr_md.read_perm);
+ set_security_req(p_descr_props->write_access,&attr_md.write_perm);
+
+ attr_md.rd_auth = (p_descr_props->is_defered_read ? 1 : 0);
+ attr_md.wr_auth = (p_descr_props->is_defered_write ? 1 : 0);
+ attr_md.vlen = (p_descr_props->is_var_len ? 1 : 0);
+ attr_md.vloc = (p_descr_props->is_value_user ? BLE_GATTS_VLOC_USER : BLE_GATTS_VLOC_STACK);
+ descr_params.p_attr_md = &attr_md;
+
+ descr_params.init_len = p_descr_props->init_len;
+ descr_params.init_offs = p_descr_props->init_offs;
+ descr_params.max_len = p_descr_props->max_len;
+ descr_params.p_value = p_descr_props->p_value;
+
+ return sd_ble_gatts_descriptor_add(char_handle, &descr_params, p_descr_handle);
+}
\ No newline at end of file
--- a/source/nordic_sdk/components/ble/common/ble_srv_common.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/ble/common/ble_srv_common.h Thu Apr 07 17:38:06 2016 +0100
@@ -56,6 +56,7 @@
#define BLE_UUID_BLOOD_PRESSURE_SERVICE 0x1810 /**< Blood Pressure service UUID. */
#define BLE_UUID_CURRENT_TIME_SERVICE 0x1805 /**< Current Time service UUID. */
#define BLE_UUID_CYCLING_SPEED_AND_CADENCE 0x1816 /**< Cycling Speed and Cadence service UUID. */
+#define BLE_UUID_LOCATION_AND_NAVIGATION_SERVICE 0x1819 /**< Location and Navigation service UUID. */
#define BLE_UUID_DEVICE_INFORMATION_SERVICE 0x180A /**< Device Information service UUID. */
#define BLE_UUID_GLUCOSE_SERVICE 0x1808 /**< Glucose service UUID. */
#define BLE_UUID_HEALTH_THERMOMETER_SERVICE 0x1809 /**< Health Thermometer service UUID. */
@@ -69,6 +70,7 @@
#define BLE_UUID_RUNNING_SPEED_AND_CADENCE 0x1814 /**< Running Speed and Cadence service UUID. */
#define BLE_UUID_SCAN_PARAMETERS_SERVICE 0x1813 /**< Scan Parameters service UUID. */
#define BLE_UUID_TX_POWER_SERVICE 0x1804 /**< TX Power service UUID. */
+#define BLE_UUID_IPSP_SERVICE 0x1820 /**< Internet Protocol Support service UUID. */
/** @} */
/** @defgroup UUID_CHARACTERISTICS Characteristic UUID definitions
@@ -145,6 +147,11 @@
#define BLE_UUID_SENSOR_LOCATION_CHAR 0x2A5D /**< Sensor Location characteristic UUID. */
#define BLE_UUID_EXTERNAL_REPORT_REF_DESCR 0x2907 /**< External Report Reference descriptor UUID. */
#define BLE_UUID_REPORT_REF_DESCR 0x2908 /**< Report Reference descriptor UUID. */
+#define BLE_UUID_LN_FEATURE_CHAR 0x2A6A /**< Location Navigation Service, Feature characteristic UUID. */
+#define BLE_UUID_LN_POSITION_QUALITY_CHAR 0x2A69 /**< Location Navigation Service, Position quality UUID. */
+#define BLE_UUID_LN_LOCATION_AND_SPEED_CHAR 0x2A67 /**< Location Navigation Service, Location and Speed characteristic UUID. */
+#define BLE_UUID_LN_NAVIGATION_CHAR 0x2A68 /**< Location Navigation Service, Navigation characteristic UUID. */
+#define BLE_UUID_LN_CONTROL_POINT_CHAR 0x2A6B /**< Location Navigation Service, Control point characteristic UUID. */
/** @} */
/** @defgroup ALERT_LEVEL_VALUES Definitions for the Alert Level characteristic values
@@ -162,6 +169,7 @@
typedef void (*ble_srv_error_handler_t) (uint32_t nrf_error);
+
/**@brief Value of a Report Reference descriptor.
*
* @details This is mapping information that maps the parent characteristic to the Report ID(s) and
@@ -196,7 +204,7 @@
/**@brief Security settings structure.
* @details This structure contains the security options needed during initialization of the
- * service. It can be used when the characteristics contains cccd.
+ * service. It can be used when the characteristics contains a CCCD.
*/
typedef struct
{
@@ -265,6 +273,24 @@
}security_req_t;
+/**@brief Characteristic User Descriptor parameters.
+ * @details This structure contains the parameters for User Descriptor.
+ */
+typedef struct
+{
+ uint16_t max_size; /**< Maximum size of the user descriptor*/
+ uint16_t size; /**< Size of the user descriptor*/
+ uint8_t *p_char_user_desc; /**< User descriptor content, pointer to a UTF-8 encoded string (non-NULL terminated)*/
+ bool is_var_len; /**< Indicates if the user descriptor has variable length.*/
+ ble_gatt_char_props_t char_props; /**< user descriptor properties.*/
+ bool is_defered_read; /**< Indicate if deferred read operations are supported.*/
+ bool is_defered_write; /**< Indicate if deferred write operations are supported.*/
+ security_req_t read_access; /**< Security requirement for reading the user descriptor.*/
+ security_req_t write_access; /**< Security requirement for writing the user descriptor.*/
+ bool is_value_user; /**< Indicate if the content of the characteristic is to be stored in the application (user) or in the stack.*/
+}ble_add_char_user_desc_t;
+
+
/**@brief Add characteristic parameters structure.
* @details This structure contains the parameters needed to use the @ref characteristic_add function.
*/
@@ -282,10 +308,32 @@
security_req_t read_access; /**< Security requirement for reading the characteristic value.*/
security_req_t write_access; /**< Security requirement for writing the characteristic value.*/
security_req_t cccd_write_access; /**< Security requirement for writing the characteristic's CCCD.*/
- bool is_value_local; /**< Indicate if the content of the characteristic is to be stored locally or in the stack.*/
+ bool is_value_user; /**< Indicate if the content of the characteristic is to be stored in the application (user) or in the stack.*/
+ ble_add_char_user_desc_t *p_user_descr; /**< Pointer to user descriptor if needed*/
+ ble_gatts_char_pf_t *p_presentation_format; /**< Pointer to characteristic format if needed*/
} ble_add_char_params_t;
+/**@brief Add descriptor parameters structure.
+ * @details This structure contains the parameters needed to use the @ref descriptor_add function.
+ */
+typedef struct
+{
+ uint16_t uuid; /**< descriptor UUID (16 bits UUIDs).*/
+ uint8_t uuid_type; /**< Base UUID. If 0, the Bluetooth SIG UUID will be used. Otherwise, this should be a value returned by @ref sd_ble_uuid_vs_add when adding the base UUID.*/
+ bool is_defered_read; /**< Indicate if deferred read operations are supported.*/
+ bool is_defered_write; /**< Indicate if deferred write operations are supported.*/
+ bool is_var_len; /**< Indicates if the descriptor value has variable length.*/
+ security_req_t read_access; /**< Security requirement for reading the descriptor value.*/
+ security_req_t write_access; /**< Security requirement for writing the descriptor value.*/
+ bool is_value_user; /**< Indicate if the content of the characteristic is to be stored in the application (user) or in the stack.*/
+ uint16_t init_len; /**< Initial descriptor value length in bytes. */
+ uint16_t init_offs; /**< Initial descriptor value offset in bytes. If different from zero, the first init_offs bytes of the attribute value will be left uninitialized. */
+ uint16_t max_len; /**< Maximum descriptor value length in bytes, see @ref BLE_GATTS_ATTR_LENS_MAX for maximum values. */
+ uint8_t* p_value; /**< Pointer to the value of the descriptor*/
+} ble_add_descr_params_t;
+
+
/**@brief Function for adding a characteristic to a given service.
*
* If no pointer is given for the initial value,
@@ -302,6 +350,19 @@
ble_gatts_char_handles_t * p_char_handle);
+/**@brief Function for adding a characteristic's descriptor to a given characteristic.
+ *
+ * @param[in] char_handle Handle of the characteristic to which the descriptor is to be added, if @ref BLE_GATT_HANDLE_INVALID is used, it will be placed sequentially.
+ * @param[in] p_descr_props Information needed to add the descriptor.
+ * @param[out] p_descr_handle Handle of the added descriptor.
+ *
+ * @retval NRF_SUCCESS If the characteristic was added successfully. Otherwise, an error code is returned.
+ */
+uint32_t descriptor_add(uint16_t char_handle,
+ ble_add_descr_params_t * p_descr_props,
+ uint16_t * p_descr_handle);
+
+
#endif // BLE_SRV_COMMON_H__
/** @} */
\ No newline at end of file
--- a/source/nordic_sdk/components/device/nrf51.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/device/nrf51.h Thu Apr 07 17:38:06 2016 +0100 @@ -520,39 +520,41 @@ __O uint32_t TASKS_RELEASE; /*!< Release SPI semaphore. */ __I uint32_t RESERVED1[54]; __IO uint32_t EVENTS_END; /*!< Granted transaction completed. */ - __I uint32_t RESERVED2[8]; + __I uint32_t RESERVED2[2]; + __IO uint32_t EVENTS_ENDRX; /*!< End of RXD buffer reached */ + __I uint32_t RESERVED3[5]; __IO uint32_t EVENTS_ACQUIRED; /*!< Semaphore acquired. */ - __I uint32_t RESERVED3[53]; + __I uint32_t RESERVED4[53]; __IO uint32_t SHORTS; /*!< Shortcuts for SPIS. */ - __I uint32_t RESERVED4[64]; + __I uint32_t RESERVED5[64]; __IO uint32_t INTENSET; /*!< Interrupt enable set register. */ __IO uint32_t INTENCLR; /*!< Interrupt enable clear register. */ - __I uint32_t RESERVED5[61]; + __I uint32_t RESERVED6[61]; __I uint32_t SEMSTAT; /*!< Semaphore status. */ - __I uint32_t RESERVED6[15]; + __I uint32_t RESERVED7[15]; __IO uint32_t STATUS; /*!< Status from last transaction. */ - __I uint32_t RESERVED7[47]; + __I uint32_t RESERVED8[47]; __IO uint32_t ENABLE; /*!< Enable SPIS. */ - __I uint32_t RESERVED8; + __I uint32_t RESERVED9; __IO uint32_t PSELSCK; /*!< Pin select for SCK. */ __IO uint32_t PSELMISO; /*!< Pin select for MISO. */ __IO uint32_t PSELMOSI; /*!< Pin select for MOSI. */ __IO uint32_t PSELCSN; /*!< Pin select for CSN. */ - __I uint32_t RESERVED9[7]; + __I uint32_t RESERVED10[7]; __IO uint32_t RXDPTR; /*!< RX data pointer. */ __IO uint32_t MAXRX; /*!< Maximum number of bytes in the receive buffer. */ __I uint32_t AMOUNTRX; /*!< Number of bytes received in last granted transaction. */ - __I uint32_t RESERVED10; + __I uint32_t RESERVED11; __IO uint32_t TXDPTR; /*!< TX data pointer. */ __IO uint32_t MAXTX; /*!< Maximum number of bytes in the transmit buffer. */ __I uint32_t AMOUNTTX; /*!< Number of bytes transmitted in last granted transaction. */ - __I uint32_t RESERVED11; + __I uint32_t RESERVED12; __IO uint32_t CONFIG; /*!< Configuration register. */ - __I uint32_t RESERVED12; + __I uint32_t RESERVED13; __IO uint32_t DEF; /*!< Default character. */ - __I uint32_t RESERVED13[24]; + __I uint32_t RESERVED14[24]; __IO uint32_t ORC; /*!< Over-read character. */ - __I uint32_t RESERVED14[654]; + __I uint32_t RESERVED15[654]; __IO uint32_t POWER; /*!< Peripheral power control. */ } NRF_SPIS_Type;
--- a/source/nordic_sdk/components/device/nrf51_bitfields.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/device/nrf51_bitfields.h Thu Apr 07 17:38:06 2016 +0100 @@ -5962,6 +5962,13 @@ #define SPIS_INTENSET_ACQUIRED_Enabled (1UL) /*!< Interrupt enabled. */ #define SPIS_INTENSET_ACQUIRED_Set (1UL) /*!< Enable interrupt on write. */ +/* Bit 4 : enable interrupt on ENDRX event. */ +#define SPIS_INTENSET_ENDRX_Pos (4UL) /*!< Position of ENDRX field. */ +#define SPIS_INTENSET_ENDRX_Msk (0x1UL << SPIS_INTENSET_ENDRX_Pos) /*!< Bit mask of ENDRX field. */ +#define SPIS_INTENSET_ENDRX_Disabled (0UL) /*!< Interrupt disabled. */ +#define SPIS_INTENSET_ENDRX_Enabled (1UL) /*!< Interrupt enabled. */ +#define SPIS_INTENSET_ENDRX_Set (1UL) /*!< Enable interrupt on write. */ + /* Bit 1 : Enable interrupt on END event. */ #define SPIS_INTENSET_END_Pos (1UL) /*!< Position of END field. */ #define SPIS_INTENSET_END_Msk (0x1UL << SPIS_INTENSET_END_Pos) /*!< Bit mask of END field. */ @@ -5979,6 +5986,13 @@ #define SPIS_INTENCLR_ACQUIRED_Enabled (1UL) /*!< Interrupt enabled. */ #define SPIS_INTENCLR_ACQUIRED_Clear (1UL) /*!< Disable interrupt on write. */ +/* Bit 4 : Disable interrupt on ENDRX event. */ +#define SPIS_INTENCLR_ENDRX_Pos (4UL) /*!< Position of ENDRX field. */ +#define SPIS_INTENCLR_ENDRX_Msk (0x1UL << SPIS_INTENCLR_ENDRX_Pos) /*!< Bit mask of ENDRX field. */ +#define SPIS_INTENCLR_ENDRX_Disabled (0UL) /*!< Interrupt disabled. */ +#define SPIS_INTENCLR_ENDRX_Enabled (1UL) /*!< Interrupt enabled. */ +#define SPIS_INTENCLR_ENDRX_Clear (1UL) /*!< Disable interrupt on write. */ + /* Bit 1 : Disable interrupt on END event. */ #define SPIS_INTENCLR_END_Pos (1UL) /*!< Position of END field. */ #define SPIS_INTENCLR_END_Msk (0x1UL << SPIS_INTENCLR_END_Pos) /*!< Bit mask of END field. */
--- a/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.c Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.c Thu Apr 07 17:38:06 2016 +0100 @@ -38,7 +38,6 @@ #include "nordic_common.h" #include "nrf_error.h" #include "nrf.h" -#include "nrf51_bitfields.h" #include "app_util.h"
--- a/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/drivers_nrf/ble_flash/ble_flash.h Thu Apr 07 17:38:06 2016 +0100 @@ -52,7 +52,7 @@ #include <stdint.h> #include <stdbool.h> -#include <nrf51.h> +#include "nrf.h" #define BLE_FLASH_PAGE_SIZE ((uint16_t)NRF_FICR->CODEPAGESIZE) /**< Size of one flash page. */ #define BLE_FLASH_MAGIC_NUMBER 0x45DE0000 /**< Magic value to identify if flash contains valid data. */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.c Thu Apr 07 17:38:06 2016 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Nordic Semiconductor ASA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
+ * contributors to this software may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdio.h>
+#include "compiler_abstraction.h"
+#include "nrf.h"
+#include "nrf_delay.h"
+
+/*lint --e{438} "Variable not used" */
+void nrf_delay_ms(uint32_t volatile number_of_ms)
+{
+ while(number_of_ms != 0)
+ {
+ number_of_ms--;
+ nrf_delay_us(999);
+ }
+}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/source/nordic_sdk/components/drivers_nrf/delay/nrf_delay.h Thu Apr 07 17:38:06 2016 +0100
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) Nordic Semiconductor ASA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
+ * contributors to this software may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef _NRF_DELAY_H
+#define _NRF_DELAY_H
+
+#include "nrf.h"
+
+/**
+ * @brief Function for delaying execution for number of microseconds.
+ *
+ * @note NRF52 has instruction cache and because of that delay is not precise.
+ *
+ * @param number_of_ms
+ */
+/*lint --e{438, 522} "Variable not used" "Function lacks side-effects" */
+#if defined ( __CC_ARM )
+
+static __ASM void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
+{
+loop
+ SUBS R0, R0, #1
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+#ifdef NRF52
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+ NOP
+#endif
+ BNE loop
+ BX LR
+}
+
+#elif defined ( __ICCARM__ )
+
+static void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
+{
+__ASM (
+"loop:\n\t"
+ " SUBS R0, R0, #1\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+#ifdef NRF52
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+ " NOP\n\t"
+#endif
+ " BNE.n loop\n\t");
+}
+
+#elif defined ( _WIN32 ) || defined ( __unix ) || defined( __APPLE__ )
+
+__STATIC_INLINE void nrf_delay_us(uint32_t volatile number_of_us);
+
+#ifndef CUSTOM_NRF_DELAY_US
+__STATIC_INLINE void nrf_delay_us(uint32_t volatile number_of_us)
+{}
+#endif
+
+#elif defined ( __GNUC__ )
+
+static void __INLINE nrf_delay_us(uint32_t volatile number_of_us) __attribute__((always_inline));
+static void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
+{
+register uint32_t delay __ASM ("r0") = number_of_us;
+__ASM volatile (
+#ifdef NRF51
+ ".syntax unified\n"
+#endif
+ "1:\n"
+ " SUBS %0, %0, #1\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+#ifdef NRF52
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+ " NOP\n"
+#endif
+ " BNE 1b\n"
+#ifdef NRF51
+ ".syntax divided\n"
+#endif
+ : "+r" (delay));
+}
+#endif
+
+void nrf_delay_ms(uint32_t volatile number_of_ms);
+
+#endif
\ No newline at end of file
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_delay.c Thu Apr 07 17:38:04 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) Nordic Semiconductor ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include <stdio.h>
-#include "compiler_abstraction.h"
-#include "nrf.h"
-#include "nrf_delay.h"
-
-/*lint --e{438} "Variable not used" */
-void nrf_delay_ms(uint32_t volatile number_of_ms)
-{
- while(number_of_ms != 0)
- {
- number_of_ms--;
- nrf_delay_us(999);
- }
-}
\ No newline at end of file
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_delay.h Thu Apr 07 17:38:04 2016 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Nordic Semiconductor ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef _NRF_DELAY_H
-#define _NRF_DELAY_H
-
-#include "nrf.h"
-
-#define asm __ASM
-
-/*lint --e{438, 522} "Variable not used" "Function lacks side-effects" */
-#if defined ( __CC_ARM )
-static __ASM void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
-{
-loop
- SUBS R0, R0, #1
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- NOP
- BNE loop
- BX LR
-}
-#elif defined ( __ICCARM__ )
-static void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
-{
-__ASM (
-"loop:\n\t"
- " SUBS R0, R0, #1\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " NOP\n\t"
- " BNE loop\n\t");
-}
-#elif defined ( __GNUC__ )
-
-static void __INLINE nrf_delay_us(uint32_t volatile number_of_us) __attribute__((always_inline));
-static void __INLINE nrf_delay_us(uint32_t volatile number_of_us)
-{
-register uint32_t delay asm ("r0") = number_of_us;
-__ASM volatile (
-".syntax unified\n"
- "1:\n"
- " SUBS %0, %0, #1\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " NOP\n"
- " BNE 1b\n"
- ".syntax divided\n"
- : "+r" (delay));
-}
-#endif
-
-void nrf_delay_ms(uint32_t volatile number_of_ms);
-
-#endif
\ No newline at end of file
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_ecb.h Thu Apr 07 17:38:06 2016 +0100
@@ -42,7 +42,7 @@
* @defgroup nrf_ecb AES ECB encryption
* @{
* @ingroup nrf_drivers
- * @brief Driver for the nRF51 AES Electronic Code Book (ECB) peripheral.
+ * @brief Driver for the AES Electronic Code Book (ECB) peripheral.
*
* To encrypt and decrypt data, the peripheral must first be powered on
* using @ref nrf_ecb_init. Next, the key must be set using @ref nrf_ecb_set_key.
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpio.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpio.h Thu Apr 07 17:38:06 2016 +0100
@@ -32,8 +32,7 @@
#ifndef NRF_GPIO_H__
#define NRF_GPIO_H__
-#include "nrf51.h"
-#include "nrf51_bitfields.h"
+#include "nrf.h"
#include <stdbool.h>
/**
@@ -52,27 +51,6 @@
#define NUMBER_OF_PINS 32
/**
- * @enum nrf_gpio_port_dir_t
- * @brief Enumerator used for setting the direction of a GPIO port.
- */
-typedef enum
-{
- NRF_GPIO_PORT_DIR_OUTPUT, ///< Output
- NRF_GPIO_PORT_DIR_INPUT ///< Input
-} nrf_gpio_port_dir_t;
-
-/**
- * @enum nrf_gpio_pin_dir_t
- * Pin direction definitions.
- */
-typedef enum
-{
- NRF_GPIO_PIN_DIR_INPUT, ///< Input
- NRF_GPIO_PIN_DIR_OUTPUT ///< Output
-} nrf_gpio_pin_dir_t;
-
-/**
- * @enum nrf_gpio_port_select_t
* @brief Enumerator used for selecting between port 0 - 3.
*/
typedef enum
@@ -84,7 +62,33 @@
} nrf_gpio_port_select_t;
/**
- * @enum nrf_gpio_pin_pull_t
+ * @brief Enumerator used for setting the direction of a GPIO port.
+ */
+typedef enum
+{
+ NRF_GPIO_PORT_DIR_OUTPUT, ///< Output
+ NRF_GPIO_PORT_DIR_INPUT ///< Input
+} nrf_gpio_port_dir_t;
+
+/**
+ * @brief Pin direction definitions.
+ */
+typedef enum
+{
+ NRF_GPIO_PIN_DIR_INPUT = GPIO_PIN_CNF_DIR_Input, ///< Input
+ NRF_GPIO_PIN_DIR_OUTPUT = GPIO_PIN_CNF_DIR_Output ///< Output
+} nrf_gpio_pin_dir_t;
+
+/**
+ * @brief Connection of input buffer
+ */
+typedef enum
+{
+ NRF_GPIO_PIN_INPUT_CONNECT = GPIO_PIN_CNF_INPUT_Connect, ///< Connect input buffer
+ NRF_GPIO_PIN_INPUT_DISCONNECT = GPIO_PIN_CNF_INPUT_Disconnect ///< Disconnect input buffer
+} nrf_gpio_pin_input_t;
+
+/**
* @brief Enumerator used for selecting the pin to be pulled down or up at the time of pin configuration
*/
typedef enum
@@ -95,7 +99,21 @@
} nrf_gpio_pin_pull_t;
/**
- * @enum nrf_gpio_pin_sense_t
+ * @brief Enumerator used for selecting output drive mode
+ */
+typedef enum
+{
+ NRF_GPIO_PIN_S0S1 = GPIO_PIN_CNF_DRIVE_S0S1, ///< !< Standard '0', standard '1'
+ NRF_GPIO_PIN_H0S1 = GPIO_PIN_CNF_DRIVE_H0S1, ///< !< High drive '0', standard '1'
+ NRF_GPIO_PIN_S0H1 = GPIO_PIN_CNF_DRIVE_S0H1, ///< !< Standard '0', high drive '1'
+ NRF_GPIO_PIN_H0H1 = GPIO_PIN_CNF_DRIVE_H0H1, ///< !< High drive '0', high 'drive '1''
+ NRF_GPIO_PIN_D0S1 = GPIO_PIN_CNF_DRIVE_D0S1, ///< !< Disconnect '0' standard '1'
+ NRF_GPIO_PIN_D0H1 = GPIO_PIN_CNF_DRIVE_D0H1, ///< !< Disconnect '0', high drive '1'
+ NRF_GPIO_PIN_S0D1 = GPIO_PIN_CNF_DRIVE_S0D1, ///< !< Standard '0'. disconnect '1'
+ NRF_GPIO_PIN_H0D1 = GPIO_PIN_CNF_DRIVE_H0D1, ///< !< High drive '0', disconnect '1'
+} nrf_gpio_pin_drive_t;
+
+/**
* @brief Enumerator used for selecting the pin to sense high or low level on the pin input.
*/
typedef enum
@@ -105,6 +123,7 @@
NRF_GPIO_PIN_SENSE_HIGH = GPIO_PIN_CNF_SENSE_High, ///< Pin sense high level.
} nrf_gpio_pin_sense_t;
+
/**
* @brief Function for configuring the GPIO pin range as outputs with normal drive strength.
* This function can be used to configure pin range as simple output with gate driving GPIO_PIN_CNF_DRIVE_S0S1 (normal cases).
@@ -134,10 +153,30 @@
__STATIC_INLINE void nrf_gpio_range_cfg_input(uint32_t pin_range_start, uint32_t pin_range_end, nrf_gpio_pin_pull_t pull_config);
/**
+ * @brief Pin configuration function
+ *
+ * The main pin configuration function.
+ * This function allows to set any aspect in PIN_CNF register.
+ * @param pin_number Specifies the pin number (allowed values 0-31).
+ * @param dir Pin direction
+ * @param input Connect or disconnect input buffer
+ * @param pull Pull configuration
+ * @param drive Drive configuration
+ * @param sense Pin sensing mechanism
+ */
+__STATIC_INLINE void nrf_gpio_cfg(
+ uint32_t pin_number,
+ nrf_gpio_pin_dir_t dir,
+ nrf_gpio_pin_input_t input,
+ nrf_gpio_pin_pull_t pull,
+ nrf_gpio_pin_drive_t drive,
+ nrf_gpio_pin_sense_t sense);
+
+/**
* @brief Function for configuring the given GPIO pin number as output with given initial value set, hiding inner details.
* This function can be used to configure pin range as simple input with gate driving GPIO_PIN_CNF_DRIVE_S0S1 (normal cases).
*
- * @param pin_number specifies the pin number (allowed values 0-30)
+ * @param pin_number specifies the pin number (allowed values 0-31)
*
* @note Sense capability on the pin is disabled, and input is disconnected from the buffer as the pins are configured as output.
*/
@@ -157,14 +196,14 @@
/**
* @brief Function for reseting pin configuration to its default state.
*
- * @param pin_number Specifies the pin number (allowed values 0-30).
+ * @param pin_number Specifies the pin number (allowed values 0-31).
*/
__STATIC_INLINE void nrf_gpio_cfg_default(uint32_t pin_number);
/**
* @brief Function for configuring the given GPIO pin number as a watcher. Only input is connected.
*
- * @param pin_number Specifies the pin number (allowed values 0-30).
+ * @param pin_number Specifies the pin number (allowed values 0-31).
*
*/
__STATIC_INLINE void nrf_gpio_cfg_watcher(uint32_t pin_number);
@@ -172,7 +211,7 @@
/**
* @brief Function for disconnecting input for the given GPIO.
*
- * @param pin_number Specifies the pin number (allowed values 0-30).
+ * @param pin_number Specifies the pin number (allowed values 0-31).
*
*/
__STATIC_INLINE void nrf_gpio_input_disconnect(uint32_t pin_number);
@@ -219,6 +258,17 @@
__STATIC_INLINE void nrf_gpio_pin_set(uint32_t pin_number);
/**
+ * @brief Function for setting GPIO pins.
+ *
+ * Note that pins must be configured as an output for this
+ * function to have any effect.
+ *
+ * @param pin_mask Specifies the pins to set.
+ * set.
+ */
+__STATIC_INLINE void nrf_gpio_pins_set(uint32_t pin_mask);
+
+/**
* @brief Function for clearing a GPIO pin.
*
* Note that the pin must be configured as an output for this
@@ -230,6 +280,17 @@
__STATIC_INLINE void nrf_gpio_pin_clear(uint32_t pin_number);
/**
+ * @brief Function for clearing GPIO pins.
+ *
+ * Note that pins must be configured as an output for this
+ * function to have any effect.
+ *
+ * @param pin_mask Specifies the pins to clear.
+ * set.
+ */
+__STATIC_INLINE void nrf_gpio_pins_clear(uint32_t pin_mask);
+
+/**
* @brief Function for toggling a GPIO pin.
*
* Note that the pin must be configured as an output for this
@@ -383,11 +444,7 @@
/*lint -e{845} // A zero has been given as right argument to operator '|'" */
for (; pin_range_start <= pin_range_end; pin_range_start++)
{
- NRF_GPIO->PIN_CNF[pin_range_start] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg_output(pin_range_start);
}
}
@@ -396,42 +453,56 @@
/*lint -e{845} // A zero has been given as right argument to operator '|'" */
for (; pin_range_start <= pin_range_end; pin_range_start++)
{
- NRF_GPIO->PIN_CNF[pin_range_start] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (pull_config << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg_input(pin_range_start, pull_config);
}
}
+__STATIC_INLINE void nrf_gpio_cfg(
+ uint32_t pin_number,
+ nrf_gpio_pin_dir_t dir,
+ nrf_gpio_pin_input_t input,
+ nrf_gpio_pin_pull_t pull,
+ nrf_gpio_pin_drive_t drive,
+ nrf_gpio_pin_sense_t sense)
+{
+ NRF_GPIO->PIN_CNF[pin_number] = ((uint32_t)dir << GPIO_PIN_CNF_DIR_Pos)
+ | ((uint32_t)input << GPIO_PIN_CNF_INPUT_Pos)
+ | ((uint32_t)pull << GPIO_PIN_CNF_PULL_Pos)
+ | ((uint32_t)drive << GPIO_PIN_CNF_DRIVE_Pos)
+ | ((uint32_t)sense << GPIO_PIN_CNF_SENSE_Pos);
+}
+
__STATIC_INLINE void nrf_gpio_cfg_output(uint32_t pin_number)
{
- /*lint -e{845} // A zero has been given as right argument to operator '|'" */
- NRF_GPIO->PIN_CNF[pin_number] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg(
+ pin_number,
+ NRF_GPIO_PIN_DIR_OUTPUT,
+ NRF_GPIO_PIN_INPUT_DISCONNECT,
+ NRF_GPIO_PIN_NOPULL,
+ NRF_GPIO_PIN_S0S1,
+ NRF_GPIO_PIN_NOSENSE);
}
__STATIC_INLINE void nrf_gpio_cfg_input(uint32_t pin_number, nrf_gpio_pin_pull_t pull_config)
{
- /*lint -e{845} // A zero has been given as right argument to operator '|'" */
- NRF_GPIO->PIN_CNF[pin_number] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (pull_config << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg(
+ pin_number,
+ NRF_GPIO_PIN_DIR_INPUT,
+ NRF_GPIO_PIN_INPUT_CONNECT,
+ pull_config,
+ NRF_GPIO_PIN_S0S1,
+ NRF_GPIO_PIN_NOSENSE);
}
__STATIC_INLINE void nrf_gpio_cfg_default(uint32_t pin_number)
{
- /*lint -e{845} // A zero has been given as right argument to operator '|'" */
- NRF_GPIO->PIN_CNF[pin_number] = (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (NRF_GPIO_PIN_NOPULL << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg(
+ pin_number,
+ NRF_GPIO_PIN_DIR_INPUT,
+ NRF_GPIO_PIN_INPUT_DISCONNECT,
+ NRF_GPIO_PIN_NOPULL,
+ NRF_GPIO_PIN_S0S1,
+ NRF_GPIO_PIN_NOSENSE);
}
__STATIC_INLINE void nrf_gpio_cfg_watcher(uint32_t pin_number)
@@ -450,12 +521,13 @@
__STATIC_INLINE void nrf_gpio_cfg_sense_input(uint32_t pin_number, nrf_gpio_pin_pull_t pull_config, nrf_gpio_pin_sense_t sense_config)
{
- /*lint -e{845} // A zero has been given as right argument to operator '|'" */
- NRF_GPIO->PIN_CNF[pin_number] = (sense_config << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (pull_config << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg(
+ pin_number,
+ NRF_GPIO_PIN_DIR_INPUT,
+ NRF_GPIO_PIN_INPUT_CONNECT,
+ pull_config,
+ NRF_GPIO_PIN_S0S1,
+ sense_config);
}
__STATIC_INLINE void nrf_gpio_cfg_sense_set(uint32_t pin_number, nrf_gpio_pin_sense_t sense_config)
@@ -470,12 +542,13 @@
{
if(direction == NRF_GPIO_PIN_DIR_INPUT)
{
- NRF_GPIO->PIN_CNF[pin_number] =
- (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos)
- | (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
- | (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
- | (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos)
- | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos);
+ nrf_gpio_cfg(
+ pin_number,
+ NRF_GPIO_PIN_DIR_INPUT,
+ NRF_GPIO_PIN_INPUT_CONNECT,
+ NRF_GPIO_PIN_NOPULL,
+ NRF_GPIO_PIN_S0S1,
+ NRF_GPIO_PIN_NOSENSE);
}
else
{
@@ -488,11 +561,21 @@
NRF_GPIO->OUTSET = (1UL << pin_number);
}
+__STATIC_INLINE void nrf_gpio_pins_set(uint32_t pin_mask)
+{
+ NRF_GPIO->OUTSET = pin_mask;
+}
+
__STATIC_INLINE void nrf_gpio_pin_clear(uint32_t pin_number)
{
NRF_GPIO->OUTCLR = (1UL << pin_number);
}
+__STATIC_INLINE void nrf_gpio_pins_clear(uint32_t pin_mask)
+{
+ NRF_GPIO->OUTCLR = pin_mask;
+}
+
__STATIC_INLINE void nrf_gpio_pin_toggle(uint32_t pin_number)
{
const uint32_t pin_bit = 1UL << pin_number;
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpiote.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_gpiote.h Thu Apr 07 17:38:06 2016 +0100
@@ -43,8 +43,13 @@
* @ingroup nrf_gpiote
* @brief GPIOTE abstraction for configuration of channels.
*/
-
+#ifdef NRF51
#define NUMBER_OF_GPIO_TE 4
+#elif defined NRF52
+#define NUMBER_OF_GPIO_TE 8
+#else
+#error "Chip family not specified"
+#endif
/**
* @enum nrf_gpiote_polarity_t
@@ -217,6 +222,7 @@
__STATIC_INLINE void nrf_gpiote_task_disable(uint32_t idx);
/**@brief Function for configuring a GPIOTE task.
+ * @note Function is not configuring mode field so task is disabled after this function is called.
*
* @param[in] idx Task-Event index.
* @param[in] pin Pin associated with event.
@@ -259,6 +265,10 @@
__STATIC_INLINE void nrf_gpiote_event_clear(nrf_gpiote_events_t event)
{
*(uint32_t *)nrf_gpiote_event_addr_get(event) = 0;
+#if __CORTEX_M == 0x04
+ volatile uint32_t dummy = *((volatile uint32_t *)nrf_gpiote_event_addr_get(event));
+ (void)dummy;
+#endif
}
__STATIC_INLINE uint32_t nrf_gpiote_event_addr_get(nrf_gpiote_events_t event)
@@ -342,8 +352,8 @@
__STATIC_INLINE void nrf_gpiote_task_force(uint32_t idx, nrf_gpiote_outinit_t init_val)
{
- NRF_GPIOTE->CONFIG[idx] &= ~GPIOTE_CONFIG_OUTINIT_Msk;
- NRF_GPIOTE->CONFIG[idx] |= (init_val << GPIOTE_CONFIG_OUTINIT_Pos) & GPIOTE_CONFIG_OUTINIT_Msk;
+ NRF_GPIOTE->CONFIG[idx] = (NRF_GPIOTE->CONFIG[idx] & ~GPIOTE_CONFIG_OUTINIT_Msk)
+ | ((init_val << GPIOTE_CONFIG_OUTINIT_Pos) & GPIOTE_CONFIG_OUTINIT_Msk);
}
__STATIC_INLINE void nrf_gpiote_te_default(uint32_t idx)
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_nvmc.h Thu Apr 07 17:38:06 2016 +0100
@@ -45,10 +45,10 @@
* @defgroup nrf_nvmc Non-volatile memory controller
* @{
* @ingroup nrf_drivers
- * @brief Driver for the nRF51 NVMC peripheral.
+ * @brief Driver for the NVMC peripheral.
*
* This driver allows writing to the non-volatile memory (NVM) regions
- * of the nRF51. In order to write to NVM the controller must be powered
+ * of the chip. In order to write to NVM the controller must be powered
* on and the relevant page must be erased.
*
*/
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_temp.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_temp.h Thu Apr 07 17:38:06 2016 +0100 @@ -33,7 +33,7 @@ #ifndef NRF_TEMP_H__ #define NRF_TEMP_H__ -#include "nrf51.h" +#include "nrf.h" /** * @defgroup nrf_temperature TEMP (temperature) abstraction
--- a/source/nordic_sdk/components/drivers_nrf/hal/nrf_wdt.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/hal/nrf_wdt.h Thu Apr 07 17:38:06 2016 +0100
@@ -35,7 +35,7 @@
* @{
* @ingroup nrf_wdt
*
- * @brief Hardware abstraction layer for accessing the watchdog timer (WDT) peripheral.
+ * @brief Hardware access layer for accessing the watchdog timer (WDT) peripheral.
*/
#ifndef NRF_WDT_H__
--- a/source/nordic_sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/pstorage/config/pstorage_platform.h Thu Apr 07 17:38:06 2016 +0100
@@ -1,33 +1,33 @@
-/*
- * Copyright (c) Nordic Semiconductor ASA
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this
- * list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
- * contributors to this software may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+/*
+ * Copyright (c) Nordic Semiconductor ASA
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this
+ * list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of Nordic Semiconductor ASA nor the names of other
+ * contributors to this software may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
*/
/** @cond To make doxygen skip this file */
@@ -50,9 +50,15 @@
#define PSTORAGE_FLASH_PAGE_SIZE pstorage_flash_page_size() /**< Size of one flash page. */
#define PSTORAGE_FLASH_EMPTY_MASK 0xFFFFFFFF /**< Bit mask that defines an empty address in flash. */
+#ifdef NRF51
+#define BOOTLOADER_ADDRESS (NRF_UICR->BOOTLOADERADDR)
+#elif defined NRF52
+#define BOOTLOADER_ADDRESS (PSTORAGE_FLASH_EMPTY_MASK)
+#endif
+
static __INLINE uint32_t pstorage_flash_page_end()
{
- uint32_t bootloader_addr = NRF_UICR->BOOTLOADERADDR;
+ uint32_t bootloader_addr = BOOTLOADER_ADDRESS;
return ((bootloader_addr != PSTORAGE_FLASH_EMPTY_MASK) ?
(bootloader_addr/ PSTORAGE_FLASH_PAGE_SIZE) : NRF_FICR->CODESIZE);
--- a/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.c Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/drivers_nrf/pstorage/pstorage.c Thu Apr 07 17:38:06 2016 +0100
@@ -45,7 +45,13 @@
#define INVALID_OPCODE 0x00 /**< Invalid op code identifier. */
#define SOC_MAX_WRITE_SIZE PSTORAGE_FLASH_PAGE_SIZE /**< Maximum write size allowed for a single call to \ref sd_flash_write as specified in the SoC API. */
#define RAW_MODE_APP_ID (PSTORAGE_NUM_OF_PAGES + 1) /**< Application id for raw mode. */
+
+#if defined(NRF52)
+#define SD_CMD_MAX_TRIES 1000 /**< Number of times to try a softdevice flash operatoion, specific for nRF52 to account for longest time of flash page erase*/
+#else
#define SD_CMD_MAX_TRIES 3 /**< Number of times to try a softdevice flash operation when the @ref NRF_EVT_FLASH_OPERATION_ERROR sys_evt is received. */
+#endif /* defined(NRF52) */
+
#define MASK_TAIL_SWAP_DONE (1 << 0) /**< Flag for checking if the tail restore area has been written to swap page. */
#define MASK_SINGLE_PAGE_OPERATION (1 << 1) /**< Flag for checking if command is a single flash page operation. */
#define MASK_MODULE_INITIALIZED (1 << 2) /**< Flag for checking if the module has been initialized. */
@@ -1354,8 +1360,10 @@
m_app_table[m_next_app_instance].block_count = p_module_param->block_count;
// Calculate number of flash pages allocated for the device and adjust next free page address.
+ /*lint -save -e666 */
const uint32_t page_count = CEIL_DIV((p_module_param->block_size * p_module_param->block_count),
PSTORAGE_FLASH_PAGE_SIZE);
+ /*lint -restore */
m_next_page_addr += page_count * PSTORAGE_FLASH_PAGE_SIZE;
++m_next_app_instance;
--- a/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_app_handler.h Thu Apr 07 17:38:06 2016 +0100 @@ -43,7 +43,7 @@ * This module handles only the StartDFU packet, which allows a BLE * application to expose support for the DFU Service. * The actual DFU Service runs in a dedicated environment after a BLE - * disconnect and reset of the nRF51 device. + * disconnect and reset of the \nRFXX device. * The host must reconnect and continue the update procedure with * access to the full DFU Service. *
--- a/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_ble_svc.h Thu Apr 07 17:38:06 2016 +0100 @@ -56,7 +56,7 @@ #include "nrf_svc.h" #include <stdint.h> #include "ble_gap.h" -#include "nrf51.h" +#include "nrf.h" #include "nrf_soc.h" #include "nrf_error_sdm.h"
--- a/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_init.h Thu Apr 07 17:38:06 2016 +0100
@@ -32,13 +32,13 @@
/**@file
*
- * @defgroup nrf_dfu_init Init packet handling in DFU.
+ * @defgroup nrf_dfu_init Init packet handling in DFU
* @{
*
* @brief Device Firmware Update module type and function declaration for init packet handling.
*
* @details This header contains basic functionality for performing safety checks on software
- * updates for nRF51 based devices. It provides a skeleton for pre-checking an init packet
+ * updates for \nRFXX based devices. It provides a skeleton for pre-checking an init packet
* to ensure the following image is compatible with this device. A safety check should
* always be performed to prevent accidental flashing of unsupported applications or a
* wrong combination of application and SoftDevice.
@@ -62,7 +62,7 @@
#define DFU_INIT_H__
#include <stdint.h>
-#include "nrf51.h"
+#include "nrf.h"
/**@brief Structure contained in an init packet. Contains information on device type, revision, and
* supported SoftDevices.
--- a/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_types.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/libraries/bootloader_dfu/dfu_types.h Thu Apr 07 17:38:06 2016 +0100 @@ -64,7 +64,7 @@ #define CODE_PAGE_SIZE 0x0400 /**< Size of a flash codepage. Used for size of the reserved flash space in the bootloader region. Will be runtime checked against NRF_UICR->CODEPAGESIZE to ensure the region is correct. */ #elif NRF52 -#define BOOTLOADER_REGION_START 0x0003B000 /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */ +#define BOOTLOADER_REGION_START 0x0007B000 /**< This field should correspond to start address of the bootloader, found in UICR.RESERVED, 0x10001014, register. This value is used for sanity check, so the bootloader will fail immediately if this value differs from runtime value. The value is used to determine max application size for updating. */ #define BOOTLOADER_SETTINGS_ADDRESS 0x0007F000 /**< The field specifies the page location of the bootloader settings address. */ #define CODE_PAGE_SIZE 0x1000 /**< Size of a flash codepage. Used for size of the reserved flash space in the bootloader region. Will be runtime checked against NRF_UICR->CODEPAGESIZE to ensure the region is correct. */ #else
--- a/source/nordic_sdk/components/libraries/timer/app_timer.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/libraries/timer/app_timer.h Thu Apr 07 17:38:06 2016 +0100
@@ -38,23 +38,22 @@
*
* @brief Application timer functionality.
*
- * @details It enables the application to create multiple timer instances based on the RTC1
- * peripheral. Checking for timeouts and invokation of user timeout handlers is performed
+ * @details This module enables the application to create multiple timer instances based on the RTC1
+ * peripheral. Checking for time-outs and invokation of user time-out handlers is performed
* in the RTC1 interrupt handler. List handling is done using a software interrupt (SWI0).
* Both interrupt handlers are running in APP_LOW priority level.
*
- * @note When calling app_timer_start() or app_timer_stop(), the timer operation is just queued,
+ * @details When calling app_timer_start() or app_timer_stop(), the timer operation is just queued,
* and the software interrupt is triggered. The actual timer start/stop operation is
* executed by the SWI0 interrupt handler. Since the SWI0 interrupt is running in APP_LOW,
* if the application code calling the timer function is running in APP_LOW or APP_HIGH,
* the timer operation will not be performed until the application handler has returned.
- * This will be the case e.g. when stopping a timer from a timeout handler when not using
+ * This will be the case, for example, when stopping a timer from a time-out handler when not using
* the scheduler.
*
* @details Use the USE_SCHEDULER parameter of the APP_TIMER_INIT() macro to select if the
- * @ref app_scheduler is to be used or not.
- *
- * @note Even if the scheduler is not used, app_timer.h will include app_scheduler.h, so when
+ * @ref app_scheduler should be used or not. Even if the scheduler is
+ * not used, app_timer.h will include app_scheduler.h, so when
* compiling, app_scheduler.h must be available in one of the compiler include paths.
*/
@@ -71,24 +70,21 @@
#define APP_TIMER_CLOCK_FREQ 32768 /**< Clock frequency of the RTC timer used to implement the app timer module. */
#define APP_TIMER_MIN_TIMEOUT_TICKS 5 /**< Minimum value of the timeout_ticks parameter of app_timer_start(). */
-#define APP_TIMER_NODE_SIZE 40 /**< Size of app_timer.timer_node_t (only for use inside APP_TIMER_BUF_SIZE()). */
+#define APP_TIMER_NODE_SIZE 32 /**< Size of app_timer.timer_node_t (used to allocate data). */
#define APP_TIMER_USER_OP_SIZE 24 /**< Size of app_timer.timer_user_op_t (only for use inside APP_TIMER_BUF_SIZE()). */
#define APP_TIMER_USER_SIZE 8 /**< Size of app_timer.timer_user_t (only for use inside APP_TIMER_BUF_SIZE()). */
#define APP_TIMER_INT_LEVELS 3 /**< Number of interrupt levels from where timer operations may be initiated (only for use inside APP_TIMER_BUF_SIZE()). */
/**@brief Compute number of bytes required to hold the application timer data structures.
*
- * @param[in] MAX_TIMERS Maximum number of timers that can be created at any given time.
* @param[in] OP_QUEUE_SIZE Size of queues holding timer operations that are pending execution.
- * NOTE: Due to the queue implementation, this size must be one more
+ * Note that due to the queue implementation, this size must be one more
* than the size that is actually needed.
*
* @return Required application timer buffer size (in bytes).
*/
-#define APP_TIMER_BUF_SIZE(MAX_TIMERS, OP_QUEUE_SIZE) \
+#define APP_TIMER_BUF_SIZE(OP_QUEUE_SIZE) \
( \
- ((MAX_TIMERS) * APP_TIMER_NODE_SIZE) \
- + \
( \
APP_TIMER_INT_LEVELS \
* \
@@ -98,29 +94,42 @@
/**@brief Convert milliseconds to timer ticks.
*
- * @note This macro uses 64 bit integer arithmetic, but as long as the macro parameters are
+ * This macro uses 64-bit integer arithmetic, but as long as the macro parameters are
* constants (i.e. defines), the computation will be done by the preprocessor.
- *
- * @param[in] MS Milliseconds.
- * @param[in] PRESCALER Value of the RTC1 PRESCALER register (must be the same value that was
- * passed to APP_TIMER_INIT()).
*
- * @note When using this macro, it is the responsibility of the developer to ensure that the
+ * When using this macro, ensure that the
* values provided as input result in an output value that is supported by the
* @ref app_timer_start function. For example, when the ticks for 1 ms is needed, the
* maximum possible value of PRESCALER must be 6, when @ref APP_TIMER_CLOCK_FREQ is 32768.
* This will result in a ticks value as 5. Any higher value for PRESCALER will result in a
* ticks value that is not supported by this module.
*
+ * @param[in] MS Milliseconds.
+ * @param[in] PRESCALER Value of the RTC1 PRESCALER register (must be the same value that was
+ * passed to APP_TIMER_INIT()).
+ *
* @return Number of timer ticks.
*/
#define APP_TIMER_TICKS(MS, PRESCALER)\
((uint32_t)ROUNDED_DIV((MS) * (uint64_t)APP_TIMER_CLOCK_FREQ, ((PRESCALER) + 1) * 1000))
-/**@brief Timer id type. */
-typedef uint32_t app_timer_id_t;
+typedef struct app_timer_t { uint32_t data[CEIL_DIV(APP_TIMER_NODE_SIZE, sizeof(uint32_t))]; } app_timer_t;
+
+/**@brief Timer ID type.
+ * Never declare a variable of this type, but use the macro @ref APP_TIMER_DEF instead.*/
+typedef app_timer_t * app_timer_id_t;
-/**@brief Application timeout handler type. */
+/**
+ * @brief Create a timer identifier and statically allocate memory for the timer.
+ *
+ * @param timer_id Name of the timer identifier variable that will be used to control the timer.
+ */
+#define APP_TIMER_DEF(timer_id) \
+ static app_timer_t timer_id##_data = { {0} }; \
+ static const app_timer_id_t timer_id = &timer_id##_data
+
+
+/**@brief Application time-out handler type. */
typedef void (*app_timer_timeout_handler_t)(void * p_context);
/**@brief Type of function for passing events from the timer module to the scheduler. */
@@ -134,131 +143,132 @@
APP_TIMER_MODE_REPEATED /**< The timer will restart each time it expires. */
} app_timer_mode_t;
-/**@brief Macro for initializing the application timer module.
+/**@brief Initialize the application timer module.
*
- * @details It will handle dimensioning and allocation of the memory buffer required by the timer,
+ * @details This macro handles dimensioning and allocation of the memory buffer required by the timer,
* making sure that the buffer is correctly aligned. It will also connect the timer module
* to the scheduler (if specified).
*
- * @note This module assumes that the LFCLK is already running. If it isn't, the module will
- * be non-functional, since the RTC will not run. If you don't use a softdevice, you'll
- * have to start the LFCLK manually. See the rtc_example's lfclk_config() function
- * for an example of how to do this. If you use a softdevice, the LFCLK is started on
- * softdevice init.
+ * @note This module assumes that the LFCLK is already running. If it is not, the module will
+ * be non-functional, since the RTC will not run. If you do not use a SoftDevice, you
+ * must start the LFCLK manually. See the rtc_example's lfclk_config() function
+ * for an example of how to do this. If you use a SoftDevice, the LFCLK is started on
+ * SoftDevice init.
*
*
* @param[in] PRESCALER Value of the RTC1 PRESCALER register. This will decide the
* timer tick rate. Set to 0 for no prescaling.
- * @param[in] MAX_TIMERS Maximum number of timers that can be created at any given time.
* @param[in] OP_QUEUES_SIZE Size of queues holding timer operations that are pending execution.
* @param[in] SCHEDULER_FUNC Pointer to scheduler event handler
*
* @note Since this macro allocates a buffer, it must only be called once (it is OK to call it
- * several times as long as it is from the same location, e.g. to do a reinitialization).
+ * several times as long as it is from the same location, for example, to do a re-initialization).
*/
/*lint -emacro(506, APP_TIMER_INIT) */ /* Suppress "Constant value Boolean */
-#define APP_TIMER_INIT(PRESCALER, MAX_TIMERS, OP_QUEUES_SIZE, SCHEDULER_FUNC) \
+#define APP_TIMER_INIT(PRESCALER, OP_QUEUES_SIZE, SCHEDULER_FUNC) \
do \
{ \
- static uint32_t APP_TIMER_BUF[CEIL_DIV(APP_TIMER_BUF_SIZE((MAX_TIMERS), \
- (OP_QUEUES_SIZE) + 1), \
+ static uint32_t APP_TIMER_BUF[CEIL_DIV(APP_TIMER_BUF_SIZE((OP_QUEUES_SIZE) + 1), \
sizeof(uint32_t))]; \
uint32_t ERR_CODE = app_timer_init((PRESCALER), \
- (MAX_TIMERS), \
(OP_QUEUES_SIZE) + 1, \
APP_TIMER_BUF, \
SCHEDULER_FUNC); \
APP_ERROR_CHECK(ERR_CODE); \
} while (0)
+
+
/**@brief Function for initializing the timer module.
*
- * @note Normally initialization should be done using the APP_TIMER_INIT() macro, as that will both
- * allocate the buffers needed by the timer module (including aligning the buffers correctly,
- * and also take care of connecting the timer module to the scheduler (if specified).
+ * Normally, initialization should be done using the APP_TIMER_INIT() macro, because that macro will both
+ * allocate the buffers needed by the timer module (including aligning the buffers correctly)
+ * and take care of connecting the timer module to the scheduler (if specified).
*
* @param[in] prescaler Value of the RTC1 PRESCALER register. Set to 0 for no prescaling.
- * @param[in] max_timers Maximum number of timers that can be created at any given time.
* @param[in] op_queues_size Size of queues holding timer operations that are pending
- * execution. NOTE: Due to the queue implementation, this size must
+ * execution. Note that due to the queue implementation, this size must
* be one more than the size that is actually needed.
* @param[in] p_buffer Pointer to memory buffer for internal use in the app_timer
* module. The size of the buffer can be computed using the
* APP_TIMER_BUF_SIZE() macro. The buffer must be aligned to a
* 4 byte boundary.
- * @param[in] evt_schedule_func Function for passing timeout events to the scheduler. Point to
+ * @param[in] evt_schedule_func Function for passing time-out events to the scheduler. Point to
* app_timer_evt_schedule() to connect to the scheduler. Set to NULL
- * to make the timer module call the timeout handler directly from
+ * to make the timer module call the time-out handler directly from
* the timer interrupt handler.
*
- * @retval NRF_SUCCESS Successful initialization.
- * @retval NRF_ERROR_INVALID_PARAM Invalid parameter (buffer not aligned to a 4 byte
+ * @retval NRF_SUCCESS If the module was initialized successfully.
+ * @retval NRF_ERROR_INVALID_PARAM If a parameter was invalid (buffer not aligned to a 4 byte
* boundary or NULL).
*/
uint32_t app_timer_init(uint32_t prescaler,
- uint8_t max_timers,
uint8_t op_queues_size,
void * p_buffer,
app_timer_evt_schedule_func_t evt_schedule_func);
/**@brief Function for creating a timer instance.
*
- * @param[out] p_timer_id Id of the newly created timer.
+ * @param[in] p_timer_id Pointer to timer identifier.
* @param[in] mode Timer mode.
* @param[in] timeout_handler Function to be executed when the timer expires.
*
- * @retval NRF_SUCCESS Timer was successfully created.
- * @retval NRF_ERROR_INVALID_PARAM Invalid parameter.
- * @retval NRF_ERROR_INVALID_STATE Application timer module has not been initialized.
- * @retval NRF_ERROR_NO_MEM Maximum number of timers has already been reached.
+ * @retval NRF_SUCCESS If the timer was successfully created.
+ * @retval NRF_ERROR_INVALID_PARAM If a parameter was invalid.
+ * @retval NRF_ERROR_INVALID_STATE If the application timer module has not been initialized or
+ * the timer is running.
*
* @note This function does the timer allocation in the caller's context. It is also not protected
* by a critical region. Therefore care must be taken not to call it from several interrupt
* levels simultaneously.
+ * @note The function can be called again on the timer instance and will re-initialize the instance if
+ * the timer is not running.
+ * @attention The FreeRTOS and RTX app_timer implementation does not allow app_timer_create to
+ * be called on the previously initialized instance.
*/
-uint32_t app_timer_create(app_timer_id_t * p_timer_id,
+uint32_t app_timer_create(app_timer_id_t const * p_timer_id,
app_timer_mode_t mode,
app_timer_timeout_handler_t timeout_handler);
/**@brief Function for starting a timer.
*
- * @param[in] timer_id Id of timer to start.
- * @param[in] timeout_ticks Number of ticks (of RTC1, including prescaling) to timeout event
- * (minimum 5 ticks).
- * @param[in] p_context General purpose pointer. Will be passed to the timeout handler when
- * the timer expires.
+ * @param[in] timer_id Timer identifier.
+ * @param[in] timeout_ticks Number of ticks (of RTC1, including prescaling) to time-out event
+ * (minimum 5 ticks).
+ * @param[in] p_context General purpose pointer. Will be passed to the time-out handler when
+ * the timer expires.
*
- * @retval NRF_SUCCESS Timer was successfully started.
- * @retval NRF_ERROR_INVALID_PARAM Invalid parameter.
- * @retval NRF_ERROR_INVALID_STATE Application timer module has not been initialized, or timer
+ * @retval NRF_SUCCESS If the timer was successfully started.
+ * @retval NRF_ERROR_INVALID_PARAM If a parameter was invalid.
+ * @retval NRF_ERROR_INVALID_STATE If the application timer module has not been initialized or the timer
* has not been created.
- * @retval NRF_ERROR_NO_MEM Timer operations queue was full.
+ * @retval NRF_ERROR_NO_MEM If the timer operations queue was full.
*
* @note The minimum timeout_ticks value is 5.
- * @note For multiple active timers, timeouts occurring in close proximity to each other (in the
+ * @note For multiple active timers, time-outs occurring in close proximity to each other (in the
* range of 1 to 3 ticks) will have a positive jitter of maximum 3 ticks.
- * @note When calling this method on a timer which is already running, the second start operation
- * will be ignored.
+ * @note When calling this method on a timer that is already running, the second start operation
+ * is ignored.
*/
uint32_t app_timer_start(app_timer_id_t timer_id, uint32_t timeout_ticks, void * p_context);
/**@brief Function for stopping the specified timer.
*
- * @param[in] timer_id Id of timer to stop.
+ * @param[in] timer_id Timer identifier.
*
- * @retval NRF_SUCCESS Timer was successfully stopped.
- * @retval NRF_ERROR_INVALID_PARAM Invalid parameter.
- * @retval NRF_ERROR_INVALID_STATE Application timer module has not been initialized, or timer
+ * @retval NRF_SUCCESS If the timer was successfully stopped.
+ * @retval NRF_ERROR_INVALID_PARAM If a parameter was invalid.
+ * @retval NRF_ERROR_INVALID_STATE If the application timer module has not been initialized or the timer
* has not been created.
- * @retval NRF_ERROR_NO_MEM Timer operations queue was full.
+ * @retval NRF_ERROR_NO_MEM If the timer operations queue was full.
*/
uint32_t app_timer_stop(app_timer_id_t timer_id);
/**@brief Function for stopping all running timers.
*
- * @retval NRF_SUCCESS All timers were successfully stopped.
- * @retval NRF_ERROR_INVALID_STATE Application timer module has not been initialized.
- * @retval NRF_ERROR_NO_MEM Timer operations queue was full.
+ * @retval NRF_SUCCESS If all timers were successfully stopped.
+ * @retval NRF_ERROR_INVALID_STATE If the application timer module has not been initialized.
+ * @retval NRF_ERROR_NO_MEM If the timer operations queue was full.
*/
uint32_t app_timer_stop_all(void);
@@ -266,7 +276,7 @@
*
* @param[out] p_ticks Current value of the RTC1 counter.
*
- * @retval NRF_SUCCESS Counter was successfully read.
+ * @retval NRF_SUCCESS If the counter was successfully read.
*/
uint32_t app_timer_cnt_get(uint32_t * p_ticks);
@@ -276,7 +286,7 @@
* @param[in] ticks_from Value returned by app_timer_cnt_get().
* @param[out] p_ticks_diff Number of ticks from ticks_from to ticks_to.
*
- * @retval NRF_SUCCESS Counter difference was successfully computed.
+ * @retval NRF_SUCCESS If the counter difference was successfully computed.
*/
uint32_t app_timer_cnt_diff_compute(uint32_t ticks_to,
uint32_t ticks_from,
--- a/source/nordic_sdk/components/libraries/util/app_util.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/libraries/util/app_util.h Thu Apr 07 17:38:06 2016 +0100
@@ -150,7 +150,6 @@
*/
#define MSEC_TO_UNITS(TIME, RESOLUTION) (((TIME) * 1000) / (RESOLUTION))
-
/**@brief Perform integer division, making sure the result is rounded up.
*
* @details One typical use for this is to compute the number of objects with size B is needed to
@@ -162,9 +161,27 @@
* @return Integer result of dividing A by B, rounded up.
*/
#define CEIL_DIV(A, B) \
- /*lint -save -e573 */ \
- ((((A) - 1) / (B)) + 1) \
- /*lint -restore */
+ (((A) + (B) - 1) / (B))
+
+/**@brief Function for creating a buffer aligned to 4 bytes.
+ *
+ * @param[in] NAME Name of the buffor.
+ * @param[in] MIN_SIZE Size of this buffor (it will be rounded up to multiples of 4 bytes).
+ */
+#define WORD_ALIGNED_MEM_BUFF(NAME, MIN_SIZE) static uint32_t NAME[CEIL_DIV(MIN_SIZE, sizeof(uint32_t))]
+
+/**@brief Function for changing the value unit.
+ *
+ * @param[in] value Value to be rescaled.
+ * @param[in] old_unit_reversal Reversal of the incoming unit.
+ * @param[in] new_unit_reversal Reversal of the desired unit.
+ *
+ * @return Number of bytes written.
+ */
+static __INLINE uint64_t value_rescale(uint32_t value, uint32_t old_unit_reversal, uint16_t new_unit_reversal)
+{
+ return (uint64_t)ROUNDED_DIV((uint64_t)value * new_unit_reversal, old_unit_reversal);
+}
/**@brief Function for encoding a uint16 value.
*
@@ -179,7 +196,22 @@
p_encoded_data[1] = (uint8_t) ((value & 0xFF00) >> 8);
return sizeof(uint16_t);
}
-
+
+/**@brief Function for encoding a three-byte value.
+ *
+ * @param[in] value Value to be encoded.
+ * @param[out] p_encoded_data Buffer where the encoded data is to be written.
+ *
+ * @return Number of bytes written.
+ */
+static __INLINE uint8_t uint24_encode(uint32_t value, uint8_t * p_encoded_data)
+{
+ p_encoded_data[0] = (uint8_t) ((value & 0x000000FF) >> 0);
+ p_encoded_data[1] = (uint8_t) ((value & 0x0000FF00) >> 8);
+ p_encoded_data[2] = (uint8_t) ((value & 0x00FF0000) >> 16);
+ return 3;
+}
+
/**@brief Function for encoding a uint32 value.
*
* @param[in] value Value to be encoded.
@@ -208,6 +240,19 @@
(((uint16_t)((uint8_t *)p_encoded_data)[1]) << 8 ));
}
+/**@brief Function for decoding a three-byte value.
+ *
+ * @param[in] p_encoded_data Buffer where the encoded data is stored.
+ *
+ * @return Decoded value (uint32_t).
+ */
+static __INLINE uint32_t uint24_decode(const uint8_t * p_encoded_data)
+{
+ return ( (((uint32_t)((uint8_t *)p_encoded_data)[0]) << 0) |
+ (((uint32_t)((uint8_t *)p_encoded_data)[1]) << 8) |
+ (((uint32_t)((uint8_t *)p_encoded_data)[2]) << 16));
+}
+
/**@brief Function for decoding a uint32 value.
*
* @param[in] p_encoded_data Buffer where the encoded data is stored.
@@ -221,7 +266,7 @@
(((uint32_t)((uint8_t *)p_encoded_data)[2]) << 16) |
(((uint32_t)((uint8_t *)p_encoded_data)[3]) << 24 ));
}
-
+
/** @brief Function for converting the input voltage (in milli volts) into percentage of 3.0 Volts.
*
* @details The calculation is based on a linearized version of the battery's discharge
@@ -280,7 +325,7 @@
*
* @return TRUE if pointer is aligned to a 4 byte boundary, FALSE otherwise.
*/
-static __INLINE bool is_word_aligned(void * p)
+static __INLINE bool is_word_aligned(void const* p)
{
return (((uintptr_t)p & 0x03) == 0);
}
--- a/source/nordic_sdk/components/libraries/util/app_util_platform.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/libraries/util/app_util_platform.h Thu Apr 07 17:38:06 2016 +0100 @@ -44,7 +44,7 @@ #include <stdint.h> #include "compiler_abstraction.h" -#include "nrf51.h" +#include "nrf.h" #ifdef SOFTDEVICE_PRESENT #include "nrf_soc.h" #include "app_error.h"
--- a/source/nordic_sdk/components/libraries/util/nordic_common.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/libraries/util/nordic_common.h Thu Apr 07 17:38:06 2016 +0100 @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - */ + */ /** @file * @brief Common defines and macros for firmware developed by Nordic Semiconductor. @@ -37,22 +37,57 @@ #ifndef NORDIC_COMMON_H__ #define NORDIC_COMMON_H__ -/** Swaps the upper byte with the lower byte in a 16 bit variable */ -//lint -emacro((572),SWAP) // Suppress warning 572 "Excessive shift value" -#define SWAP(x) ((((x)&0xFF)<<8)|(((x)>>8)&0xFF)) +/** The upper 8 bits of a 32 bit value */ +//lint -emacro(572,MSB) // Suppress warning 572 "Excessive shift value" +#define MSB(a) (((a) & 0xFF000000) >> 24) +/** The lower 8 bits (of a 32 bit value) */ +#define LSB(a) ((a) & 0x000000FF) /** The upper 8 bits of a 16 bit value */ -//lint -emacro(572,MSB) // Suppress warning 572 "Excessive shift value" -#define MSB(a) (((a) & 0xFF00) >> 8) +//lint -emacro(572,MSB_16) // Suppress warning 572 "Excessive shift value" +#define MSB_16(a) (((a) & 0xFF00) >> 8) /** The lower 8 bits (of a 16 bit value) */ -#define LSB(a) ((a) & 0xFF) +#define LSB_16(a) ((a) & 0x00FF) + +/** Leaves the minimum of the two 32-bit arguments */ +/*lint -emacro(506, MIN) */ /* Suppress "Constant value Boolean */ +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +/** Leaves the maximum of the two 32-bit arguments */ +/*lint -emacro(506, MAX) */ /* Suppress "Constant value Boolean */ +#define MAX(a, b) ((a) < (b) ? (b) : (a)) + +/** Concatenates two parameters. Useful as a second level of indirection, + * when a parameter can be macro itself. */ +#define CONCAT_2(p1, p2) p1##p2 +/** Concatenates three parameters. Useful as a second level of indirection, + * when a parameter can be macro itself. */ +#define CONCAT_3(p1, p2, p3) p1##p2##p3 -/** Leaves the minimum of the two arguments */ -/*lint -emacro(506, MIN) */ /* Suppress "Constant value Boolean */ -#define MIN(a, b) ((a) < (b) ? (a) : (b)) -/** Leaves the maximum of the two arguments */ -/*lint -emacro(506, MAX) */ /* Suppress "Constant value Boolean */ -#define MAX(a, b) ((a) < (b) ? (b) : (a)) +/**@brief Set a bit in the uint32 word. + * + * @param[in] W Word whose bit is being set. + * @param[in] B Bit number in the word to be set. + */ +#define SET_BIT(W,B) ((W) |= (uint32_t)(1U << (B))) + + +/**@brief Clears a bit in the uint32 word. + * + * @param[in] W Word whose bit is to be cleared. + * @param[in] B Bit number in the word to be cleared. + */ +#define CLR_BIT(W, B) ((W) &= (~((uint32_t)1 << (B)))) + + +/**@brief Checks if a bit is set. + * + * @param[in] W Word whose bit is to be checked. + * @param[in] B Bit number in the word to be checked. + * + * @retval 1 if bit is set. + * @retval 0 if bit is not set. + */ +#define IS_SET(W,B) (((W) >> (B)) & 1) #define BIT_0 0x01 /**< The value of bit 0 */ #define BIT_1 0x02 /**< The value of bit 1 */
--- a/source/nordic_sdk/components/libraries/util/sdk_errors.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/libraries/util/sdk_errors.h Thu Apr 07 17:38:06 2016 +0100 @@ -62,6 +62,7 @@ #ifndef SDK_ERRORS_H__ #define SDK_ERRORS_H__ +#include <stdint.h> #include "nrf_error.h" /**
--- a/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.c Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.c Thu Apr 07 17:38:06 2016 +0100
@@ -37,6 +37,7 @@
#include "app_util.h"
#include "nrf_assert.h"
#include "nrf_soc.h"
+#include "nrf.h"
#if defined(ANT_STACK_SUPPORT_REQD) && defined(BLE_STACK_SUPPORT_REQD)
#include "ant_interface.h"
@@ -46,6 +47,13 @@
#include "ble.h"
#endif
+#ifdef NRF51
+#define SOFTDEVICE_EVT_IRQ SD_EVT_IRQn /**< SoftDevice Event IRQ number. Used for both protocol events and SoC events. */
+#define SOFTDEVICE_EVT_IRQHandler SD_EVT_IRQHandler
+#elif defined (NRF52)
+#define SOFTDEVICE_EVT_IRQ SWI2_EGU2_IRQn
+#define SOFTDEVICE_EVT_IRQHandler SWI2_EGU2_IRQHandler
+#endif /* NRF51 */
static softdevice_evt_schedule_func_t m_evt_schedule_func; /**< Pointer to function for propagating SoftDevice events to the scheduler. */
@@ -205,6 +213,10 @@
}
}
+bool softdevice_handler_isEnabled(void)
+{
+ return m_softdevice_enabled;
+}
uint32_t softdevice_handler_init(nrf_clock_lfclksrc_t clock_source,
void * p_ble_evt_buffer,
@@ -238,17 +250,28 @@
m_evt_schedule_func = evt_schedule_func;
+//Enabling FPU for SoftDevice
+#ifdef S132
+ SCB->CPACR |= (3UL << 20) | (3UL << 22);
+ __DSB();
+ __ISB();
+#endif
// Initialize SoftDevice.
err_code = sd_softdevice_enable(clock_source, softdevice_assertion_handler);
if (err_code != NRF_SUCCESS)
{
return err_code;
}
+#ifdef S132
+ SCB->CPACR = 0;
+ __DSB();
+ __ISB();
+#endif
m_softdevice_enabled = true;
// Enable BLE event interrupt (interrupt priority has already been set by the stack).
- return sd_nvic_EnableIRQ(SWI2_IRQn);
+ return sd_nvic_EnableIRQ(SOFTDEVICE_EVT_IRQ);
}
@@ -309,7 +332,7 @@
*
* @details This function is called whenever an event is ready to be pulled.
*/
-void SWI2_IRQHandler(void)
+void SOFTDEVICE_EVT_IRQHandler(void)
{
if (m_evt_schedule_func != NULL)
{
--- a/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.h Thu Apr 07 17:38:04 2016 +0100
+++ b/source/nordic_sdk/components/softdevice/common/softdevice_handler/softdevice_handler.h Thu Apr 07 17:38:06 2016 +0100
@@ -98,6 +98,14 @@
APP_ERROR_CHECK(ERR_CODE); \
} while (0)
+/**
+ * @brief Function for retrieving the information about SD state
+ *
+ * The information about current state of softdevice.
+ * @retval false SD is not initialized and SD commands should not be called.
+ * @retval true SD is already initialized
+ */
+bool softdevice_handler_isEnabled(void);
/**@brief Function for initializing the stack handler module.
*
--- a/source/nordic_sdk/components/softdevice/s130/headers/nrf_sdm.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/softdevice/s130/headers/nrf_sdm.h Thu Apr 07 17:38:06 2016 +0100 @@ -42,7 +42,7 @@ #define NRF_SDM_H__ #include "nrf_svc.h" -#include "nrf51.h" +#include "nrf.h" #include "nrf_soc.h" #include "nrf_error_sdm.h"
--- a/source/nordic_sdk/components/softdevice/s130/headers/nrf_soc.h Thu Apr 07 17:38:04 2016 +0100 +++ b/source/nordic_sdk/components/softdevice/s130/headers/nrf_soc.h Thu Apr 07 17:38:06 2016 +0100 @@ -43,8 +43,7 @@ #include <stdint.h> #include <stdbool.h> #include "nrf_svc.h" -#include "nrf51.h" -#include "nrf51_bitfields.h" +#include "nrf.h" #include "nrf_error_soc.h" /**@addtogroup NRF_SOC_DEFINES Defines