simplepyble 1.3.1.dev22__tar.gz → 1.3.1.dev35__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/Cargo.toml +1 -1
- {simplepyble-1.3.1.dev22/simplepyble/src/simplepyble.egg-info → simplepyble-1.3.1.dev35}/PKG-INFO +4 -2
- simplepyble-1.3.1.dev35/VERSION +1 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Advanced.h +52 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Config.h +2 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/Config.cpp +1 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/BluetoothGattCallback.cpp +10 -9
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/BluetoothGattCallback.h +2 -1
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/AdapterDongl.h +0 -2
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/PeripheralDongl.cpp +7 -7
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/PeripheralDongl.h +2 -2
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/AdapterLinux.cpp +78 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/AdapterLinux.h +17 -0
- simplepyble-1.3.1.dev35/simpleble/src/backends/linux/BackendBluez.cpp +132 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/BackendBluez.h +2 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/PeripheralBaseMacOS.mm +37 -36
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/LocalCharacteristicWindows.cpp +12 -4
- simplepyble-1.3.1.dev35/simpleble/src/external/kvn_safe_callback_map.hpp +66 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Advanced.cpp +20 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/Bluez.h +2 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Agent.h +1 -1
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/BluezOrg.h +2 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/BluezOrgBluez.h +2 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/BluezRoot.h +2 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/Bluez.cpp +7 -3
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/Agent1.cpp +6 -3
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/BluezOrg.cpp +8 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/BluezOrgBluez.cpp +6 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/BluezRoot.cpp +8 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/CMakeLists.txt +2 -1
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/README.md +3 -1
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble/__init__.pyi +77 -1
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble/aio.py +66 -1
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35/simplepyble/src/simplepyble.egg-info}/PKG-INFO +4 -2
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble.egg-info/SOURCES.txt +1 -0
- simplepyble-1.3.1.dev35/simplepyble/src/wrap_advanced.cpp +180 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_config.cpp +14 -0
- simplepyble-1.3.1.dev22/VERSION +0 -1
- simplepyble-1.3.1.dev22/simpleble/src/backends/linux/BackendBluez.cpp +0 -79
- simplepyble-1.3.1.dev22/simplepyble/src/wrap_advanced.cpp +0 -105
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/.dockerignore +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/AGENTS.md +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/CONTRIBUTING.md +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/Cargo.lock +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/LICENSE.md +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/README.rst +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/SECURITY.md +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/cmake/epilogue.cmake +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/cmake/find/FindDBus1.cmake +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/cmake/find/Findfmt.cmake +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/cmake/find/Findgoogletest.cmake +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/cmake/parse_version.cmake +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/cmake/prelude.cmake +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/README +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/external/kvn/kvn_bytearray.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/external/kvn/kvn_safe_callback.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/external/kvn/logfwd.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/LICENSE +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/args.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/base.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/chrono.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/color.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/compile.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/core.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/enum.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/fmt-c.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/format-inl.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/format.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/os.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/ostream.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/printf.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/ranges.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/std.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/fmt/xchar.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/nanopb/pb.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/nanopb/pb_common.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/nanopb/pb_decode.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/nanopb/pb_encode.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/Common.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/References.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/Registry.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/VM.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/java/lang/Integer.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/java/util/ArrayList.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/include/simplejni/java/util/HashMap.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/nanopb/pb_common.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/nanopb/pb_decode.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/nanopb/pb_encode.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/simplejni/Common.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/simplejni/java/lang/Integer.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/simplejni/java/util/ArrayList.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/dependencies/internal/src/simplejni/java/util/HashMap.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/pyproject.toml +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/setup.cfg +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/setup.py +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/CMakeLists.txt +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/cmake/simpleble-config.cmake.in +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/cmake/simpleble.pc.in +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Adapter.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/AdapterSafe.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Backend.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Characteristic.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Descriptor.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Error.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Exceptions.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Logging.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Peripheral.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/PeripheralSafe.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Service.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/SimpleBLE.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Simulation.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Types.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/Utils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/local/Characteristic.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/local/Peripheral.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/local/Service.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/simulation/Adapter.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/simulation/Connection.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/simulation/Device.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/simulation/Environment.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/simulation/Link.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/include/simpleble/simulation/Types.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/CommonUtils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/Error.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/Exceptions.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/Logging.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/LoggingInternal.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/Utils.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/AdapterAndroid.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/AdapterAndroid.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/BackendAndroid.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/BackendAndroid.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/LocalCharacteristicAndroid.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/LocalCharacteristicAndroid.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/LocalPeripheralAndroid.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/LocalPeripheralAndroid.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/LocalServiceAndroid.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/LocalServiceAndroid.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/PeripheralAndroid.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/PeripheralAndroid.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/AdvertiseCallback.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/AdvertiseCallback.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/GattServerCallback.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/GattServerCallback.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/ScanCallback.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/bridge/ScanCallback.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothAdapter.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothAdapter.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothDevice.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothDevice.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGatt.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGatt.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattCharacteristic.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattCharacteristic.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattDescriptor.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattDescriptor.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattServer.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattServer.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattService.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothGattService.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothManager.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/BluetoothManager.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/AdvertiseData.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/AdvertiseData.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/AdvertiseSettings.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/AdvertiseSettings.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/BluetoothLeAdvertiser.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/BluetoothLeAdvertiser.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/BluetoothScanner.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/BluetoothScanner.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/ScanRecord.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/ScanRecord.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/ScanResult.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/ScanResult.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/ScanSettings.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/bluetooth/le/ScanSettings.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/content/Context.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/content/Context.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/os/ParcelUUID.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/os/ParcelUUID.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/util/SparseArray.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/android/util/SparseArray.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/Iterator.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/Iterator.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/List.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/List.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/Set.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/Set.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/UUID.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/android/types/java/util/UUID.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/AdapterBase.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/AdapterBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/AdapterBaseTypes.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/BackendBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/BackendUtils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/CharacteristicBase.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/CharacteristicBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/DescriptorBase.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/DescriptorBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/LocalCharacteristicBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/LocalPeripheralBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/LocalServiceBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/PeripheralBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/ServiceBase.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/common/ServiceBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/AdapterDongl.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/AdvancedDongl.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/AdvertisingData.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/BackendDongl.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/Utils.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/Utils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/basic.pb.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/basic.pb.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/d2h.pb.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/d2h.pb.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/h2d.pb.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/h2d.pb.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/simpleble.pb.c +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/protocol/simpleble.pb.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/serial/Protocol.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/serial/Protocol.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/serial/ProtocolBase.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/serial/ProtocolBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/serial/Wire.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/serial/Wire.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelper.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelper.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperApple.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperApple.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperImpl.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperLinux.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperLinux.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperNull.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperNull.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperWindows.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/usb/UsbHelperWindows.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/LocalCharacteristicLinux.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/LocalCharacteristicLinux.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/LocalPeripheralLinux.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/LocalPeripheralLinux.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/LocalServiceLinux.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/LocalServiceLinux.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/PeripheralLinux.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/PeripheralLinux.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/AdapterBaseMacOS.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/AdapterBaseMacOS.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/AdapterMac.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/AdapterMac.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/BackendCoreBluetooth.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalCharacteristicMac.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalCharacteristicMac.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalPeripheralBaseMacOS.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalPeripheralBaseMacOS.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalPeripheralMac.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalPeripheralMac.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalServiceMac.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/LocalServiceMac.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/PeripheralBaseMacOS.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/PeripheralMac.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/PeripheralMac.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/Utils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/macos/Utils.mm +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/plain/BackendPlain.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/AdapterSimulator.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/AdapterSimulator.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/BackendSimulator.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/LocalPeripheralSimulator.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/LocalPeripheralSimulator.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/PeripheralSimulator.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/PeripheralSimulator.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/SimulationAdapter.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/SimulationConnection.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/SimulationDevice.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/SimulationEnvironment.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/SimulationLink.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/ConnectionCore.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/ConnectionCore.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/DeviceCore.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/DeviceCore.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/EnvironmentCore.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/EnvironmentCore.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/LinkCore.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/Pdu.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/Pdu.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/SimulatorUtils.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/simulator/core/SimulatorUtils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/AdapterWindows.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/AdapterWindows.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/BackendWinRT.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/BackendWinRT.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/LocalCharacteristicWindows.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/LocalPeripheralWindows.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/LocalPeripheralWindows.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/LocalServiceWindows.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/LocalServiceWindows.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/MtaManager.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/MtaManager.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/PeripheralWindows.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/PeripheralWindows.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/Utils.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/windows/Utils.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/builders/BuildVec.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/builders/BuilderBase.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/external/kvn_safe_callback.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/external/kvn_safe_map.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/external/kvn_scheduler.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/external/kvn_threadrunner.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/external/logfwd.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Adapter.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Backend.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Characteristic.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Descriptor.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/LocalCharacteristic.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/LocalPeripheral.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/LocalService.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Peripheral.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/base/Service.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/safe/AdapterSafe.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/frontends/safe/PeripheralSafe.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/CMakeLists.txt +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/cmake/simplebluez-config.cmake.in +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/cmake/simplebluez.pc.in +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/Config.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/Exceptions.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/Types.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/Adapter1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/Agent1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/AgentManager1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/Battery1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/Device1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/GattCharacteristic1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/GattDescriptor1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/GattManager1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/GattService1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/LEAdvertisement1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/interfaces/LEAdvertisingManager1.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Adapter.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Advertisement.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Characteristic.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/CustomRoot.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Descriptor.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Device.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/Service.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/include/simplebluez/standard/ServiceManager.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/Config.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/Exceptions.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/Logging.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/Logging.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/Adapter1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/AgentManager1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/Battery1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/Device1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/GattCharacteristic1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/GattDescriptor1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/GattManager1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/GattService1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/LEAdvertisement1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/interfaces/LEAdvertisingManager1.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Adapter.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Advertisement.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Agent.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Characteristic.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/CustomRoot.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Descriptor.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Device.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/Service.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplebluez/src/standard/ServiceManager.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/CMakeLists.txt +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/cmake/simpledbus-config.cmake.in +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/cmake/simpledbus.pc.in +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/Config.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/advanced/Interface.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/advanced/InterfaceRegistry.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/advanced/Proxy.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/Connection.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/Exceptions.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/Holder.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/Logging.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/Message.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/Path.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/base/UnixSocket.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/interfaces/Introspectable.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/interfaces/ObjectManager.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/include/simpledbus/interfaces/Properties.h +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/Config.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/advanced/Interface.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/advanced/Proxy.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/Connection.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/Exceptions.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/Holder.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/Logging.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/Message.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/Path.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/base/UnixSocket.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/interfaces/Introspectable.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/interfaces/ObjectManager.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpledbus/src/interfaces/Properties.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/requirements.txt +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/main.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/python_callback.hpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble/__init__.py +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble/py.typed +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble.egg-info/dependency_links.txt +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/simplepyble.egg-info/top_level.txt +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_adapter.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_backend.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_characteristic.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_descriptor.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_errors.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_local.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_logging.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_peripheral.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_service.cpp +0 -0
- {simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simplepyble/src/wrap_types.cpp +0 -0
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
edition = "2021"
|
|
3
3
|
|
|
4
4
|
name = "simplersble"
|
|
5
|
-
version = "1.3.1-dev.
|
|
5
|
+
version = "1.3.1-dev.35"
|
|
6
6
|
rust-version = "1.82"
|
|
7
7
|
license = "BUSL-1.1"
|
|
8
8
|
description = "Rust bindings for the cross-platform SimpleBLE Bluetooth Low Energy library, for Windows, macOS, and Linux. Free for non-commercial use; commercial use requires a license."
|
{simplepyble-1.3.1.dev22/simplepyble/src/simplepyble.egg-info → simplepyble-1.3.1.dev35}/PKG-INFO
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: simplepyble
|
|
3
|
-
Version: 1.3.1.
|
|
3
|
+
Version: 1.3.1.dev35
|
|
4
4
|
Summary: Python bindings for the cross-platform SimpleBLE Bluetooth Low Energy library, for Windows, macOS, and Linux. Free for non-commercial use; commercial use requires a license.
|
|
5
5
|
Home-page: https://github.com/simpleble/simpleble
|
|
6
6
|
Author: Kevin Dewald
|
|
@@ -165,7 +165,9 @@ them before the first call that reaches a backend. Pairing through a Dongl
|
|
|
165
165
|
happens without the operating system: register a callback with
|
|
166
166
|
`set_passkey_request_callback()`, `set_passkey_display_callback()`, or
|
|
167
167
|
`set_numeric_comparison_callback()` from `simplepyble.advanced.dongl` before
|
|
168
|
-
`connect()`.
|
|
168
|
+
`connect()`. On Linux, set `config.simplebluez.interactive_pairing` and
|
|
169
|
+
register the same callbacks for an adapter in `simplepyble.advanced.linux`;
|
|
170
|
+
they also receive the peer's address.
|
|
169
171
|
|
|
170
172
|
## Asyncio
|
|
171
173
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
1.3.1-dev.35
|
|
@@ -190,6 +190,58 @@ namespace SimpleBLE::Advanced::Linux {
|
|
|
190
190
|
void SIMPLEBLE_EXPORT set_advertisement_local_name(Local::Peripheral& peripheral,
|
|
191
191
|
std::optional<std::string> local_name);
|
|
192
192
|
|
|
193
|
+
/**
|
|
194
|
+
* Register a callback for entering a passkey requested by a peer pairing through this adapter.
|
|
195
|
+
*
|
|
196
|
+
* The callback receives the peer's address and must return exactly six decimal
|
|
197
|
+
* digits, including leading zeroes. Return std::nullopt to reject the pairing
|
|
198
|
+
* request. An absent callback, an invalid passkey, or an exception from the
|
|
199
|
+
* callback also rejects the request.
|
|
200
|
+
*
|
|
201
|
+
* Pairing callbacks apply to peripherals this adapter connects to and to clients
|
|
202
|
+
* of its local peripherals. Passkey and numeric comparison requests reach them when
|
|
203
|
+
* Config::SimpleBluez::interactive_pairing is set; otherwise SimpleBLE's BlueZ agent
|
|
204
|
+
* is NoInputNoOutput and only Just Works pairing succeeds. Callbacks run on
|
|
205
|
+
* SimpleBLE's BlueZ event thread, which waits for them to return. Passing an empty
|
|
206
|
+
* callback unregisters it.
|
|
207
|
+
*/
|
|
208
|
+
void SIMPLEBLE_EXPORT set_passkey_request_callback(
|
|
209
|
+
Adapter& adapter, const std::function<std::optional<std::string>(BluetoothAddress peer)>& callback);
|
|
210
|
+
|
|
211
|
+
/**
|
|
212
|
+
* Register a callback for a passkey that a peer pairing through this adapter must enter.
|
|
213
|
+
*
|
|
214
|
+
* The callback receives the peer's address and the passkey as exactly six decimal
|
|
215
|
+
* digits, including leading zeroes. Display it to the user without modification.
|
|
216
|
+
* This event does not require a reply; an absent callback simply ignores the event.
|
|
217
|
+
* Passing an empty callback unregisters it.
|
|
218
|
+
*/
|
|
219
|
+
void SIMPLEBLE_EXPORT set_passkey_display_callback(
|
|
220
|
+
Adapter& adapter, const std::function<void(BluetoothAddress peer, const std::string& passkey)>& callback);
|
|
221
|
+
|
|
222
|
+
/**
|
|
223
|
+
* Register a callback for numeric comparison while a peer pairs through this adapter.
|
|
224
|
+
*
|
|
225
|
+
* The callback receives the peer's address and the number as exactly six decimal
|
|
226
|
+
* digits, including leading zeroes. Return true only after the user confirms that
|
|
227
|
+
* the peer shows the same number; return false to reject pairing. An absent
|
|
228
|
+
* callback or an exception from the callback rejects the request. Passing an
|
|
229
|
+
* empty callback unregisters it.
|
|
230
|
+
*/
|
|
231
|
+
void SIMPLEBLE_EXPORT set_numeric_comparison_callback(
|
|
232
|
+
Adapter& adapter, const std::function<bool(BluetoothAddress peer, const std::string& passkey)>& callback);
|
|
233
|
+
|
|
234
|
+
/**
|
|
235
|
+
* Register a callback that approves Just Works pairing with a peer through this adapter.
|
|
236
|
+
*
|
|
237
|
+
* The callback receives the peer's address. Return true to accept the pairing
|
|
238
|
+
* and false to reject it. Without this callback, Just Works pairing is accepted;
|
|
239
|
+
* an exception from the callback rejects it. Passing an empty callback
|
|
240
|
+
* unregisters it.
|
|
241
|
+
*/
|
|
242
|
+
void SIMPLEBLE_EXPORT set_pairing_authorization_callback(Adapter& adapter,
|
|
243
|
+
const std::function<bool(BluetoothAddress peer)>& callback);
|
|
244
|
+
|
|
193
245
|
} // namespace SimpleBLE::Advanced::Linux
|
|
194
246
|
|
|
195
247
|
#endif
|
|
@@ -16,11 +16,13 @@ namespace SimpleBluez {
|
|
|
16
16
|
extern SIMPLEBLE_EXPORT bool use_system_bus;
|
|
17
17
|
extern SIMPLEBLE_EXPORT std::chrono::steady_clock::duration connection_timeout;
|
|
18
18
|
extern SIMPLEBLE_EXPORT std::chrono::steady_clock::duration disconnection_timeout;
|
|
19
|
+
extern SIMPLEBLE_EXPORT bool interactive_pairing;
|
|
19
20
|
|
|
20
21
|
static void reset() {
|
|
21
22
|
use_system_bus = true;
|
|
22
23
|
connection_timeout = std::chrono::seconds(2);
|
|
23
24
|
disconnection_timeout = std::chrono::seconds(1);
|
|
25
|
+
interactive_pairing = false;
|
|
24
26
|
}
|
|
25
27
|
} // namespace SimpleBluez
|
|
26
28
|
|
|
@@ -6,6 +6,7 @@ namespace Config {
|
|
|
6
6
|
bool use_system_bus = true;
|
|
7
7
|
std::chrono::steady_clock::duration connection_timeout = std::chrono::seconds(2);
|
|
8
8
|
std::chrono::steady_clock::duration disconnection_timeout = std::chrono::seconds(1);
|
|
9
|
+
bool interactive_pairing = false;
|
|
9
10
|
} // namespace SimpleBluez
|
|
10
11
|
|
|
11
12
|
namespace WinRT {
|
|
@@ -79,15 +79,11 @@ void BluetoothGattCallback::set_callback_onMtuChanged(std::function<void(int)> c
|
|
|
79
79
|
|
|
80
80
|
void BluetoothGattCallback::set_callback_onCharacteristicChanged(SimpleJNI::Object<SimpleJNI::GlobalRef, jobject> characteristic,
|
|
81
81
|
std::function<void(std::vector<uint8_t>)> callback) {
|
|
82
|
-
|
|
83
|
-
_callback_onCharacteristicChanged[characteristic].load(callback);
|
|
84
|
-
} else {
|
|
85
|
-
_callback_onCharacteristicChanged[characteristic].unload();
|
|
86
|
-
}
|
|
82
|
+
_callback_onCharacteristicChanged.load(characteristic, std::move(callback));
|
|
87
83
|
}
|
|
88
84
|
|
|
89
85
|
void BluetoothGattCallback::clear_callback_onCharacteristicChanged(SimpleJNI::Object<SimpleJNI::GlobalRef, jobject> characteristic) {
|
|
90
|
-
_callback_onCharacteristicChanged
|
|
86
|
+
_callback_onCharacteristicChanged.unload(characteristic);
|
|
91
87
|
}
|
|
92
88
|
|
|
93
89
|
void BluetoothGattCallback::set_flag_characteristicWritePending(SimpleJNI::Object<SimpleJNI::GlobalRef, jobject> characteristic) {
|
|
@@ -247,6 +243,8 @@ void BluetoothGattCallback::jni_onConnectionStateChangeCallback(SimpleJNI::Objec
|
|
|
247
243
|
if (!connected) {
|
|
248
244
|
// Services need to be rediscovered on the next connection.
|
|
249
245
|
obj->services_discovered = false;
|
|
246
|
+
// A disconnect ends every subscription. The next connection uses new characteristic objects anyway.
|
|
247
|
+
obj->_callback_onCharacteristicChanged.clear();
|
|
250
248
|
}
|
|
251
249
|
SAFE_CALLBACK_CALL(obj->_callback_onConnectionStateChange, connected);
|
|
252
250
|
}
|
|
@@ -278,9 +276,12 @@ void BluetoothGattCallback::jni_onCharacteristicChangedCallback(SimpleJNI::Objec
|
|
|
278
276
|
SIMPLEBLE_LOG_INFO(msg);
|
|
279
277
|
|
|
280
278
|
BluetoothGattCallback* obj = GET_CALLBACK_OBJECT_OR_RETURN(thiz_obj);
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
279
|
+
try {
|
|
280
|
+
obj->_callback_onCharacteristicChanged.call(characteristic_obj, value.bytes());
|
|
281
|
+
} catch (const std::exception& ex) {
|
|
282
|
+
SIMPLEBLE_LOG_ERROR(fmt::format("Exception during callback: {}", ex.what()));
|
|
283
|
+
} catch (...) {
|
|
284
|
+
SIMPLEBLE_LOG_ERROR("Unknown exception during callback");
|
|
284
285
|
}
|
|
285
286
|
}
|
|
286
287
|
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
#include <atomic>
|
|
4
4
|
#include <condition_variable>
|
|
5
5
|
#include <kvn_safe_callback.hpp>
|
|
6
|
+
#include <kvn_safe_callback_map.hpp>
|
|
6
7
|
#include <kvn_safe_map.hpp>
|
|
7
8
|
#include <map>
|
|
8
9
|
#include <mutex>
|
|
@@ -87,7 +88,7 @@ class BluetoothGattCallback {
|
|
|
87
88
|
kvn::safe_callback<void()> _callback_onServicesDiscovered;
|
|
88
89
|
kvn::safe_callback<void(int)> _callback_onMtuChanged;
|
|
89
90
|
|
|
90
|
-
kvn::
|
|
91
|
+
kvn::safe_callback_map<SimpleJNI::Object<SimpleJNI::GlobalRef, jobject>, void(std::vector<uint8_t>), SimpleJNI::ObjectComparator<SimpleJNI::GlobalRef, jobject>>
|
|
91
92
|
_callback_onCharacteristicChanged;
|
|
92
93
|
|
|
93
94
|
kvn::safe_map<SimpleJNI::Object<SimpleJNI::GlobalRef, jobject>, FlagData, SimpleJNI::ObjectComparator<SimpleJNI::GlobalRef, jobject>> _flag_characteristicWritePending;
|
{simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/AdapterDongl.h
RENAMED
|
@@ -51,8 +51,6 @@ class AdapterDongl : public AdapterBase {
|
|
|
51
51
|
private:
|
|
52
52
|
void _open();
|
|
53
53
|
|
|
54
|
-
void _check_for_updates(uint32_t current_version);
|
|
55
|
-
void _update_firmware();
|
|
56
54
|
void _scan_received_callback(Dongl::advertising_data_t data);
|
|
57
55
|
void _on_simpleble_event(const simpleble_Event& event);
|
|
58
56
|
std::vector<std::shared_ptr<PeripheralDongl>> _peripherals();
|
{simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/PeripheralDongl.cpp
RENAMED
|
@@ -334,7 +334,7 @@ void PeripheralDongl::notify(BluetoothUUID const& service_uuid, BluetoothUUID co
|
|
|
334
334
|
throw Exception::OperationFailed(fmt::format("Characteristic {} does not have a CCCD", characteristic_uuid));
|
|
335
335
|
}
|
|
336
336
|
|
|
337
|
-
_callbacks_on_value_changed
|
|
337
|
+
_callbacks_on_value_changed.load(characteristic.handle_value, std::move(callback));
|
|
338
338
|
|
|
339
339
|
ByteArray data = {0x01, 0x00};
|
|
340
340
|
simpleble_WriteRsp rsp = _serial_protocol->simpleble_write(_conn_handle, characteristic.handle_cccd,
|
|
@@ -357,7 +357,7 @@ void PeripheralDongl::indicate(BluetoothUUID const& service_uuid, BluetoothUUID
|
|
|
357
357
|
throw Exception::OperationFailed(fmt::format("Characteristic {} does not have a CCCD", characteristic_uuid));
|
|
358
358
|
}
|
|
359
359
|
|
|
360
|
-
_callbacks_on_value_changed
|
|
360
|
+
_callbacks_on_value_changed.load(characteristic.handle_value, std::move(callback));
|
|
361
361
|
|
|
362
362
|
ByteArray data = {0x02, 0x00};
|
|
363
363
|
simpleble_WriteRsp rsp = _serial_protocol->simpleble_write(_conn_handle, characteristic.handle_cccd,
|
|
@@ -375,7 +375,7 @@ void PeripheralDongl::unsubscribe(BluetoothUUID const& service_uuid, BluetoothUU
|
|
|
375
375
|
throw Exception::OperationFailed(fmt::format("Characteristic {} does not have a CCCD", characteristic_uuid));
|
|
376
376
|
}
|
|
377
377
|
|
|
378
|
-
_callbacks_on_value_changed.
|
|
378
|
+
_callbacks_on_value_changed.unload(characteristic.handle_value);
|
|
379
379
|
|
|
380
380
|
ByteArray data = {0x00, 0x00};
|
|
381
381
|
simpleble_WriteRsp rsp = _serial_protocol->simpleble_write(_conn_handle, characteristic.handle_cccd,
|
|
@@ -505,6 +505,9 @@ void PeripheralDongl::notify_connected(uint16_t conn_handle) {
|
|
|
505
505
|
|
|
506
506
|
void PeripheralDongl::notify_disconnected() {
|
|
507
507
|
const bool notify = _connection_announced.exchange(false);
|
|
508
|
+
|
|
509
|
+
// A disconnect ends every subscription. Clearing them first means they are gone once disconnect() returns.
|
|
510
|
+
_callbacks_on_value_changed.clear();
|
|
508
511
|
{
|
|
509
512
|
// NOTE: Changing the handle under the lock keeps a waiting disconnect() from missing the wakeup.
|
|
510
513
|
std::lock_guard<std::mutex> lock(disconnection_mutex_);
|
|
@@ -612,10 +615,7 @@ void PeripheralDongl::notify_connect_complete(simpleble_ConnectCompleteEvt const
|
|
|
612
615
|
|
|
613
616
|
void PeripheralDongl::notify_value_changed(simpleble_ValueChangedEvt const& evt) {
|
|
614
617
|
ByteArray data(evt.data.bytes, evt.data.bytes + evt.data.size);
|
|
615
|
-
std::
|
|
616
|
-
if (callback) {
|
|
617
|
-
callback(data);
|
|
618
|
-
}
|
|
618
|
+
_callbacks_on_value_changed.call(evt.handle, std::move(data));
|
|
619
619
|
}
|
|
620
620
|
|
|
621
621
|
void PeripheralDongl::notify_passkey_display(simpleble_PasskeyDisplayEvt const& evt) {
|
{simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/dongl/PeripheralDongl.h
RENAMED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
#include "PeripheralBase.h"
|
|
8
8
|
|
|
9
9
|
#include <kvn_safe_callback.hpp>
|
|
10
|
-
#include <
|
|
10
|
+
#include <kvn_safe_callback_map.hpp>
|
|
11
11
|
#include <kvn_scheduler.hpp>
|
|
12
12
|
|
|
13
13
|
#include <atomic>
|
|
@@ -179,7 +179,7 @@ class PeripheralDongl : public PeripheralBase {
|
|
|
179
179
|
|
|
180
180
|
kvn::safe_callback<void()> _callback_on_connected;
|
|
181
181
|
kvn::safe_callback<void()> _callback_on_disconnected;
|
|
182
|
-
kvn::
|
|
182
|
+
kvn::safe_callback_map<uint16_t, void(ByteArray payload)> _callbacks_on_value_changed;
|
|
183
183
|
};
|
|
184
184
|
|
|
185
185
|
} // namespace SimpleBLE
|
{simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/AdapterLinux.cpp
RENAMED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#include <algorithm>
|
|
2
|
+
#include <cctype>
|
|
2
3
|
#include <thread>
|
|
3
4
|
#include <utility>
|
|
4
5
|
|
|
@@ -9,6 +10,7 @@
|
|
|
9
10
|
#include "BuilderBase.h"
|
|
10
11
|
#include "CommonUtils.h"
|
|
11
12
|
#include "LocalPeripheralLinux.h"
|
|
13
|
+
#include "LoggingInternal.h"
|
|
12
14
|
#include "PeripheralLinux.h"
|
|
13
15
|
|
|
14
16
|
using namespace SimpleBLE;
|
|
@@ -190,3 +192,79 @@ void AdapterLinux::_on_device_connected(std::shared_ptr<SimpleBluez::Device> dev
|
|
|
190
192
|
peripheral->handle_connected_changed(address, connected);
|
|
191
193
|
}
|
|
192
194
|
}
|
|
195
|
+
|
|
196
|
+
void AdapterLinux::set_passkey_request_callback(
|
|
197
|
+
std::function<std::optional<std::string>(BluetoothAddress peer)> callback) {
|
|
198
|
+
if (callback) {
|
|
199
|
+
passkey_request_callback_.load(std::move(callback));
|
|
200
|
+
} else {
|
|
201
|
+
passkey_request_callback_.unload();
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
|
|
205
|
+
void AdapterLinux::set_passkey_display_callback(
|
|
206
|
+
std::function<void(BluetoothAddress peer, const std::string& passkey)> callback) {
|
|
207
|
+
if (callback) {
|
|
208
|
+
passkey_display_callback_.load(std::move(callback));
|
|
209
|
+
} else {
|
|
210
|
+
passkey_display_callback_.unload();
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
|
|
214
|
+
void AdapterLinux::set_numeric_comparison_callback(
|
|
215
|
+
std::function<bool(BluetoothAddress peer, const std::string& passkey)> callback) {
|
|
216
|
+
if (callback) {
|
|
217
|
+
numeric_comparison_callback_.load(std::move(callback));
|
|
218
|
+
} else {
|
|
219
|
+
numeric_comparison_callback_.unload();
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
void AdapterLinux::set_pairing_authorization_callback(std::function<bool(BluetoothAddress peer)> callback) {
|
|
224
|
+
if (callback) {
|
|
225
|
+
pairing_authorization_callback_.load(std::move(callback));
|
|
226
|
+
} else {
|
|
227
|
+
pairing_authorization_callback_.unload();
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
std::optional<uint32_t> AdapterLinux::agent_request_passkey(const BluetoothAddress& peer) {
|
|
232
|
+
std::optional<std::string> passkey;
|
|
233
|
+
try {
|
|
234
|
+
passkey = passkey_request_callback_(peer);
|
|
235
|
+
} catch (const std::exception& e) {
|
|
236
|
+
SIMPLEBLE_LOG_ERROR(fmt::format("Passkey request callback failed: {}", e.what()));
|
|
237
|
+
return std::nullopt;
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
if (!passkey || passkey->size() != 6) return std::nullopt;
|
|
241
|
+
if (!std::all_of(passkey->begin(), passkey->end(), [](unsigned char c) { return std::isdigit(c); })) {
|
|
242
|
+
return std::nullopt;
|
|
243
|
+
}
|
|
244
|
+
return static_cast<uint32_t>(std::stoul(*passkey));
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
void AdapterLinux::agent_display_passkey(const BluetoothAddress& peer, uint32_t passkey) {
|
|
248
|
+
SAFE_CALLBACK_CALL(passkey_display_callback_, peer, fmt::format("{:06}", passkey));
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
bool AdapterLinux::agent_request_confirmation(const BluetoothAddress& peer, uint32_t passkey) {
|
|
252
|
+
try {
|
|
253
|
+
return numeric_comparison_callback_(peer, fmt::format("{:06}", passkey));
|
|
254
|
+
} catch (const std::exception& e) {
|
|
255
|
+
SIMPLEBLE_LOG_ERROR(fmt::format("Numeric comparison callback failed: {}", e.what()));
|
|
256
|
+
return false;
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
|
|
260
|
+
bool AdapterLinux::agent_request_authorization(const BluetoothAddress& peer) {
|
|
261
|
+
// NOTE: Just Works pairing is accepted unless the application decides otherwise.
|
|
262
|
+
if (!pairing_authorization_callback_) return true;
|
|
263
|
+
|
|
264
|
+
try {
|
|
265
|
+
return pairing_authorization_callback_(peer);
|
|
266
|
+
} catch (const std::exception& e) {
|
|
267
|
+
SIMPLEBLE_LOG_ERROR(fmt::format("Pairing authorization callback failed: {}", e.what()));
|
|
268
|
+
return false;
|
|
269
|
+
}
|
|
270
|
+
}
|
{simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/AdapterLinux.h
RENAMED
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
#include <map>
|
|
15
15
|
#include <memory>
|
|
16
16
|
#include <mutex>
|
|
17
|
+
#include <optional>
|
|
17
18
|
#include <set>
|
|
18
19
|
#include <string>
|
|
19
20
|
#include <vector>
|
|
@@ -52,6 +53,17 @@ class AdapterLinux : public SimpleBLE::AdapterBase {
|
|
|
52
53
|
|
|
53
54
|
virtual bool bluetooth_enabled() override;
|
|
54
55
|
|
|
56
|
+
void set_passkey_request_callback(std::function<std::optional<std::string>(BluetoothAddress peer)> callback);
|
|
57
|
+
void set_passkey_display_callback(std::function<void(BluetoothAddress peer, const std::string& passkey)> callback);
|
|
58
|
+
void set_numeric_comparison_callback(std::function<bool(BluetoothAddress peer, const std::string& passkey)> callback);
|
|
59
|
+
void set_pairing_authorization_callback(std::function<bool(BluetoothAddress peer)> callback);
|
|
60
|
+
|
|
61
|
+
// Answers to the BlueZ agent, which BackendBluez forwards to the adapter of the pairing device.
|
|
62
|
+
std::optional<uint32_t> agent_request_passkey(const BluetoothAddress& peer);
|
|
63
|
+
void agent_display_passkey(const BluetoothAddress& peer, uint32_t passkey);
|
|
64
|
+
bool agent_request_confirmation(const BluetoothAddress& peer, uint32_t passkey);
|
|
65
|
+
bool agent_request_authorization(const BluetoothAddress& peer);
|
|
66
|
+
|
|
55
67
|
private:
|
|
56
68
|
std::shared_ptr<SimpleBluez::Adapter> adapter_;
|
|
57
69
|
|
|
@@ -65,6 +77,11 @@ class AdapterLinux : public SimpleBLE::AdapterBase {
|
|
|
65
77
|
std::vector<std::weak_ptr<Local::PeripheralLinux>> _local_peripherals;
|
|
66
78
|
std::mutex _local_peripherals_mutex;
|
|
67
79
|
|
|
80
|
+
kvn::safe_callback<std::optional<std::string>(BluetoothAddress)> passkey_request_callback_;
|
|
81
|
+
kvn::safe_callback<void(BluetoothAddress, const std::string&)> passkey_display_callback_;
|
|
82
|
+
kvn::safe_callback<bool(BluetoothAddress, const std::string&)> numeric_comparison_callback_;
|
|
83
|
+
kvn::safe_callback<bool(BluetoothAddress)> pairing_authorization_callback_;
|
|
84
|
+
|
|
68
85
|
void _on_device_connected(std::shared_ptr<SimpleBluez::Device> device, bool connected);
|
|
69
86
|
};
|
|
70
87
|
|
|
@@ -0,0 +1,132 @@
|
|
|
1
|
+
#include "BackendBluez.h"
|
|
2
|
+
|
|
3
|
+
#include "AdapterLinux.h"
|
|
4
|
+
#include "CommonUtils.h"
|
|
5
|
+
|
|
6
|
+
#include <simpleble/Config.h>
|
|
7
|
+
#include <simplebluez/Config.h>
|
|
8
|
+
|
|
9
|
+
#include <algorithm>
|
|
10
|
+
|
|
11
|
+
namespace SimpleBLE {
|
|
12
|
+
|
|
13
|
+
std::shared_ptr<BackendBase> BACKEND_LINUX() { return BackendBluez::get(); }
|
|
14
|
+
|
|
15
|
+
BackendBluez::BackendBluez(buildToken) {
|
|
16
|
+
static std::mutex get_mutex; // Static mutex to ensure thread safety when accessing the logger
|
|
17
|
+
std::scoped_lock lock(get_mutex); // Unlock the mutex on function return
|
|
18
|
+
|
|
19
|
+
SimpleBluez::Config::use_system_bus = Config::SimpleBluez::use_system_bus;
|
|
20
|
+
|
|
21
|
+
bluez.init();
|
|
22
|
+
agent = bluez.root_custom()->agent_add("default");
|
|
23
|
+
agent->set_capabilities(Config::SimpleBluez::interactive_pairing ? SimpleBluez::Agent::KeyboardDisplay
|
|
24
|
+
: SimpleBluez::Agent::NoInputNoOutput);
|
|
25
|
+
|
|
26
|
+
// NOTE: Agent1 rejects passkeys above 999999.
|
|
27
|
+
agent->set_on_request_passkey([this](const std::string& device_path) -> uint32_t {
|
|
28
|
+
BluetoothAddress peer;
|
|
29
|
+
auto adapter = _adapter_for_device(device_path, peer);
|
|
30
|
+
if (!adapter) return 1000000;
|
|
31
|
+
return adapter->agent_request_passkey(peer).value_or(1000000);
|
|
32
|
+
});
|
|
33
|
+
agent->set_on_display_passkey([this](const std::string& device_path, uint32_t passkey, uint16_t entered) {
|
|
34
|
+
// NOTE: BlueZ calls again for every key the peer enters, so only the first call shows the passkey.
|
|
35
|
+
if (entered != 0) return;
|
|
36
|
+
|
|
37
|
+
BluetoothAddress peer;
|
|
38
|
+
auto adapter = _adapter_for_device(device_path, peer);
|
|
39
|
+
if (adapter) {
|
|
40
|
+
adapter->agent_display_passkey(peer, passkey);
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
agent->set_on_request_confirmation([this](const std::string& device_path, uint32_t passkey) {
|
|
44
|
+
BluetoothAddress peer;
|
|
45
|
+
auto adapter = _adapter_for_device(device_path, peer);
|
|
46
|
+
return adapter && adapter->agent_request_confirmation(peer, passkey);
|
|
47
|
+
});
|
|
48
|
+
agent->set_on_request_authorization([this](const std::string& device_path) {
|
|
49
|
+
BluetoothAddress peer;
|
|
50
|
+
auto adapter = _adapter_for_device(device_path, peer);
|
|
51
|
+
return !adapter || adapter->agent_request_authorization(peer);
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
async_thread_active = true;
|
|
55
|
+
async_thread = std::thread(&BackendBluez::async_thread_function, this);
|
|
56
|
+
SAFE_RUN({
|
|
57
|
+
bluez.register_agent(agent);
|
|
58
|
+
// NOTE: BlueZ sends incoming pairing to its default agent, which is the first one registered unless asked.
|
|
59
|
+
if (Config::SimpleBluez::interactive_pairing) {
|
|
60
|
+
bluez.request_default_agent(agent);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
BackendBluez::~BackendBluez() {
|
|
66
|
+
async_thread_active = false;
|
|
67
|
+
if (async_thread.joinable()) {
|
|
68
|
+
async_thread.join();
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
SharedPtrVector<AdapterBase> BackendBluez::adapters() {
|
|
73
|
+
SharedPtrVector<AdapterBase> adapter_list;
|
|
74
|
+
|
|
75
|
+
auto internal_adapters = bluez.get_adapters();
|
|
76
|
+
std::scoped_lock lock(adapters_mutex_);
|
|
77
|
+
for (auto& adapter : internal_adapters) {
|
|
78
|
+
auto path = adapter->path();
|
|
79
|
+
|
|
80
|
+
// Reuse the cached wrapper for this adapter if one exists, as creating a
|
|
81
|
+
// second wrapper around the same adapter would clear the existing wrapper's
|
|
82
|
+
// callbacks once it gets destroyed.
|
|
83
|
+
if (adapters_.count(path) == 0) {
|
|
84
|
+
adapters_.insert(std::make_pair(path, std::make_shared<AdapterLinux>(adapter)));
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
adapter_list.push_back(adapters_.at(path));
|
|
88
|
+
}
|
|
89
|
+
return adapter_list;
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
bool BackendBluez::bluetooth_enabled() {
|
|
93
|
+
bool enabled = false;
|
|
94
|
+
|
|
95
|
+
auto internal_adapters = bluez.get_adapters();
|
|
96
|
+
for (auto& adapter : internal_adapters) {
|
|
97
|
+
if (adapter->powered()) {
|
|
98
|
+
enabled = true;
|
|
99
|
+
break;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
return enabled;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
bool BackendBluez::is_active() { return true; }
|
|
107
|
+
|
|
108
|
+
std::shared_ptr<AdapterLinux> BackendBluez::_adapter_for_device(const std::string& device_path,
|
|
109
|
+
BluetoothAddress& peer) {
|
|
110
|
+
// NOTE: BlueZ names device objects <adapter path>/dev_XX_XX_XX_XX_XX_XX.
|
|
111
|
+
const auto separator = device_path.rfind("/dev_");
|
|
112
|
+
if (separator == std::string::npos) return nullptr;
|
|
113
|
+
|
|
114
|
+
peer = device_path.substr(separator + 5);
|
|
115
|
+
std::replace(peer.begin(), peer.end(), '_', ':');
|
|
116
|
+
|
|
117
|
+
std::scoped_lock lock(adapters_mutex_);
|
|
118
|
+
auto it = adapters_.find(device_path.substr(0, separator));
|
|
119
|
+
if (it == adapters_.end()) return nullptr;
|
|
120
|
+
return it->second;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
std::string BackendBluez::identifier() const noexcept { return "SimpleBluez"; }
|
|
124
|
+
|
|
125
|
+
void BackendBluez::async_thread_function() {
|
|
126
|
+
while (async_thread_active) {
|
|
127
|
+
SAFE_RUN({ bluez.run_async(); });
|
|
128
|
+
std::this_thread::sleep_for(std::chrono::microseconds(100));
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
} // namespace SimpleBLE
|
{simplepyble-1.3.1.dev22 → simplepyble-1.3.1.dev35}/simpleble/src/backends/linux/BackendBluez.h
RENAMED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
#include "../common/BackendUtils.h"
|
|
5
5
|
#include "CommonUtils.h"
|
|
6
6
|
|
|
7
|
+
#include <simpleble/Types.h>
|
|
7
8
|
#include <simplebluez/Bluez.h>
|
|
8
9
|
|
|
9
10
|
#include <atomic>
|
|
@@ -33,6 +34,7 @@ class BackendBluez : public BackendSingleton<BackendBluez> {
|
|
|
33
34
|
std::atomic_bool async_thread_active = false;
|
|
34
35
|
std::shared_ptr<SimpleBluez::Agent> agent;
|
|
35
36
|
void async_thread_function();
|
|
37
|
+
std::shared_ptr<AdapterLinux> _adapter_for_device(const std::string& device_path, BluetoothAddress& peer);
|
|
36
38
|
|
|
37
39
|
std::map<std::string, std::shared_ptr<AdapterLinux>> adapters_;
|
|
38
40
|
std::mutex adapters_mutex_;
|
|
@@ -105,6 +105,7 @@ static SimpleBLE::ByteArray descriptorValueToByteArray(id value) {
|
|
|
105
105
|
}
|
|
106
106
|
@property(strong) BleTask* task;
|
|
107
107
|
@property(strong) NSData* value;
|
|
108
|
+
@property BOOL readPending;
|
|
108
109
|
@property(strong) NSMutableDictionary<NSString*, DescriptorExtras*>* descriptorExtras;
|
|
109
110
|
@end
|
|
110
111
|
|
|
@@ -335,32 +336,33 @@ static SimpleBLE::ByteArray descriptorValueToByteArray(id value) {
|
|
|
335
336
|
BleTask* task = characteristicExtras.task;
|
|
336
337
|
|
|
337
338
|
@synchronized(task) {
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
return SimpleBLE::ByteArray((const char*)characteristicExtras.value.bytes, characteristicExtras.value.length);
|
|
339
|
+
@synchronized(self) {
|
|
340
|
+
task.error = nil;
|
|
341
|
+
task.pending = YES;
|
|
342
|
+
characteristicExtras.readPending = YES;
|
|
343
|
+
characteristicExtras.value = nil;
|
|
344
|
+
[self.peripheral readValueForCharacteristic:characteristic];
|
|
345
|
+
}
|
|
347
346
|
|
|
348
|
-
|
|
349
|
-
// Otherwise, we'll trigger a value read and wait for the response.
|
|
350
|
-
@synchronized(self) {
|
|
351
|
-
task.error = nil;
|
|
352
|
-
task.pending = YES;
|
|
353
|
-
[self.peripheral readValueForCharacteristic:characteristic];
|
|
354
|
-
}
|
|
347
|
+
WAIT_UNTIL_FALSE(self, task.pending);
|
|
355
348
|
|
|
356
|
-
|
|
349
|
+
BOOL answered = NO;
|
|
350
|
+
@synchronized(self) {
|
|
351
|
+
answered = !characteristicExtras.readPending;
|
|
352
|
+
characteristicExtras.readPending = NO;
|
|
353
|
+
}
|
|
357
354
|
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
355
|
+
// NOTE: A disconnect, or a change to the peripheral's services, ends the wait without an answer.
|
|
356
|
+
if (!answered) {
|
|
357
|
+
NSError* reason = self.peripheral.state == CBPeripheralStateConnected ? nil : _disconnectionError;
|
|
358
|
+
[self throwBasedOnError:reason withFormat:@"Characteristic %@ Read", characteristic.UUID];
|
|
359
|
+
}
|
|
361
360
|
|
|
362
|
-
|
|
361
|
+
if (task.error != nil) {
|
|
362
|
+
[self throwBasedOnError:task.error withFormat:@"Characteristic %@ Read", characteristic.UUID];
|
|
363
363
|
}
|
|
364
|
+
|
|
365
|
+
return SimpleBLE::ByteArray((const char*)characteristicExtras.value.bytes, characteristicExtras.value.length);
|
|
364
366
|
}
|
|
365
367
|
}
|
|
366
368
|
|
|
@@ -674,26 +676,25 @@ static SimpleBLE::ByteArray descriptorValueToByteArray(id value) {
|
|
|
674
676
|
- (void)peripheral:(CBPeripheral*)peripheral didUpdateValueForCharacteristic:(CBCharacteristic*)characteristic error:(NSError*)error {
|
|
675
677
|
CharacteristicExtras* characteristicExtras = [self.characteristicExtras objectForKey:uuidToString(characteristic.UUID)];
|
|
676
678
|
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
679
|
+
// NOTE: CoreBluetooth reports read responses and notifications the same way, so while a read is pending
|
|
680
|
+
// the next update completes it, and it also reaches the callback if the characteristic is notifying.
|
|
681
|
+
std::function<void(SimpleBLE::ByteArray)> valueChangedCallback;
|
|
682
|
+
SimpleBLE::ByteArray payload;
|
|
683
|
+
@synchronized(self) {
|
|
684
|
+
if (characteristicExtras.readPending) {
|
|
685
|
+
characteristicExtras.readPending = NO;
|
|
682
686
|
characteristicExtras.value = characteristic.value;
|
|
683
|
-
|
|
684
|
-
|
|
687
|
+
characteristicExtras.task.error = error;
|
|
688
|
+
characteristicExtras.task.pending = NO;
|
|
685
689
|
}
|
|
686
690
|
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
// If the characteristic is not notifying, then this is a response to a read request.
|
|
691
|
-
BleTask* task = characteristicExtras.task;
|
|
692
|
-
@synchronized(self) {
|
|
693
|
-
task.error = error;
|
|
694
|
-
task.pending = NO;
|
|
691
|
+
if (characteristic.isNotifying && error == nil) {
|
|
692
|
+
valueChangedCallback = characteristicExtras->valueChangedCallback;
|
|
693
|
+
payload = SimpleBLE::ByteArray((const char*)characteristic.value.bytes, characteristic.value.length);
|
|
695
694
|
}
|
|
696
695
|
}
|
|
696
|
+
|
|
697
|
+
SAFE_CALLBACK_CALL(valueChangedCallback, std::move(payload));
|
|
697
698
|
}
|
|
698
699
|
|
|
699
700
|
- (void)peripheral:(CBPeripheral*)peripheral didWriteValueForCharacteristic:(CBCharacteristic*)characteristic error:(NSError*)error {
|