Added OnWriteDescriptorArgs, OnWriteArgs::notify

src/server/ble_characteristic.rs

@@ -291,21 +291,28 @@ impl BLECharacteristic {
           om = unsafe { (*om).om_next.sle_next };
         }
 
+        let mut notify = false;
+
         if let Some(callback) = &mut characteristic.on_write {
           let desc = crate::utilities::ble_gap_conn_find(conn_handle).unwrap();
           let mut arg = OnWriteArgs {
             recv_data: &buf,
             desc: &desc,
             reject: false,
             error_code: 0,
+            notify: false,
           };
           callback(&mut arg);
 
           if arg.reject {
             return arg.error_code as _;
           }
+          notify = arg.notify;
         }
         characteristic.set_value(&buf);
+        if notify {
+          characteristic.notify();
+        }
 
         0
       }

src/server/ble_descriptor.rs

@@ -9,7 +9,7 @@ use crate::{
     ble_npl_hw_enter_critical, ble_npl_hw_exit_critical, mutex::Mutex, os_mbuf_append,
     voidp_to_ref, BleUuid,
   },
-  AttValue, OnWriteArgs,
+  AttValue, OnWriteDescriptorArgs,
 };
 
 bitflags! {
@@ -32,7 +32,7 @@ pub struct BLEDescriptor {
   pub(crate) properties: DescriptorProperties,
   value: AttValue,
   on_read: Option<Box<dyn FnMut(&mut AttValue, &BLEConnDesc) + Send + Sync>>,
-  on_write: Option<Box<dyn FnMut(&mut OnWriteArgs) + Send + Sync>>,
+  on_write: Option<Box<dyn FnMut(&mut OnWriteDescriptorArgs) + Send + Sync>>,
 }
 
 impl BLEDescriptor {
@@ -70,7 +70,7 @@ impl BLEDescriptor {
 
   pub fn on_write(
     &mut self,
-    callback: impl FnMut(&mut OnWriteArgs) + Send + Sync + 'static,
+    callback: impl FnMut(&mut OnWriteDescriptorArgs) + Send + Sync + 'static,
   ) -> &mut Self {
     self.on_write = Some(Box::new(callback));
     self
@@ -125,7 +125,7 @@ impl BLEDescriptor {
 
         if let Some(callback) = &mut descriptor.on_write {
           let desc = crate::utilities::ble_gap_conn_find(conn_handle).unwrap();
-          let mut arg = OnWriteArgs {
+          let mut arg = OnWriteDescriptorArgs {
             recv_data: &buf,
             desc: &desc,
             reject: false,

src/server/mod.rs

@@ -35,3 +35,4 @@ pub mod hid;
 
 mod on_write_args;
 pub use self::on_write_args::OnWriteArgs;
+pub use self::on_write_args::OnWriteDescriptorArgs;

src/server/on_write_args.rs

@@ -5,6 +5,7 @@ pub struct OnWriteArgs<'a> {
   pub desc: &'a BLEConnDesc,
   pub(crate) reject: bool,
   pub(crate) error_code: u8,
+  pub(crate) notify: bool,
 }
 
 impl OnWriteArgs<'_> {
@@ -20,4 +21,30 @@ impl OnWriteArgs<'_> {
     self.reject = true;
     self.error_code = error_code;
   }
+
+  pub fn notify(&mut self) {
+    self.notify = true;
+  }
+}
+
+pub struct OnWriteDescriptorArgs<'a> {
+  pub recv_data: &'a [u8],
+  pub desc: &'a BLEConnDesc,
+  pub(crate) reject: bool,
+  pub(crate) error_code: u8,
+}
+
+impl OnWriteDescriptorArgs<'_> {
+  /// If the reject is called, no value is written to BLECharacteristic or BLEDescriptor.
+  /// A write error (0xFF) is sent to the sender.
+  pub fn reject(&mut self) {
+    self.reject_with_error_code(0xFF);
+  }
+
+  /// If the reject is called, no value is written to BLECharacteristic or BLEDescriptor.
+  /// The argument error code is sent to the sender.
+  pub fn reject_with_error_code(&mut self, error_code: u8) {
+    self.reject = true;
+    self.error_code = error_code;
+  }
 }