bump simpleble version (#753)

* Bump simpleble version

Signed-off-by: Andrey Parfenov <[email protected]>

.github/workflows/deploy_cpp_libs.yml

@@ -59,7 +59,7 @@ jobs:
       max-parallel: 16
       matrix:
         build_type: [Release, Debug]
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-13]
 
     steps:
     - name: Clone Repository
@@ -69,13 +69,13 @@ jobs:
       with:
         cmake-version: '3.21.x'
     - name: Install Ninja
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       uses: seanmiddleditch/gha-setup-ninja@master
       with:
         version: 1.10.2
     # build simpleble outside from brainflow because of different deployment targets
     - name: Compile SimpleBLE MacOS
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       run: |
         mkdir $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
         cd $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
@@ -86,7 +86,7 @@ jobs:
       env:
         BUILD: ${{ matrix.build_type }}
     - name: Compile BrainFlow for MacOS
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       run: |
         mkdir $GITHUB_WORKSPACE/build
         cd $GITHUB_WORKSPACE/build

.github/workflows/run_unix.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-13]
 
     steps:
     # compile and prepare env
@@ -45,7 +45,7 @@ jobs:
       run: |
         npm install -g ts-node
     - name: Install Ninja
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       uses: seanmiddleditch/gha-setup-ninja@master
       with:
         version: 1.10.2
@@ -63,15 +63,15 @@ jobs:
         java-version: 11.0.3
     # build simpleble outside from brainflow because of different deployment targets
     - name: Compile SimpleBLE MacOS
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       run: |
         mkdir $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
         cd $GITHUB_WORKSPACE/third_party/SimpleBLE/simpleble/build
         cmake -G Ninja -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/installed -DCMAKE_BUILD_TYPE=Release ..
         ninja
         ninja install
     - name: Compile BrainFlow MacOS
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       run: |
         mkdir $GITHUB_WORKSPACE/build
         cd $GITHUB_WORKSPACE/build
@@ -154,7 +154,7 @@ jobs:
     - name: Run unit tests
       run: $GITHUB_WORKSPACE/build/tests/brainflow_tests
     - name: Synthetic C# Test MacOS
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       run: |
         cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/brainflow_get_data/bin/Release/net7.0
         cp $GITHUB_WORKSPACE/installed/lib/libBoardController.dylib $GITHUB_WORKSPACE/csharp_package/brainflow/examples/brainflow_get_data/bin/Release/net7.0/
@@ -164,7 +164,7 @@ jobs:
         LD_LIBRARY_PATH: ${{ github.workspace }}/installed/lib
         DYLD_LIBRARY_PATH: ${{ github.workspace }}/installed/lib
     - name: EEG Metrics C# Test MacOS
-      if: (matrix.os == 'macos-12')
+      if: (matrix.os == 'macos-13')
       run: |
         cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/eeg_metrics/bin/Release/net7.0
         cp $GITHUB_WORKSPACE/installed/lib/libBoardController.dylib $GITHUB_WORKSPACE/csharp_package/brainflow/examples/eeg_metrics/bin/Release/net7.0/
@@ -411,7 +411,7 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     - name: Push Libraries MacOS Dev
-      if: ${{ github.event_name == 'push' && matrix.os == 'macos-12' && github.repository == 'brainflow-dev/brainflow' }}
+      if: ${{ github.event_name == 'push' && matrix.os == 'macos-13' && github.repository == 'brainflow-dev/brainflow' }}
       run: |
         aws s3 cp $GITHUB_WORKSPACE/installed/lib/ s3://brainflow/$GITHUB_SHA/macos_release --recursive
       env:

.github/workflows/test_release.yml

@@ -47,7 +47,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        os: [ubuntu-20.04, macos-12]
+        os: [ubuntu-20.04, macos-13]
 
     steps:
     # install dependencies

src/board_controller/aavaa/aavaa_v3.cpp

@@ -28,8 +28,8 @@ void aavaa_adapter_1_on_scan_found (
     ((AAVAAv3 *)(board))->adapter_1_on_scan_found (adapter, peripheral);
 }
 
-void aavaa_read_notifications (simpleble_uuid_t service, simpleble_uuid_t characteristic,
-    uint8_t *data, size_t size, void *board)
+void aavaa_read_notifications (simpleble_peripheral_t handle, simpleble_uuid_t service,
+    simpleble_uuid_t characteristic, const uint8_t *data, size_t size, void *board)
 {
     ((AAVAAv3 *)(board))->read_data (service, characteristic, data, size);
 }
@@ -469,7 +469,7 @@ void AAVAAv3::adapter_1_on_scan_found (
 }
 
 void AAVAAv3::read_data (
-    simpleble_uuid_t service, simpleble_uuid_t characteristic, uint8_t *data, size_t size)
+    simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t *data, size_t size)
 {
     safe_logger (spdlog::level::trace, "received {} number of bytes", size);
 

src/board_controller/aavaa/inc/aavaa_v3.h

@@ -26,8 +26,8 @@ class AAVAAv3 : public BLELibBoard
     void adapter_1_on_scan_start (simpleble_adapter_t adapter);
     void adapter_1_on_scan_stop (simpleble_adapter_t adapter);
     void adapter_1_on_scan_found (simpleble_adapter_t adapter, simpleble_peripheral_t peripheral);
-    void read_data (
-        simpleble_uuid_t service, simpleble_uuid_t characteristic, uint8_t *data, size_t size);
+    void read_data (simpleble_uuid_t service, simpleble_uuid_t characteristic, const uint8_t *data,
+        size_t size);
     std::deque<uint8_t> Incoming_BLE_Data_Buffer;
     std::string device_status;