Revision 293:5a1f577bf92f, committed 2016-09-15

Comitter:

Vincent Coubard

Date:

Thu Sep 15 10:52:00 2016 +0100

Branch:

8247cc25d48b37d6a78a3e91c728cbbf0fd9ba29

Parent:

292:6908f86aa1f9

Child:

294:fd19310b086d

Commit message:

Sync with 8247cc25d48b37d6a78a3e91c728cbbf0fd9ba29

2016-07-28 15:55:49+02:00: Andrea Palmieri
Update include

Signed-off-by: Andrea Palmieri <andrea.palmieri@st.com>

Changed in this revision

--- a/source/BlueNRGDevice.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/BlueNRGDevice.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -47,14 +47,14 @@
 #include "BlueNRGGattServer.h"
 
 #include "btle.h"
-#include "Utils.h"
-#include "osal.h"
+#include "ble_utils.h"
+#include "ble_osal.h"
 
-#include "debug.h"
+#include "ble_debug.h"
 #include "stm32_bluenrg_ble.h"
 
 extern "C" {
-    #include "hci.h"
+    #include "ble_hci.h"
     #include "bluenrg_utils.h"
 }
 

--- a/source/BlueNRGGap.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/BlueNRGGap.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -44,9 +44,9 @@
 #else
     #include "mbed.h"
 #endif 
-#include "Payload.h"
-#include "Utils.h"
-#include "debug.h"
+#include "ble_payload.h"
+#include "ble_utils.h"
+#include "ble_debug.h"
 
 /*
  * Utility to process GAP specific events (e.g., Advertising timeout)

--- a/source/BlueNRGGattClient.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/BlueNRGGattClient.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -43,8 +43,8 @@
     #include "mbed.h"
 #endif 
 #include "BlueNRGGap.h"
-#include "Utils.h"
-#include "debug.h"
+#include "ble_utils.h"
+#include "ble_debug.h"
 
 static uint8_t props_mask[] = {
   0x01,

--- a/source/BlueNRGGattServer.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/BlueNRGGattServer.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -43,8 +43,8 @@
     #include "mbed.h"
 #endif 
 #include "BlueNRGGap.h"
-#include "Utils.h"
-#include "debug.h"
+#include "ble_utils.h"
+#include "ble_debug.h"
 
 /**************************************************************************/
 /*!

--- a/source/platform/btle.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/platform/btle.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -40,7 +40,7 @@
 #include "BlueNRGGap.h"
 #include "BlueNRGGattServer.h"
 #include "BlueNRGGattClient.h"
-#include "Utils.h"
+#include "ble_utils.h"
 
 #include "x_nucleo_idb0xa1_targets.h"
 
@@ -52,19 +52,19 @@
 /* C File Includes ------------------------------------------------------------------*/
 #include <stdio.h>
 #include <string.h>
-#include "hci.h"
-#include "hci_const.h"
+#include "ble_hci.h"
+#include "ble_hci_const.h"
 #include "bluenrg_aci.h"
 #include "bluenrg_hal_aci.h"
 #include "bluenrg_gap.h"
 #include "bluenrg_utils.h"
 
-#include "hal_types.h"
-#include "hal.h"
-#include "gp_timer.h"
-#include "osal.h"
-#include "sm.h"
-#include "debug.h"
+#include "ble_hal_types.h"
+#include "ble_hal.h"
+#include "ble_gp_timer.h"
+#include "ble_osal.h"
+#include "ble_sm.h"
+#include "ble_debug.h"
 
 #ifdef __cplusplus
 }

--- a/source/platform/stm32_bluenrg_ble.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/platform/stm32_bluenrg_ble.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -52,8 +52,8 @@
 #endif
 
 #include "stm32_bluenrg_ble.h"
-#include "gp_timer.h"
-#include "debug.h"
+#include "ble_gp_timer.h"
+#include "ble_debug.h"
 
 	
 void BlueNRG_RST(void)

--- a/source/utils/ble_utils.cpp	Thu Sep 15 10:51:59 2016 +0100
+++ b/source/utils/ble_utils.cpp	Thu Sep 15 10:52:00 2016 +0100
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-#include "Utils.h"
+#include "ble_utils.h"
 
 /**************************************************************************/
 /*!
@@ -90,4 +90,4 @@
     }
 
     return ret;
-}
+}
\ No newline at end of file