Schoumi/BLE_API
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge https://github.com/ARMmbed/ble/pull/65.

Browse source 
GapADVParams::get/setInterval() are now counterparts in terms of their units.
This commit is contained in:
Rohit Grover 2015-08-10 14:49:45 +01:00
commit 44633a5170
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ble/Gap.h
View file

@ -465,7 +465,7 @@ public:
} else if (interval < getMinAdvertisingInterval()) {
interval = getMinAdvertisingInterval();
}
_advParams.setInterval(GapAdvertisingParams::MSEC_TO_ADVERTISEMENT_DURATION_UNITS(interval));
_advParams.setInterval(interval);
}
/**

30
ble/GapAdvertisingParams.h
View file

@ -94,18 +94,36 @@ public:
return (gapUnits * UNIT_0_625_MS) / 1000;
}
AdvertisingType_t getAdvertisingType(void) const {return _advType; }
uint16_t getInterval(void) const {return ADVERTISEMENT_DURATION_UNITS_TO_MS(_interval);}
uint16_t getTimeout(void) const {return _timeout; }
AdvertisingType_t getAdvertisingType(void) const {
return _advType;
}
/**
* @return the advertisement interval (in milliseconds)
*/
uint16_t getInterval(void) const {
return ADVERTISEMENT_DURATION_UNITS_TO_MS(_interval);
}
/**
* @return the advertisement interval in units advertisement duration units--i.e. 0.625ms units.
*/
uint16_t getIntervalInADVUnits(void) const {
return _interval;
}
uint16_t getTimeout(void) const {
return _timeout;
}
void setAdvertisingType(AdvertisingType_t newAdvType) {_advType = newAdvType; }
void setInterval(uint16_t newInterval) {_interval = newInterval;}
void setInterval(uint16_t newInterval) {_interval = MSEC_TO_ADVERTISEMENT_DURATION_UNITS(newInterval);}
void setTimeout(uint16_t newTimeout) {_timeout = newTimeout; }
private:
AdvertisingType_t _advType;
uint16_t _interval;
uint16_t _timeout;
uint16_t _interval; /* in ADV duration units (i.e. 0.625ms) */
uint16_t _timeout; /* in seconds */
};
#endif // ifndef __GAP_ADVERTISING_PARAMS_H__