Merge pull request #109 from taks/set_raw_data-error-code

convert BLE_ERR_INV_HCI_CMD_PARMS to BLE_HS_EINVAL
taks · Mar 4, 2024 · 50422d5 · 50422d5
2 parents 8e3f9fe + 734f162
commit 50422d5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/server/ble_advertising.rs b/src/server/ble_advertising.rs
@@ -90,12 +90,15 @@ impl BLEAdvertising {
   }
 
   pub fn set_raw_data(&mut self, data: &[u8]) -> Result<(), BLEError> {
-    unsafe {
-      ble!(esp_idf_sys::ble_gap_adv_set_data(
-        data.as_ptr(),
-        data.len() as i32
-      ))
-    }
+    let rc = unsafe { esp_idf_sys::ble_gap_adv_set_data(data.as_ptr(), data.len() as i32) } as u32;
+
+    // convert BLE_ERR_INV_HCI_CMD_PARMS to BLE_HS_EINVAL
+    // https://github.com/taks/esp32-nimble/issues/104
+    // https://github.com/apache/mynewt-nimble/issues/1717
+    ble!(match rc {
+      esp_idf_sys::ble_error_codes_BLE_ERR_INV_HCI_CMD_PARMS => esp_idf_sys::BLE_HS_EINVAL,
+      rc => rc,
+    })
   }
 
   pub fn set_raw_scan_response_data(&mut self, data: &[u8]) -> Result<(), BLEError> {