Merge branch 'master' of https://github.com/mbedmicro/mbed

Author: bcostm

README.md

@@ -38,17 +38,22 @@ NXP:
 * [LPC1549](https://mbed.org/platforms/LPCXpresso1549/) (Cortex-M3)
 
 Freescale:
-* FRDM-K20D50M
+* FRDM-K20D50M (Cortex-M4)
 * [FRDM-KL05Z](https://mbed.org/platforms/FRDM-KL05Z/) (Cortex-M0+)
 * [FRDM-KL25Z](http://mbed.org/platforms/KL25Z/) (Cortex-M0+)
 * [FRDM-KL46Z](https://mbed.org/platforms/FRDM-KL46Z/) (Cortex-M0+)
+* FRDM-K64F (Cortex-M4)
 
 STMicroelectronics:
 * [Nucleo-F103RB](https://mbed.org/platforms/ST-Nucleo-F103RB/) (Cortex-M3)
 * [Nucleo-L152RE](https://mbed.org/platforms/ST-Nucleo-L152RE/) (Cortex-M3)
 * [Nucleo-F030R8](https://mbed.org/platforms/ST-Nucleo-F030R8/) (Cortex-M0)
 * [Nucleo-F401RE](https://mbed.org/platforms/ST-Nucleo-F401RE/) (Cortex-M4)
-* STM32F407 (Cortex-M4)
+* STM32F407 (Cortex-M4F)
+* STM32F0-Discovery (Cortex-M0)
+* STM32VL-Discovery (Cortex-M3)
+* STM32F4-Discovery (Cortex-M4F)
+
 
 Nordic:
 * [nRF51822-mKIT](https://mbed.org/platforms/Nordic-nRF51822/) (Cortex-M0)

libraries/USBDevice/USBDevice/USBEndpoints.h

@@ -41,7 +41,7 @@ typedef enum {
 #include "USBEndpoints_LPC17_LPC23.h"
 #elif defined(TARGET_LPC11UXX) || defined(TARGET_LPC1347)
 #include "USBEndpoints_LPC11U.h"
-#elif defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M)
+#elif defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M) | defined(TARGET_K64F)
 #include "USBEndpoints_KL25Z.h"
 #elif defined (TARGET_STM32F4XX)
 #include "USBEndpoints_STM32F4.h"

libraries/USBDevice/USBDevice/USBHAL_KL25Z.cpp

@@ -16,7 +16,7 @@
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#if defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M)
+#if defined(TARGET_KL25Z) | defined(TARGET_KL46Z) | defined(TARGET_K20D5M) | defined(TARGET_K64F)
 
 #include "USBHAL.h"
 
@@ -86,6 +86,9 @@ USBHAL::USBHAL(void) {
     // Disable IRQ
     NVIC_DisableIRQ(USB0_IRQn);
 
+#if defined(TARGET_K64F)
+    MPU->CESR=0;
+#endif
     // fill in callback array
     epCallback[0] = &USBHAL::EP1_OUT_callback;
     epCallback[1] = &USBHAL::EP1_IN_callback;
@@ -136,9 +139,9 @@ USBHAL::USBHAL(void) {
     while(USB0->USBTRC0 & USB_USBTRC0_USBRESET_MASK);
 
     // Set BDT Base Register
-    USB0->BDTPAGE1=(uint8_t)((uint32_t)bdt>>8);
-    USB0->BDTPAGE2=(uint8_t)((uint32_t)bdt>>16);
-    USB0->BDTPAGE3=(uint8_t)((uint32_t)bdt>>24);
+    USB0->BDTPAGE1 = (uint8_t)((uint32_t)bdt>>8);
+    USB0->BDTPAGE2 = (uint8_t)((uint32_t)bdt>>16);
+    USB0->BDTPAGE3 = (uint8_t)((uint32_t)bdt>>24);
 
     // Clear interrupt flag
     USB0->ISTAT = 0xff;

libraries/ble/ble-api/hw/Gap.h

@@ -36,7 +36,15 @@ class Gap
         GapEvents *m_pEventHandler;
 
     public:
+				typedef enum addr_type_e{
+                 ADDR_TYPE_PUBLIC = 0,
+                 ADDR_TYPE_RANDOM_STATIC,
+                 ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE,
+                 ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE
+               } addr_type_t;
+             
 				/* These functions must be defined in the sub-class */
+        virtual ble_error_t setAddress(addr_type_t type, uint8_t address[6]) = 0;
 				virtual ble_error_t setAdvertisingData(GapAdvertisingData &, GapAdvertisingData &) = 0;
 				virtual ble_error_t startAdvertising(GapAdvertisingParams &) = 0;
 				virtual ble_error_t stopAdvertising(void) = 0;

libraries/ble/nRF51822/btle/btle.cpp

@@ -94,13 +94,13 @@ static void btle_handler(ble_evt_t * p_ble_evt)
   switch (p_ble_evt->header.evt_id)
   {
     case BLE_GAP_EVT_CONNECTED:
-      nRF51GattServer::getInstance().m_connectionHandle = p_ble_evt->evt.gap_evt.conn_handle;
+      nRF51Gap::getInstance().setConnectionHandle( p_ble_evt->evt.gap_evt.conn_handle );
       nRF51Gap::getInstance().handleEvent(GapEvents::GAP_EVENT_CONNECTED);
       break;
 
     case BLE_GAP_EVT_DISCONNECTED:
       // Since we are not in a connection and have not started advertising, store bonds
-      nRF51GattServer::getInstance().m_connectionHandle = BLE_CONN_HANDLE_INVALID;
+      nRF51Gap::getInstance().setConnectionHandle (BLE_CONN_HANDLE_INVALID);
       ASSERT_STATUS_RET_VOID ( ble_bondmngr_bonded_centrals_store() );
       nRF51Gap::getInstance().handleEvent(GapEvents::GAP_EVENT_DISCONNECTED);
       break;
@@ -117,7 +117,7 @@ static void btle_handler(ble_evt_t * p_ble_evt)
         sec_params.min_key_size = CFG_BLE_SEC_PARAM_MIN_KEY_SIZE    ;
         sec_params.max_key_size = CFG_BLE_SEC_PARAM_MAX_KEY_SIZE    ;
 
-        ASSERT_STATUS_RET_VOID ( sd_ble_gap_sec_params_reply(nRF51GattServer::getInstance().m_connectionHandle, BLE_GAP_SEC_STATUS_SUCCESS, &sec_params) );
+        ASSERT_STATUS_RET_VOID ( sd_ble_gap_sec_params_reply(nRF51Gap::getInstance().getConnectionHandle(), BLE_GAP_SEC_STATUS_SUCCESS, &sec_params) );
       }
       break;
 

libraries/ble/nRF51822/nRF51Gap.cpp

@@ -19,6 +19,7 @@
 
 #include "common/common.h"
 #include "ble_advdata.h"
+#include "ble_hci.h"
 
 /**************************************************************************/
 /*!
@@ -197,12 +198,12 @@ ble_error_t nRF51Gap::startAdvertising(GapAdvertisingParams & params)
 /**************************************************************************/
 ble_error_t nRF51Gap::stopAdvertising(void)
 {
-    /* Stop Advertising */
-    ASSERT( ERROR_NONE == sd_ble_gap_adv_stop(), BLE_ERROR_PARAM_OUT_OF_RANGE);
+  /* Stop Advertising */
+  ASSERT( ERROR_NONE == sd_ble_gap_adv_stop(), BLE_ERROR_PARAM_OUT_OF_RANGE);
 
 	state.advertising = 0;
 
-    return BLE_ERROR_NONE;
+  return BLE_ERROR_NONE;
 }
 
 /**************************************************************************/
@@ -223,11 +224,61 @@ ble_error_t nRF51Gap::stopAdvertising(void)
 /**************************************************************************/
 ble_error_t nRF51Gap::disconnect(void)
 {
-	/* Disconnect if we are connected to a central device */
-    // ASSERT( ERROR_NONE == sd_ble_gap_disconnect(), BLE_ERROR_PARAM_OUT_OF_RANGE);
-
 	state.advertising = 0;
-    state.connected = 0;
+  state.connected = 0;
 
-    return BLE_ERROR_NONE;
+	/* Disconnect if we are connected to a central device */
+  ASSERT_INT(ERROR_NONE, sd_ble_gap_disconnect(m_connectionHandle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION),
+  	         BLE_ERROR_PARAM_OUT_OF_RANGE);
+   
+  return BLE_ERROR_NONE;
+}
+
+/**************************************************************************/
+/*!
+    @brief  Sets the 16-bit connection handle
+*/
+/**************************************************************************/
+void nRF51Gap::setConnectionHandle(uint16_t con_handle)
+{
+  m_connectionHandle = con_handle;
+}
+ 
+/**************************************************************************/
+/*!
+    @brief  Gets the 16-bit connection handle
+*/
+/**************************************************************************/
+uint16_t nRF51Gap::getConnectionHandle(void)
+{
+  return m_connectionHandle;
+}
+ 
+/**************************************************************************/
+/*!
+    @brief      Sets the BLE device address
+            
+    @returns    ble_error_t
+
+    @section EXAMPLE
+
+    @code
+
+    uint8_t device_address[6] = { 0xca, 0xfe, 0xf0, 0xf0, 0xf0, 0xf0 };
+    nrf.getGap().setAddress(Gap::ADDR_TYPE_RANDOM_STATIC, device_address);
+
+    @endcode
+*/
+/**************************************************************************/
+ble_error_t nRF51Gap::setAddress(addr_type_t type, uint8_t address[6])
+{
+  if ( type > ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE) return BLE_ERROR_PARAM_OUT_OF_RANGE;
+ 
+  ble_gap_addr_t dev_addr;
+  dev_addr.addr_type = type;
+  memcpy(dev_addr.addr, address, 6);
+ 
+  ASSERT_INT(ERROR_NONE, sd_ble_gap_address_set(&dev_addr), BLE_ERROR_PARAM_OUT_OF_RANGE);
+ 
+  return BLE_ERROR_NONE;
 }

libraries/ble/nRF51822/nRF51Gap.h

@@ -19,6 +19,7 @@
 
 #include "mbed.h"
 #include "blecommon.h"
+#include "ble.h"
 #include "GapAdvertisingParams.h"
 #include "GapAdvertisingData.h"
 #include "hw/Gap.h"
@@ -39,13 +40,18 @@ class nRF51Gap : public Gap
         }
 
         /* Functions that must be implemented from Gap */
+        virtual ble_error_t setAddress(addr_type_t type, uint8_t address[6]);
         virtual ble_error_t setAdvertisingData(GapAdvertisingData &, GapAdvertisingData &);
         virtual ble_error_t startAdvertising(GapAdvertisingParams &);
         virtual ble_error_t stopAdvertising(void);
         virtual ble_error_t disconnect(void);
 
+        void     setConnectionHandle(uint16_t con_handle);
+        uint16_t getConnectionHandle(void);
+         
     private:
-        nRF51Gap() { };
+        uint16_t m_connectionHandle;
+        nRF51Gap() { m_connectionHandle = BLE_CONN_HANDLE_INVALID; };
         nRF51Gap(nRF51Gap const&);
         void operator=(nRF51Gap const&);
 };

libraries/ble/nRF51822/nRF51GattServer.cpp

@@ -20,6 +20,8 @@
 #include "common/common.h"
 #include "btle/custom/custom_helper.h"
 
+#include "nRF51Gap.h"
+
 /**************************************************************************/
 /*!
     @brief  Adds a new service to the GATT table on the peripheral
@@ -138,13 +140,16 @@ ble_error_t nRF51GattServer::readValue(uint16_t charHandle, uint8_t buffer[], ui
 /**************************************************************************/
 ble_error_t nRF51GattServer::updateValue(uint16_t charHandle, uint8_t buffer[], uint16_t len, bool localOnly)
 {
+  uint16_t gapConnectionHandle = nRF51Gap::getInstance().getConnectionHandle();
+  
   if (localOnly)
   {
     /* Only update locally regardless of notify/indicate */
     ASSERT_INT( ERROR_NONE, sd_ble_gatts_value_set(nrfCharacteristicHandles[charHandle].value_handle, 0, &len, buffer), BLE_ERROR_PARAM_OUT_OF_RANGE );
   }
+  
   if ((p_characteristics[charHandle]->properties & (GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_INDICATE | GattCharacteristic::BLE_GATT_CHAR_PROPERTIES_NOTIFY)) &&
-      (m_connectionHandle != BLE_CONN_HANDLE_INVALID) )
+      (gapConnectionHandle != BLE_CONN_HANDLE_INVALID) )
   {
     /* HVX update for the characteristic value */
     ble_gatts_hvx_params_t hvx_params;
@@ -155,7 +160,7 @@ ble_error_t nRF51GattServer::updateValue(uint16_t charHandle, uint8_t buffer[],
     hvx_params.p_data = buffer;
     hvx_params.p_len  = &len;
 
-    error_t error = (error_t) sd_ble_gatts_hvx(m_connectionHandle, &hvx_params);
+    error_t error = (error_t) sd_ble_gatts_hvx(gapConnectionHandle, &hvx_params);
 
     /* ERROR_INVALID_STATE, ERROR_BUSY, ERROR_GATTS_SYS_ATTR_MISSING and ERROR_NO_TX_BUFFERS the ATT table has been updated. */
     if ( (error != ERROR_NONE                      ) && (error != ERROR_INVALID_STATE) &&

libraries/ble/nRF51822/nRF51GattServer.h

@@ -49,13 +49,11 @@ class nRF51GattServer : public GattServer
         void eventCallback(void);
         void hwCallback(ble_evt_t * p_ble_evt);
 
-        uint16_t m_connectionHandle; // TODO move to private
-
     private:
         GattCharacteristic* p_characteristics[BLE_TOTAL_CHARACTERISTICS];
         ble_gatts_char_handles_t nrfCharacteristicHandles[BLE_TOTAL_CHARACTERISTICS];
 
-        nRF51GattServer() { serviceCount = 0; characteristicCount = 0; m_connectionHandle = BLE_CONN_HANDLE_INVALID; };
+        nRF51GattServer() { serviceCount = 0; characteristicCount = 0; };
 
         nRF51GattServer(nRF51GattServer const&);
         void operator=(nRF51GattServer const&);