archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

fix regression with setAdvertising(undefined)

Browse Source
This commit is contained in:
Gordon Williams 2017-06-26 15:32:35 +01:00
parent 1f68f69d72
commit bb6b318372
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/bluetooth/jswrap_bluetooth.c
View File

@ -164,12 +164,12 @@ void jswrap_nrf_init() {
// advertising
v = jsvObjectGetChild(execInfo.hiddenRoot, BLE_NAME_ADVERTISE_DATA, 0);
o = jsvObjectGetChild(execInfo.hiddenRoot, BLE_NAME_ADVERTISE_OPTIONS, 0);
jswrap_nrf_bluetooth_setAdvertising(v, o);
if (v || o) jswrap_nrf_bluetooth_setAdvertising(v, o);
jsvUnLock2(v,o);
// services
v = jsvObjectGetChild(execInfo.hiddenRoot, BLE_NAME_SERVICE_DATA, 0);
o = jsvObjectGetChild(execInfo.hiddenRoot, BLE_NAME_SERVICE_OPTIONS, 0);
jswrap_nrf_bluetooth_setServices(v, o);
if (v || o) jswrap_nrf_bluetooth_setServices(v, o);
jsvUnLock2(v,o);
// If we had scan response data set, update it
JsVar *scanData = jsvObjectGetChild(execInfo.hiddenRoot, BLE_NAME_SCAN_RESPONSE_DATA, 0);
@ -672,9 +672,8 @@ void jswrap_nrf_bluetooth_setAdvertising(JsVar *data, JsVar *options) {
return;
}
JSV_GET_AS_CHAR_ARRAY(dPtr, dLen, initialArray);
jsvUnLock(initialArray);
if (!dPtr) {
jsvUnLock(advArray);
jsvUnLock2(advArray, initialArray);
jsExceptionHere(JSET_TYPEERROR, "Unable to convert data argument to an array");
return;
}
@ -686,6 +685,7 @@ void jswrap_nrf_bluetooth_setAdvertising(JsVar *data, JsVar *options) {
if (bleChanged && isAdvertising)
jsble_advertising_stop();
err_code = sd_ble_gap_adv_data_set((uint8_t *)dPtr, dLen, NULL, 0);
jsvUnLock(initialArray);
jsble_check_error(err_code);
if (bleChanged && isAdvertising)
jsble_advertising_start();