espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-13 14:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[link-quality] remove aNoiseFloor param from LinkQualityInfo methods (#4569)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2020-02-20 09:36:34 -08:00
committed by Jonathan Hui
parent 2437a75a6b
commit 5cddf90389
10 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mac/mac.cpp
+2 -7
View File
@@ -1181,7 +1181,7 @@ void Mac::RecordFrameTransmitStatus(const TxFrame &aFrame,
if ((aError == OT_ERROR_NONE) && ackRequested && (aAckFrame != NULL) && (neighbor != NULL))
{
neighbor->GetLinkInfo().AddRss(GetNoiseFloor(), aAckFrame->GetRssi());
neighbor->GetLinkInfo().AddRss(aAckFrame->GetRssi());
}
// Update MAC counters.
@@ -1648,7 +1648,7 @@ void Mac::HandleReceivedFrame(RxFrame *aFrame, otError aError)
if (neighbor != NULL)
{
neighbor->GetLinkInfo().AddRss(GetNoiseFloor(), aFrame->GetRssi());
neighbor->GetLinkInfo().AddRss(aFrame->GetRssi());
if (aFrame->GetSecurityEnabled())
{
@@ -1877,11 +1877,6 @@ void Mac::ResetRetrySuccessHistogram()
}
#endif // OPENTHREAD_CONFIG_MAC_RETRY_SUCCESS_HISTOGRAM_ENABLE
int8_t Mac::GetNoiseFloor(void)
{
return Get<Radio>().GetReceiveSensitivity();
}
// LCOV_EXCL_START
#if (OPENTHREAD_CONFIG_LOG_LEVEL >= OT_LOG_LEVEL_INFO) && (OPENTHREAD_CONFIG_LOG_MAC == 1)
src/core/mac/mac.hpp
+1 -1
View File
@@ -609,7 +609,7 @@ public:
* @returns The noise floor value in dBm.
*
*/
int8_t GetNoiseFloor(void);
int8_t GetNoiseFloor(void) { return mSubMac.GetNoiseFloor(); }
/**
* This method returns the current CCA (Clear Channel Assessment) failure rate.
src/core/mac/sub_mac.cpp
+5
View File
@@ -388,6 +388,11 @@ int8_t SubMac::GetRssi(void) const
return Get<Radio>().GetRssi();
}
int8_t SubMac::GetNoiseFloor(void)
{
return Get<Radio>().GetReceiveSensitivity();
}
otError SubMac::EnergyScan(uint8_t aScanChannel, uint16_t aScanDuration)
{
otError error = OT_ERROR_NONE;
src/core/mac/sub_mac.hpp
+8
View File
@@ -339,6 +339,14 @@ public:
*/
otError EnergyScan(uint8_t aScanChannel, uint16_t aScanDuration);
/**
* This method returns the noise floor value (currently use the radio receive sensitivity value).
*
* @returns The noise floor value in dBm.
*
*/
int8_t GetNoiseFloor(void);
private:
enum
{
src/core/thread/link_quality.cpp
+7 -2
View File
@@ -150,7 +150,7 @@ void LinkQualityInfo::Clear(void)
mMessageErrorRate.Reset();
}
void LinkQualityInfo::AddRss(int8_t aNoiseFloor, int8_t aRss)
void LinkQualityInfo::AddRss(int8_t aRss)
{
uint8_t oldLinkQuality = kNoLinkQuality;
@@ -165,12 +165,17 @@ void LinkQualityInfo::AddRss(int8_t aNoiseFloor, int8_t aRss)
SuccessOrExit(mRssAverager.Add(aRss));
SetLinkQuality(CalculateLinkQuality(GetLinkMargin(aNoiseFloor), oldLinkQuality));
SetLinkQuality(CalculateLinkQuality(GetLinkMargin(), oldLinkQuality));
exit:
return;
}
uint8_t LinkQualityInfo::GetLinkMargin(void) const
{
return ConvertRssToLinkMargin(Get<Mac::SubMac>().GetNoiseFloor(), GetAverageRss());
}
LinkQualityInfo::InfoString LinkQualityInfo::ToInfoString(void) const
{
return InfoString("aveRss:%s, lastRss:%d, linkQuality:%d", mRssAverager.ToString().AsCString(), GetLastRss(),
src/core/thread/link_quality.hpp
+2 -7
View File
@@ -247,11 +247,10 @@ public:
/**
* This method adds a new received signal strength (RSS) value to the average.
*
* @param[in] aNoiseFloor The noise floor value (in dBm).
* @param[in] aRss A new received signal strength value (in dBm) to be added to the average.
*
*/
void AddRss(int8_t aNoiseFloor, int8_t aRss);
void AddRss(int8_t aRss);
/**
* This method returns the current average received signal strength value.
@@ -282,12 +281,10 @@ public:
* This method returns the link margin. The link margin is calculated using the link's current average received
* signal strength (RSS) and average noise floor.
*
* @param[in] aNoiseFloor The noise floor value (in dBm).
*
* @returns Link margin derived from average received signal strength and average noise floor.
*
*/
uint8_t GetLinkMargin(int8_t aNoiseFloor) const { return ConvertRssToLinkMargin(aNoiseFloor, GetAverageRss()); }
uint8_t GetLinkMargin(void) const;
/**
* Returns the current one-way link quality value. The link quality value is a number 0-3.
@@ -300,8 +297,6 @@ public:
* frequent changes, a hysteresis of 2 dB is applied when determining the link quality. For example, the average
* link margin must be at least 12 dB to change a quality 1 link to a quality 2 link.
*
* @param[in] aNoiseFloor The noise floor value (in dBm).
*
* @returns The current link quality value (value 0-3 as per Thread specification).
*
*/
src/core/thread/mle.cpp
+1 -1
View File
@@ -3334,7 +3334,7 @@ otError Mle::HandleParentResponse(const Message &aMessage, const Ip6::MessageInf
mParentCandidate.SetDeviceMode(DeviceMode(DeviceMode::kModeFullThreadDevice | DeviceMode::kModeRxOnWhenIdle |
DeviceMode::kModeFullNetworkData | DeviceMode::kModeSecureDataRequest));
mParentCandidate.GetLinkInfo().Clear();
mParentCandidate.GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
mParentCandidate.GetLinkInfo().AddRss(linkInfo->mRss);
mParentCandidate.ResetLinkFailures();
mParentCandidate.SetLinkQualityOut(LinkQualityInfo::ConvertLinkMarginToLinkQuality(linkMarginTlv.GetLinkMargin()));
mParentCandidate.SetState(Neighbor::kStateParentResponse);
src/core/thread/mle_router.cpp
+8 -8
View File
@@ -615,7 +615,7 @@ otError MleRouter::HandleLinkRequest(const Message &aMessage, const Ip6::Message
neighbor->SetExtAddress(macAddr);
neighbor->GetLinkInfo().Clear();
neighbor->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
neighbor->GetLinkInfo().AddRss(linkInfo->mRss);
neighbor->ResetLinkFailures();
neighbor->SetLastHeard(TimerMilli::GetNow());
neighbor->SetState(Neighbor::kStateLinkRequest);
@@ -981,7 +981,7 @@ otError MleRouter::HandleLinkAccept(const Message & aMessage,
router->SetDeviceMode(DeviceMode(DeviceMode::kModeFullThreadDevice | DeviceMode::kModeRxOnWhenIdle |
DeviceMode::kModeFullNetworkData));
router->GetLinkInfo().Clear();
router->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
router->GetLinkInfo().AddRss(linkInfo->mRss);
router->SetLinkQualityOut(LinkQualityInfo::ConvertLinkMarginToLinkQuality(linkMargin.GetLinkMargin()));
router->ResetLinkFailures();
router->SetState(Neighbor::kStateValid);
@@ -1356,7 +1356,7 @@ otError MleRouter::HandleAdvertisement(const Message & aMessage,
{
router->SetExtAddress(macAddr);
router->GetLinkInfo().Clear();
router->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
router->GetLinkInfo().AddRss(linkInfo->mRss);
router->ResetLinkFailures();
router->SetLastHeard(TimerMilli::GetNow());
router->SetState(Neighbor::kStateLinkRequest);
@@ -1403,7 +1403,7 @@ otError MleRouter::HandleAdvertisement(const Message & aMessage,
{
router->SetExtAddress(macAddr);
router->GetLinkInfo().Clear();
router->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
router->GetLinkInfo().AddRss(linkInfo->mRss);
router->ResetLinkFailures();
router->SetLastHeard(TimerMilli::GetNow());
router->SetState(Neighbor::kStateLinkRequest);
@@ -1660,7 +1660,7 @@ otError MleRouter::HandleParentRequest(const Message &aMessage, const Ip6::Messa
// MAC Address
child->SetExtAddress(macAddr);
child->GetLinkInfo().Clear();
child->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
child->GetLinkInfo().AddRss(linkInfo->mRss);
child->ResetLinkFailures();
child->SetState(Neighbor::kStateParentRequest);
#if OPENTHREAD_CONFIG_TIME_SYNC_ENABLE
@@ -1937,7 +1937,7 @@ void MleRouter::SendParentResponse(Child *aChild, const ChallengeTlv &aChallenge
aChild->GenerateChallenge();
SuccessOrExit(error = AppendChallenge(*message, aChild->GetChallenge(), aChild->GetChallengeSize()));
error = AppendLinkMargin(*message, aChild->GetLinkInfo().GetLinkMargin(Get<Mac::Mac>().GetNoiseFloor()));
error = AppendLinkMargin(*message, aChild->GetLinkInfo().GetLinkMargin());
SuccessOrExit(error);
SuccessOrExit(error = AppendConnectivity(*message));
@@ -2194,7 +2194,7 @@ otError MleRouter::HandleChildIdRequest(const Message & aMessage,
child->SetMleFrameCounter(mleFrameCounter.GetFrameCounter());
child->SetKeySequence(aKeySequence);
child->SetDeviceMode(mode.GetMode());
child->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
child->GetLinkInfo().AddRss(linkInfo->mRss);
child->SetTimeout(timeout.GetTimeout());
if (mode.GetMode().IsFullNetworkData())
@@ -2515,7 +2515,7 @@ otError MleRouter::HandleChildUpdateResponse(const Message & aMessage,
SetChildStateToValid(*child);
child->SetLastHeard(TimerMilli::GetNow());
child->SetKeySequence(aKeySequence);
child->GetLinkInfo().AddRss(Get<Mac::Mac>().GetNoiseFloor(), linkInfo->mRss);
child->GetLinkInfo().AddRss(linkInfo->mRss);
exit:
tests/unit/test_link_quality.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ void TestLinkQualityData(RssTestData aRssData)
rss = aRssData.mRssList[i];
min = MIN_RSS(rss, min);
max = MAX_RSS(rss, max);
linkInfo.AddRss(sNoiseFloor, rss);
linkInfo.AddRss(rss);
VerifyOrQuit(linkInfo.GetLastRss() == rss, "TestLinkQualityInfo failed - GetLastRss() is incorrect");
ave = linkInfo.GetAverageRss();
VerifyOrQuit(ave >= min, "TestLinkQualityInfo failed - GetAverageRss() is smaller than min value.");
tests/unit/test_platform.cpp
+1 -1
View File
@@ -392,7 +392,7 @@ otError otPlatRadioSetTransmitPower(otInstance *aInstance, int8_t aPower)
int8_t otPlatRadioGetReceiveSensitivity(otInstance *aInstance)
{
OT_UNUSED_VARIABLE(aInstance);
return 0;
return -100;
}
//
// Random