mirror of https://github.com/ARMmbed/mbed-os.git
shorten min max
parent
edb645b492
commit
32d3fa9aad
|
@ -38,8 +38,8 @@ public:
|
||||||
_maxConnectionInterval[i] = 6;
|
_maxConnectionInterval[i] = 6;
|
||||||
_slaveLatency[i] = 0;
|
_slaveLatency[i] = 0;
|
||||||
_connectionSupervisionTimeout[i] = 0xC80;
|
_connectionSupervisionTimeout[i] = 0xC80;
|
||||||
_minimumEventLength[i] = 0;
|
_minEventLength[i] = 0;
|
||||||
_maximumEventLength[i] = 0xFFFF;
|
_maxEventLength[i] = 0xFFFF;
|
||||||
_enabledPhy[i] = false;
|
_enabledPhy[i] = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -146,12 +146,12 @@ public:
|
||||||
return &_connectionSupervisionTimeout[getFirstEnabledPhy()];
|
return &_connectionSupervisionTimeout[getFirstEnabledPhy()];
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t* getMinimumEventLengthArray() {
|
uint32_t* getMinEventLengthArray() {
|
||||||
return &_minimumEventLength[getFirstEnabledPhy()];
|
return &_minEventLength[getFirstEnabledPhy()];
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t* getMaximumEventLengthArray() {
|
uint32_t* getMaxEventLengthArray() {
|
||||||
return &_maximumEventLength[getFirstEnabledPhy()];
|
return &_maxEventLength[getFirstEnabledPhy()];
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t getNumberOfEnabledPhys() {
|
uint8_t getNumberOfEnabledPhys() {
|
||||||
|
@ -160,6 +160,14 @@ public:
|
||||||
_enabledPhy[ble::phy_t::LE_CODED] * 1);
|
_enabledPhy[ble::phy_t::LE_CODED] * 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ble::own_address_type_t getOwnAddressType() {
|
||||||
|
return _ownAddressType;
|
||||||
|
}
|
||||||
|
|
||||||
|
ble::scanning_policy_mode_t getFilterPolicy() {
|
||||||
|
return _filterPolicy;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint8_t getFirstEnabledPhy() {
|
uint8_t getFirstEnabledPhy() {
|
||||||
if (_enabledPhy[ble::phy_t::LE_1M]) {
|
if (_enabledPhy[ble::phy_t::LE_1M]) {
|
||||||
|
@ -206,8 +214,8 @@ private:
|
||||||
uint16_t maxConnectionInterval = _maxConnectionInterval[ble::phy_t::LE_2M];
|
uint16_t maxConnectionInterval = _maxConnectionInterval[ble::phy_t::LE_2M];
|
||||||
uint16_t slaveLatency = _maxConnectionInterval[ble::phy_t::LE_2M];
|
uint16_t slaveLatency = _maxConnectionInterval[ble::phy_t::LE_2M];
|
||||||
uint16_t connectionSupervisionTimeout = _connectionSupervisionTimeout[ble::phy_t::LE_2M];
|
uint16_t connectionSupervisionTimeout = _connectionSupervisionTimeout[ble::phy_t::LE_2M];
|
||||||
uint32_t minimumEventLength = _minimumEventLength[ble::phy_t::LE_2M];
|
uint32_t minEventLength = _minEventLength[ble::phy_t::LE_2M];
|
||||||
uint32_t maximumEventLength = _maximumEventLength[ble::phy_t::LE_2M];
|
uint32_t maxEventLength = _maxEventLength[ble::phy_t::LE_2M];
|
||||||
|
|
||||||
_scanInterval[ble::phy_t::LE_2M] = _scanInterval[ble::phy_t::LE_CODED];
|
_scanInterval[ble::phy_t::LE_2M] = _scanInterval[ble::phy_t::LE_CODED];
|
||||||
_scanWindow[ble::phy_t::LE_2M] = _scanWindow[ble::phy_t::LE_CODED];
|
_scanWindow[ble::phy_t::LE_2M] = _scanWindow[ble::phy_t::LE_CODED];
|
||||||
|
@ -215,8 +223,8 @@ private:
|
||||||
_maxConnectionInterval[ble::phy_t::LE_2M] = _maxConnectionInterval[ble::phy_t::LE_CODED];
|
_maxConnectionInterval[ble::phy_t::LE_2M] = _maxConnectionInterval[ble::phy_t::LE_CODED];
|
||||||
_slaveLatency[ble::phy_t::LE_2M] = _slaveLatency[ble::phy_t::LE_CODED];
|
_slaveLatency[ble::phy_t::LE_2M] = _slaveLatency[ble::phy_t::LE_CODED];
|
||||||
_connectionSupervisionTimeout[ble::phy_t::LE_2M] = _connectionSupervisionTimeout[ble::phy_t::LE_CODED];
|
_connectionSupervisionTimeout[ble::phy_t::LE_2M] = _connectionSupervisionTimeout[ble::phy_t::LE_CODED];
|
||||||
_minimumEventLength[ble::phy_t::LE_2M] = _minimumEventLength[ble::phy_t::LE_CODED];
|
_minEventLength[ble::phy_t::LE_2M] = _minEventLength[ble::phy_t::LE_CODED];
|
||||||
_maximumEventLength[ble::phy_t::LE_2M] = _maximumEventLength[ble::phy_t::LE_CODED];
|
_maxEventLength[ble::phy_t::LE_2M] = _maxEventLength[ble::phy_t::LE_CODED];
|
||||||
|
|
||||||
_scanInterval[ble::phy_t::LE_CODED] = scanInterval;
|
_scanInterval[ble::phy_t::LE_CODED] = scanInterval;
|
||||||
_scanWindow[ble::phy_t::LE_CODED] = scanWindow;
|
_scanWindow[ble::phy_t::LE_CODED] = scanWindow;
|
||||||
|
@ -224,8 +232,8 @@ private:
|
||||||
_maxConnectionInterval[ble::phy_t::LE_CODED] = maxConnectionInterval;
|
_maxConnectionInterval[ble::phy_t::LE_CODED] = maxConnectionInterval;
|
||||||
_slaveLatency[ble::phy_t::LE_CODED] = slaveLatency;
|
_slaveLatency[ble::phy_t::LE_CODED] = slaveLatency;
|
||||||
_connectionSupervisionTimeout[ble::phy_t::LE_CODED] = connectionSupervisionTimeout;
|
_connectionSupervisionTimeout[ble::phy_t::LE_CODED] = connectionSupervisionTimeout;
|
||||||
_minimumEventLength[ble::phy_t::LE_CODED] = minimumEventLength;
|
_minEventLength[ble::phy_t::LE_CODED] = minEventLength;
|
||||||
_maximumEventLength[ble::phy_t::LE_CODED] = maximumEventLength;
|
_maxEventLength[ble::phy_t::LE_CODED] = maxEventLength;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -238,8 +246,8 @@ private:
|
||||||
uint16_t _maxConnectionInterval[MAX_PARAM_PHYS];
|
uint16_t _maxConnectionInterval[MAX_PARAM_PHYS];
|
||||||
uint16_t _slaveLatency[MAX_PARAM_PHYS];
|
uint16_t _slaveLatency[MAX_PARAM_PHYS];
|
||||||
uint16_t _connectionSupervisionTimeout[MAX_PARAM_PHYS];
|
uint16_t _connectionSupervisionTimeout[MAX_PARAM_PHYS];
|
||||||
uint32_t _minimumEventLength[MAX_PARAM_PHYS];
|
uint32_t _minEventLength[MAX_PARAM_PHYS];
|
||||||
uint32_t _maximumEventLength[MAX_PARAM_PHYS];
|
uint32_t _maxEventLength[MAX_PARAM_PHYS];
|
||||||
|
|
||||||
bool _enabledPhy[MAX_PARAM_PHYS];
|
bool _enabledPhy[MAX_PARAM_PHYS];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue