diff --git a/.gitmodules b/.gitmodules index 0c8ae299..dcab7984 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "SimpleBLE"] path = SimpleBLE - url = https://github.com/thegecko/SimpleBLE + url = https://github.com/SimpleBLE/SimpleBLE diff --git a/SimpleBLE b/SimpleBLE index 91fa5b08..1cfd7ef7 160000 --- a/SimpleBLE +++ b/SimpleBLE @@ -1 +1 @@ -Subproject commit 91fa5b08ebb9f909e3c2bc5e66471868fded2a8b +Subproject commit 1cfd7ef7304d7345d3d3486a820ec49a5f931178 diff --git a/lib/peripheral.cpp b/lib/peripheral.cpp index 7ef1d69b..75842d7f 100644 --- a/lib/peripheral.cpp +++ b/lib/peripheral.cpp @@ -724,7 +724,8 @@ void Peripheral::onDisconnected(simpleble_peripheral_t, void *userdata) { peripheral->onDisconnectedFn.NonBlockingCall(callback); } -void Peripheral::onNotify(simpleble_uuid_t service, +void Peripheral::onNotify(simpleble_peripheral_t, + simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t *data, size_t data_length, void *userdata) { auto peripheral = reinterpret_cast(userdata); @@ -742,7 +743,8 @@ void Peripheral::onNotify(simpleble_uuid_t service, it->second.NonBlockingCall(callback); } -void Peripheral::onIndicate(simpleble_uuid_t service, +void Peripheral::onIndicate(simpleble_peripheral_t, + simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t *data, size_t data_length, void *userdata) { diff --git a/lib/peripheral.h b/lib/peripheral.h index 027730ba..213ac0a0 100644 --- a/lib/peripheral.h +++ b/lib/peripheral.h @@ -48,6 +48,6 @@ class Peripheral : public Napi::ObjectWrap { static void onConnected(simpleble_peripheral_t peripheral, void *userdata); static void onDisconnected(simpleble_peripheral_t peripheral, void *userdata); - static void onNotify(simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t* data, size_t data_length, void* userdata); - static void onIndicate(simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t* data, size_t data_length, void* userdata); + static void onNotify(simpleble_peripheral_t peripheral, simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t* data, size_t data_length, void* userdata); + static void onIndicate(simpleble_peripheral_t peripheral, simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t* data, size_t data_length, void* userdata); };