BLE: Improve naming consistency of Gap event types.

pull/8738/head
Vincent Coubard 2018-11-23 12:19:01 +00:00
parent dea2ae9c1f
commit 70ec1cf641
3 changed files with 8 additions and 8 deletions

View File

@ -491,7 +491,7 @@ struct ScanTimeoutEvent { };
* *
* @see ble::Gap::EventHandler::onAdvertisingEnd(). * @see ble::Gap::EventHandler::onAdvertisingEnd().
*/ */
struct AdvertisingEndEvent_t { struct AdvertisingEndEvent {
#if !defined(DOXYGEN_ONLY) #if !defined(DOXYGEN_ONLY)
/** Create advertising end event. /** Create advertising end event.
* *
@ -500,7 +500,7 @@ struct AdvertisingEndEvent_t {
* @param completed_events Number of events created during before advertising end. * @param completed_events Number of events created during before advertising end.
* @param connected True if connection has been established. * @param connected True if connection has been established.
*/ */
AdvertisingEndEvent_t( AdvertisingEndEvent(
advertising_handle_t advHandle, advertising_handle_t advHandle,
connection_handle_t connection, connection_handle_t connection,
uint8_t completed_events, uint8_t completed_events,
@ -548,7 +548,7 @@ private:
* *
* @see ble::Gap::EventHandler::onScanRequestReceived(). * @see ble::Gap::EventHandler::onScanRequestReceived().
*/ */
struct ScanRequestEvent_t { struct ScanRequestEvent {
#if !defined(DOXYGEN_ONLY) #if !defined(DOXYGEN_ONLY)
/** Create scan request event. /** Create scan request event.
* *
@ -556,7 +556,7 @@ struct ScanRequestEvent_t {
* @param peerAddressType Peer address type. * @param peerAddressType Peer address type.
* @param peerAddress Peer address. * @param peerAddress Peer address.
*/ */
ScanRequestEvent_t( ScanRequestEvent(
advertising_handle_t advHandle, advertising_handle_t advHandle,
const peer_address_type_t &peerAddressType, const peer_address_type_t &peerAddressType,
const address_t &peerAddress const address_t &peerAddress

View File

@ -39,13 +39,13 @@ public:
* *
* @param event Scan request event: @see ScanRequestEvent_t for details. * @param event Scan request event: @see ScanRequestEvent_t for details.
*/ */
virtual void onScanRequestReceived(const ScanRequestEvent_t &event) { } virtual void onScanRequestReceived(const ScanRequestEvent &event) { }
/** Called when advertising ends. /** Called when advertising ends.
* *
* @param event Advertising end event: @see AdvertisingEndEvent_t for details. * @param event Advertising end event: @see AdvertisingEndEvent_t for details.
*/ */
virtual void onAdvertisingEnd(const AdvertisingEndEvent_t &event) { } virtual void onAdvertisingEnd(const AdvertisingEndEvent &event) { }
/** Called when scanning reads an advertising packet during passive scan or receives /** Called when scanning reads an advertising packet during passive scan or receives
* a scan response during an active scan. * a scan response during an active scan.

View File

@ -2430,7 +2430,7 @@ void GenericGap::on_advertising_set_terminated(
} }
_eventHandler->onAdvertisingEnd( _eventHandler->onAdvertisingEnd(
AdvertisingEndEvent_t( AdvertisingEndEvent(
advertising_handle, advertising_handle,
connection_handle, connection_handle,
number_of_completed_extended_advertising_events, number_of_completed_extended_advertising_events,
@ -2450,7 +2450,7 @@ void GenericGap::on_scan_request_received(
} }
_eventHandler->onScanRequestReceived( _eventHandler->onScanRequestReceived(
ScanRequestEvent_t( ScanRequestEvent(
advertising_handle, advertising_handle,
(peer_address_type_t::type) scanner_address_type.value(), (peer_address_type_t::type) scanner_address_type.value(),
address address