Skip to content

Commit 49717e4

Browse files
pan-Cruz Monrreal II
authored andcommitted
BLE: Allow null value for periodic interval in advertising report event.
1 parent 11ac1e0 commit 49717e4

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

features/FEATURE_BLE/ble/gap/Events.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ struct AdvertisingReportEvent {
6363
advertising_sid_t SID,
6464
advertising_power_t txPower,
6565
rssi_t rssi,
66-
periodic_interval_t periodicInterval,
66+
uint16_t periodicInterval,
6767
const peer_address_type_t &directAddressType,
6868
const address_t &directAddress,
6969
const mbed::Span<const uint8_t> &advertisingData
@@ -133,10 +133,15 @@ struct AdvertisingReportEvent {
133133
return rssi;
134134
}
135135

136+
/** Indicate if periodic interval is valid */
137+
bool isPeriodicIntervalPresent() const {
138+
return periodicInterval != 0;
139+
}
140+
136141
/** Get interval. */
137142
periodic_interval_t getPeriodicInterval() const
138143
{
139-
return periodicInterval;
144+
return periodic_interval_t(periodicInterval);
140145
}
141146

142147
/** Get target address type in directed advertising. */
@@ -166,7 +171,7 @@ struct AdvertisingReportEvent {
166171
advertising_sid_t SID;
167172
advertising_power_t txPower;
168173
rssi_t rssi;
169-
periodic_interval_t periodicInterval;
174+
uint16_t periodicInterval;
170175
peer_address_type_t directAddressType;
171176
const address_t &directAddress;
172177
mbed::Span<const uint8_t> advertisingData;

features/FEATURE_BLE/source/generic/GenericGap.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@ void GenericGap::on_advertising_report(const pal::GapAdvertisingReportEvent &e)
15891589
/* SID - NO ADI FIELD IN THE PDU */ 0xFF,
15901590
/* tx power information not available */ 127,
15911591
advertising.rssi,
1592-
/* NO PERIODIC ADVERTISING */ periodic_interval_t(0),
1592+
/* NO PERIODIC ADVERTISING */ 0,
15931593
peer_address_type_t::ANONYMOUS,
15941594
ble::address_t (),
15951595
mbed::Span<const uint8_t>(advertising.data.data(), advertising.data.size())
@@ -2642,7 +2642,7 @@ void GenericGap::on_extended_advertising_report(
26422642
advertising_sid,
26432643
tx_power,
26442644
rssi,
2645-
periodic_interval_t(periodic_advertising_interval),
2645+
periodic_advertising_interval,
26462646
(PeerAddressType_t::type) direct_address_type.value(),
26472647
(BLEProtocol::AddressBytes_t &) direct_address,
26482648
mbed::make_Span(data, data_length)

0 commit comments

Comments
 (0)