revert simpleBLE to #753

brainflow-dev · Jan 7, 2025 · 9db0634 · 9db0634
1 parent 24c0ce0
commit 9db0634
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/third_party/SimpleBLE/docs/extras.rst b/third_party/SimpleBLE/docs/extras.rst
@@ -34,7 +34,7 @@ performed:
    - ``VERSION``
    - ``Cargo.toml``
    - ``docs/changelog.rst``
-   - ``setup.py`` (Add or remove the ``.devX`` suffix as needed.)
+   - ``setup.py``
 
 #. Commit the changes to the repository.
 
@@ -46,14 +46,8 @@ performed:
 
 #. Wait for ci_release.yml to finish.
 
-#. Run the CI job to build and upload the artifacts to GitHub.
-
-#. Perform a manual release of the Rust crate to crates.io.
-   - ``cargo publish`` (Ensure that the version number in ``Cargo.toml`` is correct.)
-
 #. Advance the version number in the following files:
 
    - ``VERSION``
    - ``Cargo.toml``
-   - ``docs/changelog.rst``
-   - ``setup.py`` (Add or remove the ``.devX`` suffix as needed.)
+   - ``docs/changelog.rst``
diff --git a/third_party/SimpleBLE/simpleble/CMakeLists.txt b/third_party/SimpleBLE/simpleble/CMakeLists.txt
@@ -10,10 +10,10 @@ project(
     LANGUAGES CXX
 )
 
-if (APPLE)
+if(APPLE)
     SET(SIMPLEBLE-C simpleble-c)
     SET(FILE_NAME "libsimpleble-c.dylib")
-elseif (UNIX)
+elseif(UNIX)
     SET(SIMPLEBLE-C simpleble-c)
     SET(FILE_NAME "libsimpleble-c.so")
 else()
@@ -24,7 +24,7 @@ else()
         SET(SIMPLEBLE-C simpleble-c32)
         SET(FILE_NAME "simpleble-c32.dll")
     endif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-endif (APPLE)
+endif(APPLE)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/epilogue.cmake)
 
@@ -34,14 +34,6 @@ include(GNUInstallDirs)
 option(SIMPLEBLE_PLAIN "Use plain version of SimpleBLE" OFF)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../fmt ${CMAKE_CURRENT_BINARY_DIR}/libfmt)
-#if(NOT TARGET fmt::fmt-header-only)
-#    option(LIBFMT_VENDORIZE "Enable vendorized libfmt" ON)
-#    find_package(fmt REQUIRED)
-
-#    if(TARGET fmt)
-#        set_target_properties(fmt PROPERTIES EXCLUDE_FROM_ALL TRUE)
-#    endif()
-#endif()
 
 if(SIMPLEBLE_TEST)
     message(STATUS "Building tests requires plain version of SimpleBLE")

diff --git a/third_party/SimpleBLE/simpleble/src/backends/android/android/BluetoothGattCharacteristic.h b/third_party/SimpleBLE/simpleble/src/backends/android/android/BluetoothGattCharacteristic.h
@@ -17,12 +17,14 @@ class BluetoothGattCharacteristic {
     //    bool addDescriptor(BluetoothGattDescriptor descriptor);
     //    BluetoothGattDescriptor getDescriptor(std::string uuid);
     std::vector<BluetoothGattDescriptor> getDescriptors();
+
     int getInstanceId();
     int getPermissions();
     int getProperties();
     std::string getUuid();
     int getWriteType();
     void setWriteType(int writeType);
+
     bool setValue(const std::vector<uint8_t>& value);
 
     JNI::Object getObject() const { return _obj; }