Merge branch 'master' of github.com:qucchia/Espruino

Author: qucchia

ChangeLog

@@ -20,6 +20,7 @@
             Bangle.js 2: Make Bangle.setBarometerPower retry twice if it has an I2C error
             Bangle.js 2: Fix `NRF.setAdvertising({},{scannable:false})`
             Bangle.js 2: Initial long range functionality (via `phy:"coded"` in `NRF.setAdvertising/setScan/requestDevice/findDevices`)
+            nRF52: Change from hard -> softfp calling convention (saves a few bytes, more compatible with compiled code)
 
      2v14 : Bangle.js2: Fix issue with E.showMenu creating a global `s` variable
             Bangle.js2: Recheck string wrapping after font change inside E.showMenu

libs/bluetooth/jswrap_bluetooth.c

@@ -1746,7 +1746,7 @@ BluetoothDevice {
   "data": new Uint8Array([ ... ]).buffer, // ArrayBuffer of returned data
   "serviceData" : { "0123" : [ 1 ] }, // if service data is in 'data', it's extracted here
   "manufacturer" : 0x1234, // if manufacturer data is in 'data', the 16 bit manufacturer ID is extracted here
-  "manufacturerData" : [...], // if manufacturer data is in 'data', the data is extracted here
+  "manufacturerData" : new Uint8Array([...]).buffer, // if manufacturer data is in 'data', the data is extracted here as an ArrayBuffer
   "name": "DeviceName"       // the advertised device name
  }
 ```
@@ -1995,8 +1995,9 @@ prints something like:
     "rssi": -45,
     "services": [ "4567" ],
     "serviceData" : { "0123" : [ 1 ] },
-    "manufacturerData" : [...],
-    "data": new ArrayBuffer([ ... ]),
+    "manufacturer" : 1424,
+    "manufacturerData" : new Uint8Array([ ... ]).buffer,
+    "data": new ArrayBuffer([ ... ]).buffer,
     "name": "Puck.js 36a2"
    },
   BluetoothDevice {

make/family/NRF52.make

@@ -77,7 +77,7 @@ endif
 endif
 
 # ARCHFLAGS are shared by both CFLAGS and LDFLAGS.
-ARCHFLAGS = -mcpu=cortex-m4 -mthumb -mabi=aapcs -mfloat-abi=hard -mfpu=fpv4-sp-d16
+ARCHFLAGS = -mcpu=cortex-m4 -mthumb -mabi=aapcs -mfloat-abi=softfp -mfpu=fpv4-sp-d16
 
 # nRF52 specific.
 INCLUDE          += -I$(SOFTDEVICE_PATH)/headers

targets/nrf5x/app_config.h

@@ -151,6 +151,8 @@
 #define UART0_CONFIG_USE_EASY_DMA 1
 #define UART1_ENABLED 1
 #define UART1_CONFIG_USE_EASY_DMA 1
+// To allow advertising transmit via coded phy (connectable:true,scannable:false)
+// #define NRF_SDH_BLE_GAP_EVENT_LENGTH 10
 #endif // NRF52840
 
 #if ESPR_LSE_ENABLE

targets/nrf5x/bluetooth.c

@@ -2645,7 +2645,7 @@ uint32_t jsble_advertising_start() {
       adv_params.primary_phy     = BLE_GAP_PHY_1MBPS;
       adv_params.secondary_phy   = BLE_GAP_PHY_2MBPS;
     } else if (jsvIsStringEqual(advPhy,"coded")) {
-      adv_params.primary_phy     = non_connectable ? BLE_GAP_PHY_CODED : BLE_GAP_PHY_1MBPS; // must use 1mbps phy if connectable?
+      adv_params.primary_phy     = BLE_GAP_PHY_CODED; // must use 1mbps phy if connectable?
       adv_params.secondary_phy   = BLE_GAP_PHY_CODED;
     } else jsWarn("Unknown phy %q\n", advPhy);
     jsvUnLock(advPhy);
@@ -2697,9 +2697,11 @@ uint32_t jsble_advertising_start() {
   }
 
   err_code = sd_ble_gap_adv_set_configure(&m_adv_handle, &d, &adv_params);
+  jsble_check_error(err_code);
   if (!err_code) {
     jsble_check_error(sd_ble_gap_tx_power_set(BLE_GAP_TX_POWER_ROLE_ADV, m_adv_handle, m_tx_power));
     err_code = sd_ble_gap_adv_start(m_adv_handle, APP_BLE_CONN_CFG_TAG);
+    jsble_check_error(err_code);
   }
 #elif NRF_SD_BLE_API_VERSION<5
   err_code = sd_ble_gap_adv_data_set(
@@ -2866,11 +2868,11 @@ uint32_t jsble_set_scanning(bool enabled, JsVar *options) {
 
     if (jsvIsObject(options)) {
       m_scan_param.active = jsvGetBoolAndUnLock(jsvObjectGetChild(options, "active", 0)); // Active scanning set.
+#if NRF_SD_BLE_API_VERSION>5
       if (jsvGetBoolAndUnLock(jsvObjectGetChild(options, "extended", 0)))
         m_scan_param.extended = 1;
-#if NRF_SD_BLE_API_VERSION>5
       JsVar *advPhy = jsvObjectGetChild(options, "phy", 0);
-      if (jsvIsStringEqual(advPhy,"1mbps")) {
+      if (jsvIsUndefined(advPhy) || jsvIsStringEqual(advPhy,"1mbps")) {
         // default
       } else if (jsvIsStringEqual(advPhy,"2mbps")) {
         m_scan_param.scan_phys = BLE_GAP_PHY_2MBPS;