tweaks for when we include phy code

Author: gfwilliams

libs/bluetooth/bluetooth.h

@@ -166,9 +166,11 @@ typedef enum {
   BLEP_RESTART_SOFTDEVICE,          //< Perform a softdevice restart (again, we don't want to do this in an IRQ!)
   BLEP_RSSI_PERIPH,                 //< RSSI data from peripheral connection (rssi as data)
   BLEP_ADV_REPORT,                  //< Advertising received (as buffer)
-#ifndef SAVE_ON_FLASH
+#if (NRF_SD_BLE_API_VERSION >= 5)
   BLEP_PHY_UPDATE_REQUEST,          //< PHY update request (connection handle as data, [tx_phy,rx_phy] as buffer)
   BLEP_PHY_UPDATE,                  //< PHY update finished (connection handle as data, [tx_phy,rx_phy,status] as buffer)
+#endif
+#ifndef SAVE_ON_FLASH
   BLEP_MTU_UPDATE,                  //< MTU update finished (connection handle as data, [mtu_16bit] as buffer)
 #endif
 #if CENTRAL_LINK_COUNT>0

libs/bluetooth/jswrap_bluetooth.c

@@ -509,7 +509,7 @@ Called with discovered characteristics when discovery is finished
   ],
   "#if" : "defined(NRF52_SERIES)"
 }
-(2v28+) This event is fired when the phy (radio) is changed for the active Bluetooth connection. The parameter is the data `[tx_phy, rx_phy, status]`
+(2v28+, nRF52840 only) This event is fired when the phy (radio) is changed for the active Bluetooth connection. The parameter is the data `[tx_phy, rx_phy, status]`
 
 `tx_phy`/`rx_phy` are integers where each bit corresponds to:
 
@@ -528,7 +528,7 @@ Called with discovered characteristics when discovery is finished
   ],
   "#if" : "defined(NRF52_SERIES)"
 }
-(2v28+) This event is fired when the phy (radio) is requested to change for the active Bluetooth connection. The parameter is the data `[tx_phy, rx_phy]`
+(2v28+, nRF52840 only) This event is fired when the phy (radio) is requested to change for the active Bluetooth connection. The parameter is the data `[tx_phy, rx_phy]`
 
 `tx_phy`/`rx_phy` are integers where each bit corresponds to:
 
@@ -547,7 +547,7 @@ eg. `7` means all phys (eg any) have been requested
   ],
   "#if" : "defined(NRF52_SERIES)"
 }
-(2v28+) This event is fired when the MTU changes for the active Bluetooth connection. Yhis is the amount of
+(2v28+) This event is fired when the MTU changes for the active Bluetooth connection. This is the amount of
 data that can be transferred in one packet.
  */
 
@@ -589,7 +589,7 @@ received. It doesn't get called if NFC is started with `NRF.nfcURL` or
   ],
   "#if" : "defined(NRF52_SERIES)"
 }
-(2v28+) This event is fired when the phy (radio) is changed for this Bluetooth connection. The parameter is the data `[tx_phy, rx_phy, status]`
+(2v28+, nRF52840 only) This event is fired when the phy (radio) is changed for this Bluetooth connection. The parameter is the data `[tx_phy, rx_phy, status]`
 
 `tx_phy`/`rx_phy` are integers where each bit corresponds to:
 
@@ -608,7 +608,7 @@ received. It doesn't get called if NFC is started with `NRF.nfcURL` or
   ],
   "#if" : "defined(NRF52_SERIES)"
 }
-(2v28+) This event is fired when the phy (radio) is requested to change for this Bluetooth connection. The parameter is the data `[tx_phy, rx_phy]`
+(2v28+, nRF52840 only) This event is fired when the phy (radio) is requested to change for this Bluetooth connection. The parameter is the data `[tx_phy, rx_phy]`
 
 `tx_phy`/`rx_phy` are integers where each bit corresponds to:
 
@@ -627,7 +627,7 @@ eg. `7` means all phys (eg any) have been requested
   ],
   "#if" : "defined(NRF52_SERIES)"
 }
-(2v28+) This event is fired when the MTU changes for the active Bluetooth connection. Yhis is the amount of
+(2v28+) This event is fired when the MTU changes for the active Bluetooth connection. This is the amount of
 data that can be transferred in one packet.
  */
 /*JSON{

targets/nrf5x/bluetooth.c

@@ -350,7 +350,7 @@ int jsble_exec_pending(uint8_t *buffer, int bufferLen) {
      jsble_restart_softdevice(NULL);
      break;
    }
-#ifndef SAVE_ON_FLASH
+#if (NRF_SD_BLE_API_VERSION >= 5)
    case BLEP_PHY_UPDATE_REQUEST:
    case BLEP_PHY_UPDATE: {
      uint16_t conn_handle = data;
@@ -363,6 +363,8 @@ int jsble_exec_pending(uint8_t *buffer, int bufferLen) {
      }
      break;
    }
+#endif
+#ifndef SAVE_ON_FLASH
    case BLEP_MTU_UPDATE: {
      uint16_t conn_handle = data;
      JsVar *eventTarget = jsble_device_from_handle(conn_handle);
@@ -1508,7 +1510,7 @@ static void ble_evt_handler(ble_evt_t const * p_ble_evt, void * p_context) {
 #endif
             break;
           }
-#endif
+#endif // NRF_SD_BLE_API_VERSION >= 5
 
 #if NRF_SD_BLE_API_VERSION<5
       case BLE_EVT_TX_COMPLETE: