MicroBit as BLE gamepad
Fork of nRF51822 by
Diff: source/btle/btle_discovery.cpp
- Revision:
- 417:d79a89cccddd
- Parent:
- 416:5b7d26035f2b
- Child:
- 418:d66d5957a220
--- a/source/btle/btle_discovery.cpp Tue Aug 11 15:14:23 2015 +0100 +++ b/source/btle/btle_discovery.cpp Tue Aug 11 15:14:23 2015 +0100 @@ -17,7 +17,6 @@ #include "nRF5xServiceDiscovery.h" #include "nRF5xGattClient.h" -#if !defined(MCU_NORDIC_16K_S110) && !defined(MCU_NORDIC_32K_S110) void bleGattcEventHandler(const ble_evt_t *p_ble_evt) { nRF5xServiceDiscovery &sdSingleton = nRF5xGattClient::getInstance().discovery; @@ -57,10 +56,11 @@ case BLE_GATTC_EVT_READ_RSP: { GattReadCallbackParams response = { - .handle = p_ble_evt->evt.gattc_evt.params.read_rsp.handle, - .offset = p_ble_evt->evt.gattc_evt.params.read_rsp.offset, - .len = p_ble_evt->evt.gattc_evt.params.read_rsp.len, - .data = p_ble_evt->evt.gattc_evt.params.read_rsp.data, + .connHandle = p_ble_evt->evt.gattc_evt.conn_handle, + .handle = p_ble_evt->evt.gattc_evt.params.read_rsp.handle, + .offset = p_ble_evt->evt.gattc_evt.params.read_rsp.offset, + .len = p_ble_evt->evt.gattc_evt.params.read_rsp.len, + .data = p_ble_evt->evt.gattc_evt.params.read_rsp.data, }; nRF5xGattClient::getInstance().processReadResponse(&response); } @@ -68,11 +68,12 @@ case BLE_GATTC_EVT_WRITE_RSP: { GattWriteCallbackParams response = { - .handle = p_ble_evt->evt.gattc_evt.params.write_rsp.handle, - .writeOp = (GattWriteCallbackParams::WriteOp_t)(p_ble_evt->evt.gattc_evt.params.write_rsp.write_op), - .offset = p_ble_evt->evt.gattc_evt.params.write_rsp.offset, - .len = p_ble_evt->evt.gattc_evt.params.write_rsp.len, - .data = p_ble_evt->evt.gattc_evt.params.write_rsp.data, + .connHandle = p_ble_evt->evt.gattc_evt.conn_handle, + .handle = p_ble_evt->evt.gattc_evt.params.write_rsp.handle, + .writeOp = (GattWriteCallbackParams::WriteOp_t)(p_ble_evt->evt.gattc_evt.params.write_rsp.write_op), + .offset = p_ble_evt->evt.gattc_evt.params.write_rsp.offset, + .len = p_ble_evt->evt.gattc_evt.params.write_rsp.len, + .data = p_ble_evt->evt.gattc_evt.params.write_rsp.data, }; nRF5xGattClient::getInstance().processWriteResponse(&response); } @@ -80,10 +81,11 @@ case BLE_GATTC_EVT_HVX: { GattHVXCallbackParams params; - params.handle = p_ble_evt->evt.gattc_evt.params.hvx.handle; - params.type = static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type); - params.len = p_ble_evt->evt.gattc_evt.params.hvx.len; - params.data = p_ble_evt->evt.gattc_evt.params.hvx.data; + params.connHandle = p_ble_evt->evt.gattc_evt.conn_handle; + params.handle = p_ble_evt->evt.gattc_evt.params.hvx.handle; + params.type = static_cast<HVXType_t>(p_ble_evt->evt.gattc_evt.params.hvx.type); + params.len = p_ble_evt->evt.gattc_evt.params.hvx.len; + params.data = p_ble_evt->evt.gattc_evt.params.hvx.data; nRF5xGattClient::getInstance().processHVXEvent(¶ms); } @@ -93,4 +95,3 @@ sdSingleton.progressCharacteristicDiscovery(); sdSingleton.progressServiceDiscovery(); } -#endif