Revision 139:3a75965fd389, committed 2015-10-08

Comitter:

Wolfgang Betz

Date:

Thu Oct 08 08:47:20 2015 +0200

Parent:

138:32e3c4ca7a45

Child:

140:0cd922dca83c

Commit message:

Manually merge modifications as suggested from Rohit & Andrea in Andrea's mail of 10/07/2015 04:20 PM

From: Andrea PALMIERI <andrea.palmieri@st.com>
To: Rohit Grover <rohit.grover@arm.com>, Wolfgang BETZ <wolfgang.betz@st.com>,
Antonio VILEI <antonio.vilei@st.com>, Mihail Stoyanov
<Mihail.Stoyanov@arm.com>
CC: Nicola CAPOVILLA <nicola.capovilla@st.com>, Silvio Lucio OLIVA
<silvio.oliva@st.com>, "jonathan.austin@arm.com" <jonathan.austin@arm.com>
Content-Class: urn:content-classes:message
Date: Wed, 7 Oct 2015 16:20:29 +0200
Subject: RE: Arduino Compatibility of X-NUCLEO-IDB04A1

Changed in this revision

--- a/module.json	Thu Oct 08 07:29:43 2015 +0200
+++ b/module.json	Thu Oct 08 08:47:20 2015 +0200
@@ -1,12 +1,12 @@
 {
   "name": "x-nucleo-idb0xa1",
-  "version": "0.0.0",
-  "description": "BLE_API wrapper library for STMicroelectronics' BlueNRG Bluetooth Low Energy expansion board shield (Component) for MbedOS",
+  "version": "0.0.1",
+  "description": "ST driver for the mbed BLE API.",
   "keywords": [
-    "BLE",
-    "X-NUCLEO-IDB0XA1"
+    "Bluetooth",
+    "BLE"
   ],
-  "author": "wolfgang.betz@st.com",
+  "author": "Andrea Palmieri",
   "repository": {
     "url": "ssh://gitolite@codex.cro.st.com/x-nucleodev/x-nucleo-idb0xa1-mbedos.git",
     "type": "git"
@@ -25,7 +25,6 @@
     "x-nucleo-idb0xa1/bluenrg-hci"
   ],
   "dependencies": {
-    "ble": "*",
-    "core-util": "~0.2.0"
+    "ble": "*"
   }
 }

--- a/source/BlueNRGDevice.cpp	Thu Oct 08 07:29:43 2015 +0200
+++ b/source/BlueNRGDevice.cpp	Thu Oct 08 08:47:20 2015 +0200
@@ -166,7 +166,8 @@
     return BLE_ERROR_NONE;
 }
 
-
+// ANDREA: mbedOS
+// betzw: really?
 /*!
   @brief  Wait for any BLE Event like BLE Connection, Read Request etc.    
   @param[in] void
@@ -189,8 +190,7 @@
 				       that conrol is given back to main loop before next WFE */
 	} while(true);
 
-}
- 
+} 
  
 /*!
     @brief  get GAP version

--- a/source/platform/btle.cpp	Thu Oct 08 07:29:43 2015 +0200
+++ b/source/platform/btle.cpp	Thu Oct 08 08:47:20 2015 +0200
@@ -368,7 +368,7 @@
                                 role = Gap::PERIPHERAL;
                                 break;
 			default:
-				role = Gap::CENTRAL;
+                                role = Gap::PERIPHERAL;
 				break;
                         }
                         //PRINTF("EVT_LE_CONN_COMPLETE GAP role=%d\n", role);

--- a/source/platform/stm32_bluenrg_ble.cpp	Thu Oct 08 07:29:43 2015 +0200
+++ b/source/platform/stm32_bluenrg_ble.cpp	Thu Oct 08 08:47:20 2015 +0200
@@ -38,7 +38,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "BlueNRGGap.h"
 #include "BlueNRGDevice.h"
-#include "Utils.h"
+//#include "Utils.h"
 #include "btle.h"
 
 // FIXME: find a better way to get the instance of the BlueNRG device
@@ -166,16 +166,6 @@
     bluenrgDeviceInstance.enable_irq();
 }
 
-/**
- * @brief  Disable SPI IRQ.
- * @param  None
- * @retval None
- */
-void Disable_SPI_IRQ(void)
-{ 
-    bluenrgDeviceInstance.disable_irq();
-}
-
 #ifdef AST_FOR_MBED_OS
 /**
  * Call BTLE callback handler.
@@ -192,6 +182,16 @@
 #endif
 
 /**
+ * @brief  Disable SPI IRQ.
+ * @param  None
+ * @retval None
+ */
+void Disable_SPI_IRQ(void)
+{ 
+    bluenrgDeviceInstance.disable_irq();
+}
+
+/**
  * @brief  Clear Pending SPI IRQ.
  * @param  None
  * @retval None