Skip to content

Commit 5522657

Browse files
committed
🐛 Fix NimBLE compilation with Arduino compiler
1 parent a44b061 commit 5522657

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.github/workflows/platformio-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
- name: Build example
7070
run: |
71-
pio ci --lib="." --board=${{ join(matrix.boards, ' --board=') }} ${{ matrix.nimble && '--project-option="lib_deps=h2zero/NimBLE-Arduino@^1.4.0"' || '' }}
71+
pio ci --lib="." --board=${{ join(matrix.boards, ' --board=') }} ${{ matrix.nimble && '--project-option="lib_deps=h2zero/NimBLE-Arduino@^2.0.0"' || '' }}
7272
env:
7373
PLATFORMIO_CI_SRC: "./examples/${{ matrix.example }}/*.ino"
7474
PLATFORMIO_BUILD_UNFLAGS: |

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Change your `platformio.ini` file to the following settings:
178178

179179
```diff
180180
lib_deps =
181-
+ h2zero/NimBLE-Arduino@^1.4.0
181+
+ h2zero/NimBLE-Arduino@^2.0.0
182182

183183
build_flags =
184184
+ -D BLESERIAL_USE_NIMBLE=true

src/BLESerial.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,11 @@ class BLESerialServerCallbacks : public BLEServerCallbacks {
262262
public:
263263
explicit BLESerialServerCallbacks(BLESerial<T>* bleSerial) : bleSerial(bleSerial) {}
264264

265+
#if defined(BLESERIAL_USE_NIMBLE) && BLESERIAL_USE_NIMBLE
266+
void onDisconnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo, int reason) override
267+
#else // BLESERIAL_USE_NIMBLE
265268
void onDisconnect(BLEServer* pServer) override
269+
#endif // BLESERIAL_USE_NIMBLE
266270
{
267271
auto* pAdvertising = pServer->getAdvertising();
268272
if (pAdvertising == nullptr) {
@@ -280,7 +284,11 @@ class BLESerialCharacteristicCallbacks : public BLECharacteristicCallbacks {
280284
public:
281285
explicit BLESerialCharacteristicCallbacks(BLESerial<T>* bleSerial) : bleSerial(bleSerial) {}
282286

287+
#if defined(BLESERIAL_USE_NIMBLE) && BLESERIAL_USE_NIMBLE
288+
void onWrite(NimBLECharacteristic* pCharacteristic, NimBLEConnInfo& connInfo) override
289+
#else // BLESERIAL_USE_NIMBLE
283290
void onWrite(BLECharacteristic* pCharacteristic) override
291+
#endif // BLESERIAL_USE_NIMBLE
284292
{
285293
if (pCharacteristic != bleSerial->m_pRxCharacteristic) {
286294
return;

0 commit comments

Comments
 (0)