Merge pull request arduino-libraries#18 from cparata/master

cparata · web-flow · commit d952a0f04dd2 · 2020-09-30T15:56:53.000+02:00
Add support to X-NUCLEO-IDB05A2
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # STM32duinoBLE
 
 This library is a fork of ArduinoBLE library to add the support of SPBTLE-RF and SPBTLE-1S BLE modules.
-It was successfully tested with the X-NUCLEO-IDB05A1 or X-NUCLEO-BNRG2A1 expansion board and a NUCLEO-F401RE
+It was successfully tested with the X-NUCLEO-IDB05A2 or X-NUCLEO-IDB05A1 or X-NUCLEO-BNRG2A1 expansion board and a NUCLEO-F401RE
 or NUCLEO-L476RG or NUCLEO-L053R8, with B-L475E-IOT01A and with STEVAL-MKSBOX1V1.
 In order to use this library with STEVAL-MKSBOX1V1, you need to update the firmware of the SPBTLE-1S BLE module
 mounted on that board as described in the following wiki page:
diff --git a/examples/Central/LedControl/LedControl.ino b/examples/Central/LedControl/LedControl.ino
@@ -29,11 +29,21 @@ HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000,
 BLELocalDevice BLE(&HCISpiTransport);
 const int buttonPin = PC13; // set buttonPin to digital pin PC13
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 const int buttonPin = PC13; // set buttonPin to digital pin PC13
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport);
+const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport);
+const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Central/PeripheralExplorer/PeripheralExplorer.ino b/examples/Central/PeripheralExplorer/PeripheralExplorer.ino
@@ -26,10 +26,18 @@ SPIClass SpiHCI(PC12, PC11, PC10);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Central/Scan/Scan.ino b/examples/Central/Scan/Scan.ino
@@ -23,10 +23,18 @@ SPIClass SpiHCI(PC12, PC11, PC10);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Central/ScanCallback/ScanCallback.ino b/examples/Central/ScanCallback/ScanCallback.ino
@@ -25,10 +25,18 @@ SPIClass SpiHCI(PC12, PC11, PC10);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Central/SensorTagButton/SensorTagButton.ino b/examples/Central/SensorTagButton/SensorTagButton.ino
@@ -27,10 +27,18 @@ SPIClass SpiHCI(PC12, PC11, PC10);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Peripheral/ButtonLED/ButtonLED.ino b/examples/Peripheral/ButtonLED/ButtonLED.ino
@@ -30,11 +30,21 @@ HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000,
 BLELocalDevice BLE(&HCISpiTransport);
 const int buttonPin = PC13; // set buttonPin to digital pin PC13
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 const int buttonPin = PC13; // set buttonPin to digital pin PC13
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport);
+const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport);
+const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Peripheral/CallbackLED/CallbackLED.ino b/examples/Peripheral/CallbackLED/CallbackLED.ino
@@ -28,10 +28,18 @@ SPIClass SpiHCI(PC12, PC11, PC10);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*SPIClass SpiHCI(D11, D12, D13);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/examples/Peripheral/LED/LED.ino b/examples/Peripheral/LED/LED.ino
@@ -26,10 +26,18 @@ SPIClass SpiHCI(PC12, PC11, PC10);
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
 #else
-/* Shield IDB05A1 with SPI clock on D3 */
+/* Shield IDB05A2 with SPI clock on D3 */
 SPIClass SpiHCI(D11, D12, D3);
-HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
 BLELocalDevice BLE(&HCISpiTransport);
+/* Shield IDB05A2 with SPI clock on D13 */
+/*#define SpiHCI SPI
+HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
+/* Shield IDB05A1 with SPI clock on D3 */
+/*SPIClass SpiHCI(D11, D12, D3);
+HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
+BLELocalDevice BLE(&HCISpiTransport); */
 /* Shield IDB05A1 with SPI clock on D13 */
 /*#define SpiHCI SPI
 HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
diff --git a/library.properties b/library.properties
@@ -1,8 +1,8 @@
 name=STM32duinoBLE
-version=1.2.1
+version=1.3.0
 author=Arduino, SRA
 maintainer=stm32duino
-sentence=Fork of ArduinoBLE library to add the support of SPBTLE-RF and SPBTLE-1S BLE modules.
+sentence=Fork of ArduinoBLE library to add the support of SPBTLE-RF, SPBTLE-1S, BLUENRG-M2SP and BLUENRG-M0 BLE modules.
 paragraph=This library supports creating a BLE peripheral and BLE central mode.
 category=Communication
 url=https://github.com/stm32duino/STM32duinoBLE
diff --git a/src/utility/HCISpiTransport.cpp b/src/utility/HCISpiTransport.cpp
@@ -66,7 +66,7 @@ int HCISpiTransportClass::begin()
   digitalWrite(_ble_rst, HIGH);
   delay(5);
 
-  if (_ble_chip == SPBTLE_RF)
+  if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0)
   {
     // Wait for Blue Initialize
     wait_for_blue_initialize();
@@ -102,7 +102,7 @@ void HCISpiTransportClass::wait(unsigned long timeout)
 
 int HCISpiTransportClass::available()
 {
-  if(_ble_chip != SPBTLE_RF && _ble_chip !=SPBTLE_1S && _ble_chip !=BLUENRG_M2SP)
+  if(_ble_chip != SPBTLE_RF && _ble_chip != SPBTLE_1S && _ble_chip != BLUENRG_M2SP && _ble_chip != BLUENRG_M0)
   {
     return 0;
   }
@@ -137,7 +137,7 @@ int HCISpiTransportClass::available()
       /* Write the header */
       _spi->transfer(header_master, 5);
 
-      if (_ble_chip == SPBTLE_RF)
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0)
       {
         /* device is ready */
         if(header_master[0] == 0x02) 
@@ -262,7 +262,7 @@ int HCISpiTransportClass::available()
 
     if(ble_reset)
     {
-      if (_ble_chip == SPBTLE_RF)
+      if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0)
       {
         /* BLE chip was reset: we need to enable LL_ONLY */
         enable_ll_only();
@@ -330,14 +330,14 @@ size_t HCISpiTransportClass::write(const uint8_t* data, size_t length)
   int result = 0;
   uint32_t tickstart = millis();
 
-  if(_ble_chip != SPBTLE_RF && _ble_chip !=SPBTLE_1S && _ble_chip !=BLUENRG_M2SP)
+  if(_ble_chip != SPBTLE_RF && _ble_chip != SPBTLE_1S && _ble_chip != BLUENRG_M2SP && _ble_chip != BLUENRG_M0)
   {
     return 0;
   }
 
   do
   {
-    if (_ble_chip == SPBTLE_RF)
+    if (_ble_chip == SPBTLE_RF || _ble_chip == BLUENRG_M0)
     {
       result = 0;
 
diff --git a/src/utility/HCISpiTransport.h b/src/utility/HCISpiTransport.h
@@ -26,7 +26,8 @@
 typedef enum BLEChip_s {
   SPBTLE_RF,
   SPBTLE_1S,
-  BLUENRG_M2SP
+  BLUENRG_M2SP,
+  BLUENRG_M0
 } BLEChip_t;
 
 #ifndef BLE_SPI_BYTE_ORDER

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ int HCISpiTransportClass::begin()`
`66`	`66`	`digitalWrite(_ble_rst, HIGH);`
`67`	`67`	`delay(5);`
`68`	`68`
`69`		`- if (_ble_chip == SPBTLE_RF)`
	`69`	`+ if (_ble_chip == SPBTLE_RF \|\| _ble_chip == BLUENRG_M0)`
`70`	`70`	`{`
`71`	`71`	`// Wait for Blue Initialize`
`72`	`72`	`wait_for_blue_initialize();`
`@@ -102,7 +102,7 @@ void HCISpiTransportClass::wait(unsigned long timeout)`
`102`	`102`
`103`	`103`	`int HCISpiTransportClass::available()`
`104`	`104`	`{`
`105`		`- if(_ble_chip != SPBTLE_RF && _ble_chip !=SPBTLE_1S && _ble_chip !=BLUENRG_M2SP)`
	`105`	`+ if(_ble_chip != SPBTLE_RF && _ble_chip != SPBTLE_1S && _ble_chip != BLUENRG_M2SP && _ble_chip != BLUENRG_M0)`
`106`	`106`	`{`
`107`	`107`	`return 0;`
`108`	`108`	`}`
`@@ -137,7 +137,7 @@ int HCISpiTransportClass::available()`
`137`	`137`	`/* Write the header */`
`138`	`138`	`_spi->transfer(header_master, 5);`
`139`	`139`
`140`		`- if (_ble_chip == SPBTLE_RF)`
	`140`	`+ if (_ble_chip == SPBTLE_RF \|\| _ble_chip == BLUENRG_M0)`
`141`	`141`	`{`
`142`	`142`	`/* device is ready */`
`143`	`143`	`if(header_master[0] == 0x02)`
`@@ -262,7 +262,7 @@ int HCISpiTransportClass::available()`
`262`	`262`
`263`	`263`	`if(ble_reset)`
`264`	`264`	`{`
`265`		`- if (_ble_chip == SPBTLE_RF)`
	`265`	`+ if (_ble_chip == SPBTLE_RF \|\| _ble_chip == BLUENRG_M0)`
`266`	`266`	`{`
`267`	`267`	`/* BLE chip was reset: we need to enable LL_ONLY */`
`268`	`268`	`enable_ll_only();`
`@@ -330,14 +330,14 @@ size_t HCISpiTransportClass::write(const uint8_t* data, size_t length)`
`330`	`330`	`int result = 0;`
`331`	`331`	`uint32_t tickstart = millis();`
`332`	`332`
`333`		`- if(_ble_chip != SPBTLE_RF && _ble_chip !=SPBTLE_1S && _ble_chip !=BLUENRG_M2SP)`
	`333`	`+ if(_ble_chip != SPBTLE_RF && _ble_chip != SPBTLE_1S && _ble_chip != BLUENRG_M2SP && _ble_chip != BLUENRG_M0)`
`334`	`334`	`{`
`335`	`335`	`return 0;`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`do`
`339`	`339`	`{`
`340`		`- if (_ble_chip == SPBTLE_RF)`
	`340`	`+ if (_ble_chip == SPBTLE_RF \|\| _ble_chip == BLUENRG_M0)`
`341`	`341`	`{`
`342`	`342`	`result = 0;`
`343`	`343`