Skip to content

Commit 4867274

Browse files
cparatacparata
authored
Merge pull request stm32duino#24 from cparata/master
Sync with official ArduinoBLE repo
2 parents 60d2609 + fc7162e commit 4867274

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+21412
-444
lines changed

‎.github/workflows/spell-check.yml‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
name: Spell Check
2+
23
on: [push, pull_request]
4+
35
jobs:
4-
build:
5-
runs-on: ubuntu-latest
6-
7-
steps:
8-
- uses: actions/checkout@v1
9-
with:
10-
fetch-depth: 1
11-
- uses: arduino/actions/libraries/spell-check@master
6+
build:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- name: Checkout
11+
uses: actions/checkout@v2
12+
13+
- name: Spell check
14+
uses: arduino/actions/libraries/spell-check@master
15+
with:
16+
skip-paths: ./extras/test

‎examples/Central/LedControl/LedControl.ino‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,49 +20,76 @@
2020
/* STEVAL-MKSBOX1V1 */
2121
SPIClass SpiHCI(PC3, PD3, PD1);
2222
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1);
23-
BLELocalDevice BLE(&HCISpiTransport);
23+
#if !defined(FAKE_BLELOCALDEVICE)
24+
BLELocalDevice BLEObj(&HCISpiTransport);
25+
BLELocalDevice& BLE = BLEObj;
26+
#endif
2427
const int buttonPin = PG1; // set buttonPin to digital pin PG1
2528
#elif defined(ARDUINO_DISCO_L475VG_IOT) || defined(ARDUINO_B_L4S5I_IOT01A)
2629
/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */
2730
SPIClass SpiHCI(PC12, PC11, PC10);
2831
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
29-
BLELocalDevice BLE(&HCISpiTransport);
32+
#if !defined(FAKE_BLELOCALDEVICE)
33+
BLELocalDevice BLEObj(&HCISpiTransport);
34+
BLELocalDevice& BLE = BLEObj;
35+
#endif
3036
const int buttonPin = PC13; // set buttonPin to digital pin PC13
3137
#elif defined(ARDUINO_PNUCLEO_WB55RG)
3238
/* PNUCLEO_WB55RG */
3339
HCISharedMemTransportClass HCISharedMemTransport;
34-
BLELocalDevice BLE(&HCISharedMemTransport);
40+
#if !defined(FAKE_BLELOCALDEVICE)
41+
BLELocalDevice BLEObj(&HCISharedMemTransport);
42+
BLELocalDevice& BLE = BLEObj;
43+
#endif
3544
const int buttonPin = PC4; // set buttonPin to digital pin PC4
3645
#else
3746
/* Shield IDB05A2 with SPI clock on D3 */
3847
SPIClass SpiHCI(D11, D12, D3);
3948
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
40-
BLELocalDevice BLE(&HCISpiTransport);
49+
#if !defined(FAKE_BLELOCALDEVICE)
50+
BLELocalDevice BLEObj(&HCISpiTransport);
51+
BLELocalDevice& BLE = BLEObj;
52+
#endif
4153
const int buttonPin = PC13; // set buttonPin to digital pin PC13
4254
/* Shield IDB05A2 with SPI clock on D13 */
4355
/*#define SpiHCI SPI
4456
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
45-
BLELocalDevice BLE(&HCISpiTransport);
57+
#if !defined(FAKE_BLELOCALDEVICE)
58+
BLELocalDevice BLEObj(&HCISpiTransport);
59+
BLELocalDevice& BLE = BLEObj;
60+
#endif
4661
const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
4762
/* Shield IDB05A1 with SPI clock on D3 */
4863
/*SPIClass SpiHCI(D11, D12, D3);
4964
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
50-
BLELocalDevice BLE(&HCISpiTransport);
65+
#if !defined(FAKE_BLELOCALDEVICE)
66+
BLELocalDevice BLEObj(&HCISpiTransport);
67+
BLELocalDevice& BLE = BLEObj;
68+
#endif
5169
const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
5270
/* Shield IDB05A1 with SPI clock on D13 */
5371
/*#define SpiHCI SPI
5472
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
55-
BLELocalDevice BLE(&HCISpiTransport);
73+
#if !defined(FAKE_BLELOCALDEVICE)
74+
BLELocalDevice BLEObj(&HCISpiTransport);
75+
BLELocalDevice& BLE = BLEObj;
76+
#endif
5677
const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
5778
/* Shield BNRG2A1 with SPI clock on D3 */
5879
/*SPIClass SpiHCI(D11, D12, D3);
5980
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
60-
BLELocalDevice BLE(&HCISpiTransport);
81+
#if !defined(FAKE_BLELOCALDEVICE)
82+
BLELocalDevice BLEObj(&HCISpiTransport);
83+
BLELocalDevice& BLE = BLEObj;
84+
#endif
6185
const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
6286
/* Shield BNRG2A1 with SPI clock on D13 */
6387
/*#define SpiHCI SPI
6488
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
65-
BLELocalDevice BLE(&HCISpiTransport);
89+
#if !defined(FAKE_BLELOCALDEVICE)
90+
BLELocalDevice BLEObj(&HCISpiTransport);
91+
BLELocalDevice& BLE = BLEObj;
92+
#endif
6693
const int buttonPin = PC13; // set buttonPin to digital pin PC13 */
6794
#endif
6895

‎examples/Central/PeripheralExplorer/PeripheralExplorer.ino‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,68 @@
1919
/* STEVAL-MKSBOX1V1 */
2020
SPIClass SpiHCI(PC3, PD3, PD1);
2121
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1);
22-
BLELocalDevice BLE(&HCISpiTransport);
22+
#if !defined(FAKE_BLELOCALDEVICE)
23+
BLELocalDevice BLEObj(&HCISpiTransport);
24+
BLELocalDevice& BLE = BLEObj;
25+
#endif
2326
#elif defined(ARDUINO_DISCO_L475VG_IOT) || defined(ARDUINO_B_L4S5I_IOT01A)
2427
/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */
2528
SPIClass SpiHCI(PC12, PC11, PC10);
2629
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
27-
BLELocalDevice BLE(&HCISpiTransport);
30+
#if !defined(FAKE_BLELOCALDEVICE)
31+
BLELocalDevice BLEObj(&HCISpiTransport);
32+
BLELocalDevice& BLE = BLEObj;
33+
#endif
2834
#elif defined(ARDUINO_PNUCLEO_WB55RG)
2935
/* PNUCLEO_WB55RG */
3036
HCISharedMemTransportClass HCISharedMemTransport;
31-
BLELocalDevice BLE(&HCISharedMemTransport);
37+
#if !defined(FAKE_BLELOCALDEVICE)
38+
BLELocalDevice BLEObj(&HCISharedMemTransport);
39+
BLELocalDevice& BLE = BLEObj;
40+
#endif
3241
#else
3342
/* Shield IDB05A2 with SPI clock on D3 */
3443
SPIClass SpiHCI(D11, D12, D3);
3544
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
36-
BLELocalDevice BLE(&HCISpiTransport);
45+
#if !defined(FAKE_BLELOCALDEVICE)
46+
BLELocalDevice BLEObj(&HCISpiTransport);
47+
BLELocalDevice& BLE = BLEObj;
48+
#endif
3749
/* Shield IDB05A2 with SPI clock on D13 */
3850
/*#define SpiHCI SPI
3951
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
40-
BLELocalDevice BLE(&HCISpiTransport); */
52+
#if !defined(FAKE_BLELOCALDEVICE)
53+
BLELocalDevice BLEObj(&HCISpiTransport);
54+
BLELocalDevice& BLE = BLEObj;
55+
#endif */
4156
/* Shield IDB05A1 with SPI clock on D3 */
4257
/*SPIClass SpiHCI(D11, D12, D3);
4358
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
44-
BLELocalDevice BLE(&HCISpiTransport); */
59+
#if !defined(FAKE_BLELOCALDEVICE)
60+
BLELocalDevice BLEObj(&HCISpiTransport);
61+
BLELocalDevice& BLE = BLEObj;
62+
#endif */
4563
/* Shield IDB05A1 with SPI clock on D13 */
4664
/*#define SpiHCI SPI
4765
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
48-
BLELocalDevice BLE(&HCISpiTransport); */
66+
#if !defined(FAKE_BLELOCALDEVICE)
67+
BLELocalDevice BLEObj(&HCISpiTransport);
68+
BLELocalDevice& BLE = BLEObj;
69+
#endif */
4970
/* Shield BNRG2A1 with SPI clock on D3 */
5071
/*SPIClass SpiHCI(D11, D12, D3);
5172
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
52-
BLELocalDevice BLE(&HCISpiTransport); */
73+
#if !defined(FAKE_BLELOCALDEVICE)
74+
BLELocalDevice BLEObj(&HCISpiTransport);
75+
BLELocalDevice& BLE = BLEObj;
76+
#endif */
5377
/* Shield BNRG2A1 with SPI clock on D13 */
5478
/*#define SpiHCI SPI
5579
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
56-
BLELocalDevice BLE(&HCISpiTransport); */
80+
#if !defined(FAKE_BLELOCALDEVICE)
81+
BLELocalDevice BLEObj(&HCISpiTransport);
82+
BLELocalDevice& BLE = BLEObj;
83+
#endif */
5784
#endif
5885

5986
void setup() {

‎examples/Central/Scan/Scan.ino‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,41 +16,68 @@
1616
/* STEVAL-MKSBOX1V1 */
1717
SPIClass SpiHCI(PC3, PD3, PD1);
1818
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1);
19-
BLELocalDevice BLE(&HCISpiTransport);
19+
#if !defined(FAKE_BLELOCALDEVICE)
20+
BLELocalDevice BLEObj(&HCISpiTransport);
21+
BLELocalDevice& BLE = BLEObj;
22+
#endif
2023
#elif defined(ARDUINO_DISCO_L475VG_IOT) || defined(ARDUINO_B_L4S5I_IOT01A)
2124
/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */
2225
SPIClass SpiHCI(PC12, PC11, PC10);
2326
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
24-
BLELocalDevice BLE(&HCISpiTransport);
27+
#if !defined(FAKE_BLELOCALDEVICE)
28+
BLELocalDevice BLEObj(&HCISpiTransport);
29+
BLELocalDevice& BLE = BLEObj;
30+
#endif
2531
#elif defined(ARDUINO_PNUCLEO_WB55RG)
2632
/* PNUCLEO_WB55RG */
2733
HCISharedMemTransportClass HCISharedMemTransport;
28-
BLELocalDevice BLE(&HCISharedMemTransport);
34+
#if !defined(FAKE_BLELOCALDEVICE)
35+
BLELocalDevice BLEObj(&HCISharedMemTransport);
36+
BLELocalDevice& BLE = BLEObj;
37+
#endif
2938
#else
3039
/* Shield IDB05A2 with SPI clock on D3 */
3140
SPIClass SpiHCI(D11, D12, D3);
3241
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
33-
BLELocalDevice BLE(&HCISpiTransport);
42+
#if !defined(FAKE_BLELOCALDEVICE)
43+
BLELocalDevice BLEObj(&HCISpiTransport);
44+
BLELocalDevice& BLE = BLEObj;
45+
#endif
3446
/* Shield IDB05A2 with SPI clock on D13 */
3547
/*#define SpiHCI SPI
3648
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
37-
BLELocalDevice BLE(&HCISpiTransport); */
49+
#if !defined(FAKE_BLELOCALDEVICE)
50+
BLELocalDevice BLEObj(&HCISpiTransport);
51+
BLELocalDevice& BLE = BLEObj;
52+
#endif */
3853
/* Shield IDB05A1 with SPI clock on D3 */
3954
/*SPIClass SpiHCI(D11, D12, D3);
4055
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
41-
BLELocalDevice BLE(&HCISpiTransport); */
56+
#if !defined(FAKE_BLELOCALDEVICE)
57+
BLELocalDevice BLEObj(&HCISpiTransport);
58+
BLELocalDevice& BLE = BLEObj;
59+
#endif */
4260
/* Shield IDB05A1 with SPI clock on D13 */
4361
/*#define SpiHCI SPI
4462
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
45-
BLELocalDevice BLE(&HCISpiTransport); */
63+
#if !defined(FAKE_BLELOCALDEVICE)
64+
BLELocalDevice BLEObj(&HCISpiTransport);
65+
BLELocalDevice& BLE = BLEObj;
66+
#endif */
4667
/* Shield BNRG2A1 with SPI clock on D3 */
4768
/*SPIClass SpiHCI(D11, D12, D3);
4869
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
49-
BLELocalDevice BLE(&HCISpiTransport); */
70+
#if !defined(FAKE_BLELOCALDEVICE)
71+
BLELocalDevice BLEObj(&HCISpiTransport);
72+
BLELocalDevice& BLE = BLEObj;
73+
#endif */
5074
/* Shield BNRG2A1 with SPI clock on D13 */
5175
/*#define SpiHCI SPI
5276
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
53-
BLELocalDevice BLE(&HCISpiTransport); */
77+
#if !defined(FAKE_BLELOCALDEVICE)
78+
BLELocalDevice BLEObj(&HCISpiTransport);
79+
BLELocalDevice& BLE = BLEObj;
80+
#endif */
5481
#endif
5582

5683
void setup() {

‎examples/Central/ScanCallback/ScanCallback.ino‎

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,41 +18,68 @@
1818
/* STEVAL-MKSBOX1V1 */
1919
SPIClass SpiHCI(PC3, PD3, PD1);
2020
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_1S, PD0, PD4, PA8, 1000000, SPI_MODE1);
21-
BLELocalDevice BLE(&HCISpiTransport);
21+
#if !defined(FAKE_BLELOCALDEVICE)
22+
BLELocalDevice BLEObj(&HCISpiTransport);
23+
BLELocalDevice& BLE = BLEObj;
24+
#endif
2225
#elif defined(ARDUINO_DISCO_L475VG_IOT) || defined(ARDUINO_B_L4S5I_IOT01A)
2326
/* B-L475E-IOT01A1 or B_L4S5I_IOT01A */
2427
SPIClass SpiHCI(PC12, PC11, PC10);
2528
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, PD13, PE6, PA8, 8000000, SPI_MODE0);
26-
BLELocalDevice BLE(&HCISpiTransport);
29+
#if !defined(FAKE_BLELOCALDEVICE)
30+
BLELocalDevice BLEObj(&HCISpiTransport);
31+
BLELocalDevice& BLE = BLEObj;
32+
#endif
2733
#elif defined(ARDUINO_PNUCLEO_WB55RG)
2834
/* PNUCLEO_WB55RG */
2935
HCISharedMemTransportClass HCISharedMemTransport;
30-
BLELocalDevice BLE(&HCISharedMemTransport);
36+
#if !defined(FAKE_BLELOCALDEVICE)
37+
BLELocalDevice BLEObj(&HCISharedMemTransport);
38+
BLELocalDevice& BLE = BLEObj;
39+
#endif
3140
#else
3241
/* Shield IDB05A2 with SPI clock on D3 */
3342
SPIClass SpiHCI(D11, D12, D3);
3443
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
35-
BLELocalDevice BLE(&HCISpiTransport);
44+
#if !defined(FAKE_BLELOCALDEVICE)
45+
BLELocalDevice BLEObj(&HCISpiTransport);
46+
BLELocalDevice& BLE = BLEObj;
47+
#endif
3648
/* Shield IDB05A2 with SPI clock on D13 */
3749
/*#define SpiHCI SPI
3850
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M0, A1, A0, D7, 8000000, SPI_MODE0);
39-
BLELocalDevice BLE(&HCISpiTransport); */
51+
#if !defined(FAKE_BLELOCALDEVICE)
52+
BLELocalDevice BLEObj(&HCISpiTransport);
53+
BLELocalDevice& BLE = BLEObj;
54+
#endif */
4055
/* Shield IDB05A1 with SPI clock on D3 */
4156
/*SPIClass SpiHCI(D11, D12, D3);
4257
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
43-
BLELocalDevice BLE(&HCISpiTransport); */
58+
#if !defined(FAKE_BLELOCALDEVICE)
59+
BLELocalDevice BLEObj(&HCISpiTransport);
60+
BLELocalDevice& BLE = BLEObj;
61+
#endif */
4462
/* Shield IDB05A1 with SPI clock on D13 */
4563
/*#define SpiHCI SPI
4664
HCISpiTransportClass HCISpiTransport(SpiHCI, SPBTLE_RF, A1, A0, D7, 8000000, SPI_MODE0);
47-
BLELocalDevice BLE(&HCISpiTransport); */
65+
#if !defined(FAKE_BLELOCALDEVICE)
66+
BLELocalDevice BLEObj(&HCISpiTransport);
67+
BLELocalDevice& BLE = BLEObj;
68+
#endif */
4869
/* Shield BNRG2A1 with SPI clock on D3 */
4970
/*SPIClass SpiHCI(D11, D12, D3);
5071
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
51-
BLELocalDevice BLE(&HCISpiTransport); */
72+
#if !defined(FAKE_BLELOCALDEVICE)
73+
BLELocalDevice BLEObj(&HCISpiTransport);
74+
BLELocalDevice& BLE = BLEObj;
75+
#endif */
5276
/* Shield BNRG2A1 with SPI clock on D13 */
5377
/*#define SpiHCI SPI
5478
HCISpiTransportClass HCISpiTransport(SpiHCI, BLUENRG_M2SP, A1, A0, D7, 1000000, SPI_MODE1);
55-
BLELocalDevice BLE(&HCISpiTransport); */
79+
#if !defined(FAKE_BLELOCALDEVICE)
80+
BLELocalDevice BLEObj(&HCISpiTransport);
81+
BLELocalDevice& BLE = BLEObj;
82+
#endif */
5683
#endif
5784

5885
void setup() {

0 commit comments

Comments
 (0)