simplejsble 0.0.28 → 0.0.30

package/NitroSimplejsble.podspec

@@ -10,31 +10,36 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => min_ios_version_supported }
+  s.platforms    = {
+    :ios => min_ios_version_supported,
+    :osx => '10.13'
+  }
 
   s.source = { :path => "." }
 
   # Build SimpleBLE from source only if XCFramework doesn't exist
   # When installed from npm, the pre-built XCFramework is already included
   s.prepare_command = <<-CMD
-    # Build iOS XCFramework if not present
+    # Build iOS/macOS XCFramework if not present
     if [ -d "ios/SimpleBLE.xcframework" ]; then
-      echo "SimpleBLE.xcframework (iOS) already exists, skipping build"
+      echo "SimpleBLE.xcframework already exists, skipping build"
     else
-      echo "Building SimpleBLE for iOS..."
+      echo "Building SimpleBLE for iOS and macOS..."
       set -e
       IOS_DIR="ios"
       IOS_DEPLOYMENT_TARGET="${IOS_DEPLOYMENT_TARGET:-13.4}"
-      
-      build_for_platform() {
+      MACOS_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET:-10.13}"
+
+      # Build for iOS platforms (iphoneos, iphonesimulator)
+      build_for_ios_platform() {
           local PLATFORM=$1  # iphoneos or iphonesimulator
           local ARCH=$2      # arm64 or x86_64
-      
+
           local BUILD_DIR="${IOS_DIR}/build_${PLATFORM}_${ARCH}"
           local INSTALL_DIR="${IOS_DIR}/simpleble_${PLATFORM}_${ARCH}"
-      
+
           echo "Building SimpleBLE for ${PLATFORM} (${ARCH})..."
-      
+
           cmake -B "${BUILD_DIR}" -S "${IOS_DIR}" \
               -DCMAKE_BUILD_TYPE=Release \
               -DCMAKE_SYSTEM_NAME=iOS \
@@ -44,31 +49,74 @@ Pod::Spec.new do |s|
               -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
               -DBUILD_SHARED_LIBS=OFF \
               -DSIMPLEBLE_EXCLUDE_C=ON
-      
+
+          cmake --build "${BUILD_DIR}" --config Release --parallel
+          cmake --install "${BUILD_DIR}" --config Release
+
+          echo "Installed to ${INSTALL_DIR}"
+      }
+
+      # Build for macOS platforms
+      build_for_macos_platform() {
+          local ARCH=$1  # arm64 or x86_64
+
+          local BUILD_DIR="${IOS_DIR}/build_macosx_${ARCH}"
+          local INSTALL_DIR="${IOS_DIR}/simpleble_macosx_${ARCH}"
+
+          echo "Building SimpleBLE for macOS (${ARCH})..."
+
+          cmake -B "${BUILD_DIR}" -S "${IOS_DIR}" \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_SYSTEM_NAME=Darwin \
+              -DCMAKE_OSX_SYSROOT="macosx" \
+              -DCMAKE_OSX_ARCHITECTURES="${ARCH}" \
+              -DCMAKE_OSX_DEPLOYMENT_TARGET="${MACOS_DEPLOYMENT_TARGET}" \
+              -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+              -DBUILD_SHARED_LIBS=OFF \
+              -DSIMPLEBLE_EXCLUDE_C=ON
+
           cmake --build "${BUILD_DIR}" --config Release --parallel
           cmake --install "${BUILD_DIR}" --config Release
-      
+
           echo "Installed to ${INSTALL_DIR}"
       }
-      
-      # Build for device
-      build_for_platform "iphoneos" "arm64"
-      
-      # Build for simulator (Apple Silicon)
-      build_for_platform "iphonesimulator" "arm64"
-      
-      # Create XCFramework from the static libraries
+
+      # Build for iOS device
+      build_for_ios_platform "iphoneos" "arm64"
+
+      # Build for iOS simulator (Apple Silicon)
+      build_for_ios_platform "iphonesimulator" "arm64"
+
+      # Build for macOS (Apple Silicon)
+      build_for_macos_platform "arm64"
+
+      # Build for macOS (Intel)
+      build_for_macos_platform "x86_64"
+
+      # Create universal macOS library
+      echo "Creating universal macOS library..."
+      MACOS_UNIVERSAL_DIR="${IOS_DIR}/simpleble_macosx_universal"
+      mkdir -p "${MACOS_UNIVERSAL_DIR}/lib"
+      cp -r "${IOS_DIR}/simpleble_macosx_arm64/include" "${MACOS_UNIVERSAL_DIR}/"
+      lipo -create \
+          "${IOS_DIR}/simpleble_macosx_arm64/lib/libsimpleble.a" \
+          "${IOS_DIR}/simpleble_macosx_x86_64/lib/libsimpleble.a" \
+          -output "${MACOS_UNIVERSAL_DIR}/lib/libsimpleble.a"
+
+      # Create XCFramework from the static libraries (iOS + macOS)
       echo "Creating XCFramework..."
       XCFRAMEWORK_PATH="${IOS_DIR}/SimpleBLE.xcframework"
       rm -rf "${XCFRAMEWORK_PATH}"
-      
+
       xcodebuild -create-xcframework \
           -library "${IOS_DIR}/simpleble_iphoneos_arm64/lib/libsimpleble.a" \
           -headers "${IOS_DIR}/simpleble_iphoneos_arm64/include" \
           -library "${IOS_DIR}/simpleble_iphonesimulator_arm64/lib/libsimpleble.a" \
           -headers "${IOS_DIR}/simpleble_iphonesimulator_arm64/include" \
+          -library "${MACOS_UNIVERSAL_DIR}/lib/libsimpleble.a" \
+          -headers "${MACOS_UNIVERSAL_DIR}/include" \
           -output "${XCFRAMEWORK_PATH}"
-      
+
       echo "SimpleBLE build complete!"
       echo "XCFramework created at: ${XCFRAMEWORK_PATH}"
     fi
@@ -95,9 +143,12 @@ Pod::Spec.new do |s|
 
   # Required frameworks for SimpleBLE
   s.frameworks = ['Foundation', 'CoreBluetooth']
+  # macOS requires additional frameworks for classic Bluetooth support
+  s.osx.frameworks = ['Foundation', 'CoreBluetooth', 'IOBluetooth', 'IOKit']
 
-  # Vendored XCFramework containing all architectures
+  # Vendored XCFramework containing all architectures (iOS + macOS)
   s.ios.vendored_frameworks = 'ios/SimpleBLE.xcframework'
+  s.osx.vendored_frameworks = 'ios/SimpleBLE.xcframework'
 
   # Configure header search paths for SimpleBLE
   current_pod_target_xcconfig = s.attributes_hash['pod_target_xcconfig'] || {}
@@ -107,6 +158,11 @@ Pod::Spec.new do |s|
       # iOS header paths
       '"$(PODS_TARGET_SRCROOT)/ios/simpleble_iphoneos_arm64/include"',
       '"$(PODS_TARGET_SRCROOT)/ios/simpleble_iphonesimulator_arm64/include"',
+      # macOS header paths
+      '"$(PODS_TARGET_SRCROOT)/ios/simpleble_macosx_arm64/include"',
+      '"$(PODS_TARGET_SRCROOT)/ios/simpleble_macosx_x86_64/include"',
+      '"$(PODS_TARGET_SRCROOT)/ios/simpleble_macosx_universal/include"',
     ].join(' '),
+    'GCC_PREPROCESSOR_DEFINITIONS' => ['$(inherited)', 'OS_OBJECT_USE_OBJC=1']
   })
 end

package/VERSION

@@ -1 +1 @@
-0.10.4
+0.11.0

package/android/SIMPLEDROIDBRIDGE_INTEGRATION.md

@@ -0,0 +1,77 @@
+# SimpleDroidBridge Integration Decision
+
+## Current Approach
+
+In `build.gradle`, the simpledroidbridge Java sources are included directly:
+
+```gradle
+sourceSets {
+  main {
+    java.srcDirs += ["../simpledroidbridge/src/main/java"]
+  }
+}
+```
+
+## Why Not Use `implementation project(":simpledroidbridge")`?
+
+### Option 1: `java.srcDirs` (Current)
+
+Compiles simpledroidbridge sources directly into the main library.
+
+**Pros:**
+- No configuration needed in consumer app
+- Works seamlessly in npm package context
+- No build config conflicts
+- React Native autolinking works out of the box
+
+**Cons:**
+- Sources compiled together (single output)
+
+### Option 2: `implementation project(":simpledroidbridge")`
+
+Would treat simpledroidbridge as a separate Gradle module dependency.
+
+**Pros:**
+- Cleaner separation of modules
+- Could be reused independently
+
+**Cons:**
+- Requires consumer app's `settings.gradle.kts` to include:
+  ```kotlin
+  include(":simpledroidbridge")
+  project(":simpledroidbridge").projectDir = File("node_modules/simplejsble/simpledroidbridge")
+  ```
+- `simpledroidbridge/build.gradle.kts` has its own SDK versions (`compileSdk = 31`, `minSdk = 31`) which may conflict with consumer apps
+- React Native autolinking doesn't handle transitive local project dependencies
+- Complex path resolution for npm packages
+
+## Comparison
+
+| Aspect | `java.srcDirs` | `project(":simpledroidbridge")` |
+|--------|----------------|--------------------------------|
+| Consumer setup | None required | Must modify settings.gradle |
+| Build config conflicts | None | Possible SDK version conflicts |
+| npm package compatibility | Works out of the box | Complex path resolution |
+| Autolinking | Works | Not supported |
+
+## Conclusion
+
+The `java.srcDirs` approach is the right choice for npm package distribution. Converting to a project dependency would add unnecessary friction for package consumers.
+
+## Package Structure
+
+The npm package bundles simpledroidbridge (defined in `package.json`):
+
+```json
+{
+  "files": [
+    "android/",
+    "simpledroidbridge/",
+    ...
+  ]
+}
+```
+
+This allows the relative path `../simpledroidbridge/src/main/java` to work correctly from the `android/` folder in both:
+- Monorepo development
+- npm package installation (`node_modules/simplejsble/`)

package/android/build.gradle

@@ -107,8 +107,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_1_9
+    targetCompatibility JavaVersion.VERSION_1_9
   }
 
   sourceSets {

package/android/gradle.properties

@@ -1,5 +1,5 @@
 NitroSimplejsble_kotlinVersion=2.1.20
-NitroSimplejsble_minSdkVersion=23
-NitroSimplejsble_targetSdkVersion=36
-NitroSimplejsble_compileSdkVersion=36
+NitroSimplejsble_minSdkVersion=31
+NitroSimplejsble_targetSdkVersion=31
+NitroSimplejsble_compileSdkVersion=31
 NitroSimplejsble_ndkVersion=27.1.12297006

package/dependencies/external/kvn/kvn_bytearray.h

@@ -3,6 +3,7 @@
 
 #include <cstdint>
 #include <cstring>
+#include <initializer_list>
 #include <iomanip>
 #include <iostream>
 #include <memory>
@@ -30,6 +31,12 @@ class bytearray {
      */
     bytearray(const std::vector<uint8_t>& vec) : data_(vec) {}
 
+    /**
+     * @brief Constructs byte array from an initializer list of uint8_t.
+     * @param list An initializer list of uint8_t.
+     */
+    bytearray(std::initializer_list<uint8_t> list) : data_(list) {}
+
     /**
      * @brief Constructs byte array from a raw pointer and size.
      * @param ptr A pointer to uint8_t data.

package/ios/CMAKE_INSTALL_OPTIONS.md

@@ -0,0 +1,50 @@
+# CMake Install Options Reference
+
+## Install Target Destinations
+
+| Destination | Purpose | File Types |
+|-------------|---------|------------|
+| `ARCHIVE` | Static libraries and import libraries | `.a`, `.lib` (Windows import libs) |
+| `LIBRARY` | Shared libraries | `.so`, `.dylib` |
+| `RUNTIME` | Executables and DLLs | `.exe`, `.dll` |
+
+## Recommended Variables (via `GNUInstallDirs`)
+
+```cmake
+include(GNUInstallDirs)
+```
+
+| Variable | Default Value | Purpose |
+|----------|---------------|---------|
+| `CMAKE_INSTALL_LIBDIR` | `lib` | Library installation directory |
+| `CMAKE_INSTALL_INCLUDEDIR` | `include` | Header installation directory |
+| `CMAKE_INSTALL_BINDIR` | `bin` | Binary/executable installation directory |
+
+## Current iOS CMakeLists.txt
+
+```cmake
+install(TARGETS simpleble ARCHIVE DESTINATION lib)
+
+install(DIRECTORY ${PROJECT_ROOT_DIR}/simpleble/include/simpleble/ DESTINATION include/simpleble)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/simpleble/export/simpleble/ DESTINATION include/simpleble)
+install(FILES ${PROJECT_ROOT_DIR}/dependencies/external/kvn/kvn_bytearray.h DESTINATION include/simpleble/kvn)
+```
+
+## Recommended Update (matching main simpleble pattern)
+
+```cmake
+include(GNUInstallDirs)
+
+install(TARGETS simpleble ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+install(DIRECTORY ${PROJECT_ROOT_DIR}/simpleble/include/simpleble/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simpleble)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/simpleble/export/simpleble/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simpleble)
+install(FILES ${PROJECT_ROOT_DIR}/dependencies/external/kvn/kvn_bytearray.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/simpleble/kvn)
+```
+
+## Notes
+
+- For iOS static builds (`BUILD_SHARED_LIBS OFF`), only `ARCHIVE` is needed
+- `LIBRARY` is unnecessary since we're not building shared libraries
+- Using CMake variables instead of hardcoded paths improves portability
+- Header installation is required separately from library installation for XCFramework builds

package/lib/index.js

@@ -0,0 +1,2 @@
+import { NitroModules } from "react-native-nitro-modules";
+export const HybridAdapter = NitroModules.createHybridObject("Adapter");

package/lib/specs/Adapter.nitro.js

@@ -0,0 +1 @@
+import {} from 'react-native-nitro-modules';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "simplejsble",
-  "version": "0.0.28",
+  "version": "0.0.30",
   "description": "React Native Bluetooth Low Energy library using SimpleBLE with Nitro Modules",
   "main": "lib/index",
   "module": "lib/index",
@@ -29,7 +29,7 @@
     "prepack": "npm run build && npx nitrogen && bash scripts/prepare-package.sh",
     "typecheck": "tsc --noEmit",
     "build": "tsc",
-    "clean": "rm -rf simpleble simpledroidbridge cmake dependencies VERSION nitrogen lib android/build android/.cxx android/.gradle ios/build_iphoneos_arm64 ios/build_iphonesimulator_arm64 ios/simpleble_iphoneos_arm64 ios/simpleble_iphonesimulator_arm64 ios/SimpleBLE.xcframework",
+    "clean": "rm -rf simpleble simpledroidbridge cmake dependencies VERSION nitrogen lib tsconfig.tsbuildinfo android/build android/.cxx android/.gradle ios/build_iphoneos_arm64 ios/build_iphonesimulator_arm64 ios/simpleble_iphoneos_arm64 ios/simpleble_iphonesimulator_arm64 ios/build_macosx_arm64 ios/build_macosx_x86_64 ios/simpleble_macosx_arm64 ios/simpleble_macosx_x86_64 ios/simpleble_macosx_universal ios/SimpleBLE.xcframework",
     "lint": "eslint \"**/*.{js,ts,tsx}\" --fix",
     "prepublishOnly": "npm run typecheck",
     "postpublish": "npm run clean",
@@ -44,7 +44,8 @@
     "nitro",
     "nitro-modules",
     "ios",
-    "android"
+    "android",
+    "macos"
   ],
   "repository": {
     "type": "git",

package/simpleble/CMakeLists.txt

@@ -166,12 +166,7 @@ set(SIMPLEBLE_DONGL_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/d2h.pb.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/h2d.pb.c
     ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/basic.pb.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/simpleble.pb.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/softdevice.pb.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/softdevice_gap.pb.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/softdevice_gattc.pb.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/softdevice_gatts.pb.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/softdevice_types.pb.c)
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/backends/dongl/protocol/simpleble.pb.c)
 
 if(SIMPLEBLE_PLAIN)
     list(APPEND SIMPLEBLE_DONGL_SOURCES

package/simpleble/src/backends/dongl/AdapterDongl.cpp

@@ -31,9 +31,6 @@ AdapterDongl::AdapterDongl(const std::string& device_path)
 
     _serial_protocol->set_event_callback([this](const dongl_Event& event) {
         switch (event.which_evt) {
-            case dongl_Event_softdevice_tag:
-                _on_softdevice_event(event.evt.softdevice);
-                break;
             case dongl_Event_simpleble_tag:
                 _on_simpleble_event(event.evt.simpleble);
                 break;
@@ -225,145 +222,15 @@ void AdapterDongl::_on_simpleble_event(const simpleble_Event& event) {
             }
             break;
         }
-    }
-}
 
-void AdapterDongl::_on_softdevice_event(const sd_Event& event) {
-    // //fmt::print("Received event: {}\n", event.which_evt);
-
-    // switch (event.which_evt) {
-    //     case sd_Event_gap_adv_report_tag: {
-    //         BluetoothAddress mac_address = fmt::format(
-    //             "{:02X}:{:02X}:{:02X}:{:02X}:{:02X}:{:02X}", event.evt.gap_adv_report.peer_addr.addr[0],
-    //             event.evt.gap_adv_report.peer_addr.addr[1], event.evt.gap_adv_report.peer_addr.addr[2],
-    //             event.evt.gap_adv_report.peer_addr.addr[3], event.evt.gap_adv_report.peer_addr.addr[4],
-    //             event.evt.gap_adv_report.peer_addr.addr[5]);
-
-    //         BluetoothAddressType address_type = SimpleBLE::BluetoothAddressType::UNSPECIFIED;
-    //         if (event.evt.gap_adv_report.peer_addr.addr_type == sd_types_BleGapAddrType_BLE_GAP_ADDR_TYPE_PUBLIC) {
-    //             address_type = SimpleBLE::BluetoothAddressType::PUBLIC;
-    //         } else if (event.evt.gap_adv_report.peer_addr.addr_type ==
-    //                        sd_types_BleGapAddrType_BLE_GAP_ADDR_TYPE_RANDOM_STATIC ||
-    //                    event.evt.gap_adv_report.peer_addr.addr_type ==
-    //                        sd_types_BleGapAddrType_BLE_GAP_ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE) {
-    //             address_type = SimpleBLE::BluetoothAddressType::RANDOM;
-    //         }
-
-    //         std::string identifier = "";
-    //         std::map<uint16_t, ByteArray> manufacturer_data = {};
-    //         std::map<BluetoothUUID, ByteArray> service_data = {};
-
-    //         // Parse the advertising data
-    //         size_t offset = 0;
-    //         while (offset < event.evt.gap_adv_report.data.len) {
-    //             if (offset + 1 >= event.evt.gap_adv_report.data.len) break;
-
-    //             uint8_t length = event.evt.gap_adv_report.data.data.bytes[offset++];
-    //             if (length == 0 || offset + length > event.evt.gap_adv_report.data.len) break;
-
-    //             if (offset >= event.evt.gap_adv_report.data.len) break;
-    //             uint8_t ad_type = event.evt.gap_adv_report.data.data.bytes[offset++];
-
-    //             size_t data_length = length - 1;  // AD Type takes 1 byte
-    //             if (data_length == 0 || offset + data_length > event.evt.gap_adv_report.data.len) break;
-
-    //             switch (ad_type) {
-    //                 case 0x08:  // Shortened Local Name
-    //                 case 0x09:  // Complete Local Name
-    //                     if (data_length > 0) {
-    //                         identifier = std::string(
-    //                             reinterpret_cast<const char*>(&event.evt.gap_adv_report.data.data.bytes[offset]),
-    //                             data_length);
-    //                     }
-    //                     break;
-
-    //                 case 0xFF:  // Manufacturer Specific Data
-    //                     if (data_length >= 2) {  // Need at least company ID (2 bytes)
-    //                         uint16_t company_id = event.evt.gap_adv_report.data.data.bytes[offset] |
-    //                                              (event.evt.gap_adv_report.data.data.bytes[offset + 1] << 8);
-    //                         ByteArray manufacturer_bytes(
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + 2],
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + data_length]);
-    //                         manufacturer_data[company_id] = manufacturer_bytes;
-    //                     }
-    //                     break;
-
-    //                 case 0x16:  // Service Data - 16-bit UUID
-    //                     if (data_length >= 2) {  // Need at least UUID (2 bytes)
-    //                         uint16_t service_uuid_16 = event.evt.gap_adv_report.data.data.bytes[offset] |
-    //                                                   (event.evt.gap_adv_report.data.data.bytes[offset + 1] << 8);
-    //                         BluetoothUUID service_uuid = fmt::format("{:04x}", service_uuid_16);
-    //                         ByteArray service_bytes(
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + 2],
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + data_length]);
-    //                         service_data[service_uuid] = service_bytes;
-    //                     }
-    //                     break;
-
-    //                 case 0x20:  // Service Data - 32-bit UUID
-    //                     if (data_length >= 4) {  // Need at least UUID (4 bytes)
-    //                         uint32_t service_uuid_32 = event.evt.gap_adv_report.data.data.bytes[offset] |
-    //                                                   (event.evt.gap_adv_report.data.data.bytes[offset + 1] << 8) |
-    //                                                   (event.evt.gap_adv_report.data.data.bytes[offset + 2] << 16) |
-    //                                                   (event.evt.gap_adv_report.data.data.bytes[offset + 3] << 24);
-    //                         BluetoothUUID service_uuid = fmt::format("{:08x}", service_uuid_32);
-    //                         ByteArray service_bytes(
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + 4],
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + data_length]);
-    //                         service_data[service_uuid] = service_bytes;
-    //                     }
-    //                     break;
-
-    //                 case 0x21:  // Service Data - 128-bit UUID
-    //                     if (data_length >= 16) {  // Need at least UUID (16 bytes)
-    //                         // Convert to UUID string format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-    //                         BluetoothUUID service_uuid = fmt::format(
-    //                             "{:02x}{:02x}{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}-{:02x}{:02x}{:02x}{:02x}{:02x}{:02x}",
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 15],  // Little endian byte order
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 14],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 13],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 12],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 11],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 10],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 9],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 8],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 7],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 6],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 5],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 4],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 3],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 2],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset + 1],
-    //                             event.evt.gap_adv_report.data.data.bytes[offset]);
-    //                         ByteArray service_bytes(
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + 16],
-    //                             &event.evt.gap_adv_report.data.data.bytes[offset + data_length]);
-    //                         service_data[service_uuid] = service_bytes;
-    //                     }
-    //                     break;
-
-    //                 default:
-    //                     // Skip unknown AD types
-    //                     break;
-    //             }
-
-    //             offset += data_length;
-    //         }
-
-    //         auto advertising_data = advertising_data_t{
-    //             .identifier = identifier,
-    //             .address_type = address_type,
-    //             .mac_address = mac_address,
-    //             .connectable = event.evt.gap_adv_report.type.connectable,
-    //             .rssi = event.evt.gap_adv_report.rssi,
-    //             .tx_power = event.evt.gap_adv_report.tx_power,
-    //             .manufacturer_data = manufacturer_data,
-    //             .service_data = service_data,
-    //         };
-    //         _scan_received_callback(advertising_data);
-    //         break;
-    //     }
-    //     default:
-    //         break;
-    // }
+        case simpleble_Event_value_changed_evt_tag: {
+            for (auto& [address, peripheral] : this->peripherals_) {
+                if (peripheral->conn_handle() == event.evt.value_changed_evt.conn_handle) {
+                    peripheral->notify_value_changed(event.evt.value_changed_evt);
+                    break;
+                }
+            }
+            break;
+        }
+    }
 }

package/simpleble/src/backends/dongl/AdapterDongl.h

@@ -48,7 +48,6 @@ class AdapterDongl : public AdapterBase {
 
   private:
     void _scan_received_callback(advertising_data_t data);
-    void _on_softdevice_event(const sd_Event& event);
     void _on_simpleble_event(const simpleble_Event& event);
 
     std::shared_ptr<Dongl::Serial::Protocol> _serial_protocol;