Merge branch latest 'master' into dev_target_k64f

Conflicts:
	libraries/rtos/rtx/RTX_Conf_CM.c
	workspace_tools/build_api.py

Author: 0xc0170

libraries/USBDevice/USBHID/USBHID.cpp

@@ -59,6 +59,9 @@ bool USBHID::readNB(HID_REPORT *report)
     uint32_t bytesRead = 0;
     bool result;
     result = USBDevice::readEP_NB(EPINT_OUT, report->data, &bytesRead, MAX_HID_REPORT_SIZE);
+    // if readEP_NB did not succeed, does not issue a readStart
+    if (!result)
+        return false;
     report->length = bytesRead;
     if(!readStart(EPINT_OUT, MAX_HID_REPORT_SIZE))
         return false;

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GapAdvertisingData.cpp renamed to libraries/ble/ble-api/GapAdvertisingData.cpp

@@ -38,7 +38,7 @@ class GattServer
         /* These functions must be defined in the sub-class */
         virtual ble_error_t addService(GattService &) = 0;
         virtual ble_error_t readValue(uint16_t, uint8_t[], uint16_t) = 0;
-        virtual ble_error_t updateValue(uint16_t, uint8_t[], uint16_t) = 0;
+        virtual ble_error_t updateValue(uint16_t, uint8_t[], uint16_t, bool localOnly = false) = 0;
 
         // ToDo: For updateValue, check the CCCD to see if the value we are
         // updating has the notify or indicate bits sent, and if BOTH are set

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GapAdvertisingData.h renamed to libraries/ble/ble-api/GapAdvertisingData.h

@@ -33,8 +33,8 @@
 #include "pstorage.h"
 
 #include "hw/GapEvents.h"
-#include "hw/nRF51822n/nRF51Gap.h"
-#include "hw/nRF51822n/nRF51GattServer.h"
+#include "nRF51Gap.h"
+#include "nRF51GattServer.h"
 
 static void service_error_callback(uint32_t nrf_error);
 void        assert_nrf_callback(uint16_t line_num, const uint8_t * p_file_name);

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GapAdvertisingParams.cpp renamed to libraries/ble/ble-api/GapAdvertisingParams.cpp

@@ -25,8 +25,8 @@
 #include "mbed.h"
 #include "blecommon.h"
 #include "hw/BLEDevice.h"
-#include "hw/nRF51822n/nRF51Gap.h"
-#include "hw/nRF51822n/nRF51GattServer.h"
+#include "nRF51Gap.h"
+#include "nRF51GattServer.h"
 
 /**************************************************************************/
 /*!

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GapAdvertisingParams.h renamed to libraries/ble/ble-api/GapAdvertisingParams.h

@@ -162,7 +162,7 @@ ble_error_t nRF51Gap::startAdvertising(GapAdvertisingParams & params)
         return BLE_ERROR_PARAM_OUT_OF_RANGE;
     }
 
-    /* ToDo: Start Advertising */
+    /* Start Advertising */
     ble_gap_adv_params_t adv_para = { 0 };
 
     adv_para.type        = params.getAdvertisingType() ;
@@ -174,7 +174,7 @@ ble_error_t nRF51Gap::startAdvertising(GapAdvertisingParams & params)
 
     ASSERT( ERROR_NONE == sd_ble_gap_adv_start(&adv_para), BLE_ERROR_PARAM_OUT_OF_RANGE);
 
-		state.advertising = 1;
+	state.advertising = 1;
 
     return BLE_ERROR_NONE;
 }
@@ -197,12 +197,10 @@ ble_error_t nRF51Gap::startAdvertising(GapAdvertisingParams & params)
 /**************************************************************************/
 ble_error_t nRF51Gap::stopAdvertising(void)
 {
-    /* ToDo: Stop Advertising */
+    /* Stop Advertising */
+    ASSERT( ERROR_NONE == sd_ble_gap_adv_stop(), BLE_ERROR_PARAM_OUT_OF_RANGE);
 
-    /* ToDo: Check response */
-    wait(0.1);
-	
-	  state.advertising = 0;
+	state.advertising = 0;
 
     return BLE_ERROR_NONE;
 }
@@ -225,10 +223,11 @@ ble_error_t nRF51Gap::stopAdvertising(void)
 /**************************************************************************/
 ble_error_t nRF51Gap::disconnect(void)
 {
-	/* ToDo: Disconnect if we are connected to a central device */
-	
-	  state.advertising = 0;
-	  state.connected = 0;
+	/* 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;
 
     return BLE_ERROR_NONE;
 }

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GattCharacteristic.cpp renamed to libraries/ble/ble-api/GattCharacteristic.cpp

@@ -136,8 +136,13 @@ ble_error_t nRF51GattServer::readValue(uint16_t charHandle, uint8_t buffer[], ui
     @endcode
 */
 /**************************************************************************/
-ble_error_t nRF51GattServer::updateValue(uint16_t charHandle, uint8_t buffer[], uint16_t len)
+ble_error_t nRF51GattServer::updateValue(uint16_t charHandle, uint8_t buffer[], uint16_t len, bool localOnly)
 {
+  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) )
   {

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GattCharacteristic.h renamed to libraries/ble/ble-api/GattCharacteristic.h

@@ -43,7 +43,7 @@ class nRF51GattServer : public GattServer
         /* Functions that must be implemented from GattServer */
         virtual ble_error_t addService(GattService &);
         virtual ble_error_t readValue(uint16_t, uint8_t[], uint16_t);
-        virtual ble_error_t updateValue(uint16_t, uint8_t[], uint16_t);
+        virtual ble_error_t updateValue(uint16_t, uint8_t[], uint16_t, bool localOnly = false);
 
         /* nRF51 Functions */
         void eventCallback(void);

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GattService.cpp renamed to libraries/ble/ble-api/GattService.cpp

@@ -0,0 +1,26 @@
+/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+#ifndef _NORDIC_GLOBAL_H_
+#define _NORDIC_GLOBAL_H_
+
+/* There are no global defines in mbed, so we need to define */
+/* mandatory conditional compilation flags here              */
+#define NRF51
+#define DEBUG_NRF_USER
+#define BLE_STACK_SUPPORT_REQD
+#define BOARD_PCA10001
+
+#endif

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/GattService.h renamed to libraries/ble/ble-api/GattService.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Nordic Semiconductor. All Rights Reserved.
+/* Copyright (c)  2013 Nordic Semiconductor. All Rights Reserved.
  *
  * The information contained herein is property of Nordic Semiconductor ASA.
  * Terms and conditions of usage are described in detail in NORDIC

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/UUID.cpp renamed to libraries/ble/ble-api/UUID.cpp

@@ -53,14 +53,16 @@
  * #endcode
  */
 
-#include <stdlib.h>
-#include "device.h"
+#include "toolchain.h"
 
-#if DEVICE_STDIO_MESSAGES
-    #include <stdio.h>
-    #define error(...) (fprintf(stderr, __VA_ARGS__), exit(1))
-#else
-    #define error(...) (exit(1))
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void error(const char* format, ...);
+
+#ifdef __cplusplus
+}
 #endif
 
 #endif

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/UUID.h renamed to libraries/ble/ble-api/UUID.h

@@ -16,7 +16,7 @@
 #ifndef MBED_H
 #define MBED_H
 
-#define MBED_LIBRARY_VERSION 80
+#define MBED_LIBRARY_VERSION 81
 
 #include "platform.h"
 

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/blecommon.h renamed to libraries/ble/ble-api/blecommon.h

@@ -19,11 +19,11 @@
 
 WEAK void mbed_die(void);
 WEAK void mbed_die(void) {
+#ifndef NRF51_H
 	__disable_irq();	// dont allow interrupts to disturb the flash pattern
-
+#endif
 #if   (DEVICE_ERROR_RED == 1)
     gpio_t led_red; gpio_init_out(&led_red, LED_RED);
-    
 #elif (DEVICE_ERROR_PATTERN == 1)
     gpio_t led_1; gpio_init_out(&led_1, LED1);
     gpio_t led_2; gpio_init_out(&led_2, LED2);

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/hw/BLEDevice.h renamed to libraries/ble/ble-api/hw/BLEDevice.h

@@ -0,0 +1,33 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include <stdlib.h>
+#include <stdarg.h>
+#include "device.h"
+#include "toolchain.h"
+#if DEVICE_STDIO_MESSAGES
+#include <stdio.h>
+#endif
+
+WEAK void error(const char* format, ...);
+WEAK void error(const char* format, ...) {
+#if DEVICE_STDIO_MESSAGES
+    va_list arg;
+    va_start(arg, format);
+    vfprintf(stderr, format, arg);
+    va_end(arg);
+#endif
+    exit(1);
+}

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/hw/Gap.h renamed to libraries/ble/ble-api/hw/Gap.h

@@ -17,9 +17,9 @@
 
 static inline void _gpio_init_in(gpio_t* gpio, PinName pin, PinMode mode)
 {
-    gpio_init(gpio, pin);
-    gpio_mode(gpio, mode);
+    gpio_init(gpio, pin);    
     gpio_dir(gpio, PIN_INPUT);
+    gpio_mode(gpio, mode);
 }
 
 static inline void _gpio_init_out(gpio_t* gpio, PinName pin, PinMode mode, int value)

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/hw/GapEvents.h renamed to libraries/ble/ble-api/hw/GapEvents.h

@@ -43,25 +43,12 @@ void SystemCoreClockUpdate(void)
 }
 
 void SystemInit(void)
-{   
-    NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos);
-    while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-    }
-    //write FWID (NRF_UICR->FWID is readonly)
-    *(uint32_t *)0x10001010 = 0xFFFF0049;
-
-    while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-    }
-
-    NRF_NVMC->CONFIG = (NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos);
-    while (NRF_NVMC->READY == NVMC_READY_READY_Busy){
-    }
+{     
     // Prepare the peripherals for use as indicated by the PAN 26 "System: Manual setup is required
     // to enable the use of peripherals" found at Product Anomaly document for your device found at
     // https://www.nordicsemi.com/. The side effect of executing these instructions in the devices 
     // that do not need it is that the new peripherals in the second generation devices (LPCOMP for
     // example) will not be available.
-    
     if (is_manual_peripheral_setup_needed()){
         *(uint32_t volatile *)0x40000504 = 0xC007FFDF;
         *(uint32_t volatile *)0x40006C18 = 0x00008000;

libraries/tests/nordic/BLE_Health_Thermometer_full/BLE_API_Native/hw/GattServer.h renamed to libraries/ble/ble-api/hw/GattServer.h

@@ -100,13 +100,23 @@
 //   </h>
 // </e>
 */
-#define CLOCK_SETUP           1
-#define SYSOSCCTRL_Val        0x00000000              // Reset: 0x000
-#define WDTOSCCTRL_Val        0x00000000              // Reset: 0x000
-#define SYSPLLCTRL_Val        0x00000041              // Reset: 0x000
-#define SYSPLLCLKSEL_Val      0x00000000              // Reset: 0x000
-#define MAINCLKSEL_Val        0x00000000              // Reset: 0x000
-#define SYSAHBCLKDIV_Val      0x00000001              // Reset: 0x001
+#define CLOCK_SETUP     1	// 1 == IRC: 2 == System Oscillator 12Mhz Xtal:
+
+#if (CLOCK_SETUP == 1)
+	#define SYSOSCCTRL_Val        0x00000000              // Reset: 0x000
+	#define WDTOSCCTRL_Val        0x00000000              // Reset: 0x000
+	#define SYSPLLCTRL_Val        0x00000041              // Reset: 0x000
+	#define SYSPLLCLKSEL_Val      0x00000000              // Reset: 0x000
+	#define MAINCLKSEL_Val        0x00000000              // Reset: 0x000
+	#define SYSAHBCLKDIV_Val      0x00000001              // Reset: 0x001
+#elif (CLOCK_SETUP == 2)         
+	#define SYSOSCCTRL_Val        0x00000000              // Reset: 0x000
+	#define WDTOSCCTRL_Val        0x00000000              // Reset: 0x000
+	#define SYSPLLCTRL_Val        0x00000040              // Reset: 0x000
+	#define SYSPLLCLKSEL_Val      0x00000001              // Reset: 0x000
+	#define MAINCLKSEL_Val        0x00000003              // Reset: 0x000
+	#define SYSAHBCLKDIV_Val      0x00000001              // Reset: 0x001
+#endif
 
 /*
 //-------- <<< end of configuration section >>> ------------------------------