Add write with no response

#20
mongoose-os-libs · Aug 5, 2020 · 3b818c3 · 3b818c3
1 parent 9262dc5
commit 3b818c3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.clang-format b/.clang-format
@@ -3,3 +3,4 @@ AllowShortFunctionsOnASingleLine: false
 SpaceAfterCStyleCast: true
 PointerBindsToType: false
 DerivePointerBinding: false
+IncludeBlocks: Preserve
diff --git a/include/mgos_bt_gattc.h b/include/mgos_bt_gattc.h
@@ -63,8 +63,8 @@ bool mgos_bt_gattc_discover(int conn_id);
 bool mgos_bt_gattc_disconnect(int conn_id);
 bool mgos_bt_gattc_read(int conn_id, uint16_t handle);
 bool mgos_bt_gattc_subscribe(int conn_id, uint16_t handle);
-bool mgos_bt_gattc_write(int conn_id, uint16_t handle, const void *data,
-                         int len);
+bool mgos_bt_gattc_write(int conn_id, uint16_t handle, struct mg_str data,
+                         bool resp_required);
 
 #ifdef __cplusplus
 }

diff --git a/src/esp32/esp32_bt_gattc.c b/src/esp32/esp32_bt_gattc.c
@@ -92,14 +92,15 @@ bool mgos_bt_gattc_subscribe(int conn_id, uint16_t handle) {
   return err == ESP_OK;
 }
 
-bool mgos_bt_gattc_write(int conn_id, uint16_t handle, const void *data,
-                         int len) {
+bool mgos_bt_gattc_write(int conn_id, uint16_t handle, struct mg_str data,
+                         bool resp_required) {
   if (esp32_bt_is_scanning()) return false;
   struct conn *conn = find_by_conn_id(conn_id);
   if (conn == NULL) return false;
-  esp_err_t err =
-      esp_ble_gattc_write_char(conn->iface, conn_id, handle, len, (void *) data,
-                               ESP_GATT_WRITE_TYPE_RSP, 0);
+  esp_gatt_write_type_t wt =
+      (resp_required ? ESP_GATT_WRITE_TYPE_RSP : ESP_GATT_WRITE_TYPE_NO_RSP);
+  esp_err_t err = esp_ble_gattc_write_char(conn->iface, conn_id, handle,
+                                           data.len, (void *) data.p, wt, 0);
   LOG(LL_DEBUG, ("WRITE %d: %d", conn_id, err));
   return err == ESP_OK;
 }

diff --git a/src/mgos_bt_js.c b/src/mgos_bt_js.c
@@ -104,7 +104,7 @@ bool mgos_bt_gattc_connect_js(const char *addr_s) {
 
 bool mgos_bt_gattc_write_js(int conn_id, uint16_t handle,
                             const struct mg_str *data) {
-  return mgos_bt_gattc_write(conn_id, handle, data->p, data->len);
+  return mgos_bt_gattc_write(conn_id, handle, *data, true /* resp_required */);
 }
 
 static const struct mjs_c_struct_member gattc_discovery_result_arg_def[] = {