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

Most recent RSSI in child/neighbour tables (#1519)

Browse Source 
* Added most recent RSSI to child and neighbour tables

* Align = signs in mle_router Get{Router/Child}Info

* Fixed build errors, was using the wrong config before so wasnt actualy building the code
This commit is contained in:
Adam Eliot
2017-03-28 09:41:57 -07:00
committed by Jonathan Hui
parent 303d0ba0ad
commit 89521040c3
5 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openthread/types.h
+2
View File
@@ -791,6 +791,7 @@ typedef struct
uint32_t mMleFrameCounter; ///< MLE Frame Counter
uint8_t mLinkQualityIn; ///< Link Quality In
int8_t mAverageRssi; ///< Average RSSI
int8_t mLastRssi; ///< Last observed RSSI
bool mRxOnWhenIdle : 1; ///< rx-on-when-idle
bool mSecureDataRequest : 1; ///< Secure Data Requests
bool mFullFunction : 1; ///< Full Function Device
@@ -816,6 +817,7 @@ typedef struct
uint8_t mNetworkDataVersion; ///< Network Data Version
uint8_t mLinkQualityIn; ///< Link Quality In
int8_t mAverageRssi; ///< Average RSSI
int8_t mLastRssi; ///< Last observed RSSI
bool mRxOnWhenIdle : 1; ///< rx-on-when-idle
bool mSecureDataRequest : 1; ///< Secure Data Requests
bool mFullFunction : 1; ///< Full Function Device
src/core/thread/link_quality.cpp
+10 -2
View File
@@ -70,9 +70,10 @@ LinkQualityInfo::LinkQualityInfo(void)
void LinkQualityInfo::Clear(void)
{
mRssAverage = 0;
mCount = 0;
mRssAverage = 0;
mCount = 0;
mLinkQuality = 0;
mLastRss = 0;
}
void LinkQualityInfo::AddRss(LinkQualityInfo &aNoiseFloor, int8_t anRss)
@@ -80,6 +81,8 @@ void LinkQualityInfo::AddRss(LinkQualityInfo &aNoiseFloor, int8_t anRss)
uint16_t newValue;
uint16_t oldAverage;
mLastRss = anRss;
// Restrict/Cap the RSS value to the closed range [0, -128] so the value can fit in 8 bits.
if (anRss > 0)
@@ -182,6 +185,11 @@ uint8_t LinkQualityInfo::GetLinkQuality(LinkQualityInfo &aNoiseFloor)
return mLinkQuality;
}
int8_t LinkQualityInfo::GetLastRss(void) const
{
return mLastRss;
}
void LinkQualityInfo::UpdateLinkQuality(LinkQualityInfo &aNoiseFloor)
{
if (mCount != 0)
src/core/thread/link_quality.hpp
+9
View File
@@ -140,6 +140,14 @@ public:
*/
uint8_t GetLinkQuality(LinkQualityInfo &aNoiseFloor);
/**
* Returns the most recent RSS value.
*
* @returns The most recent RSS
*
*/
int8_t GetLastRss(void) const;
/**
* This method converts a received signal strength value to a link margin value.
*
@@ -216,6 +224,7 @@ private:
uint16_t mRssAverage : 11; // The encoded average signal strength value (stored as rss times precision multiple).
uint8_t mCount : 3; // Number of RSS values added to average so far (limited to kRssCountMax).
uint8_t mLinkQuality : 2; // Current link quality value (0-3).
int8_t mLastRss;
};
/**
src/core/thread/mle_router.cpp
+22 -18
View File
@@ -3476,18 +3476,20 @@ ThreadError MleRouter::GetChildInfo(Child &aChild, otChildInfo &aChildInfo)
memset(&aChildInfo, 0, sizeof(aChildInfo));
memcpy(&aChildInfo.mExtAddress, &aChild.mMacAddr, sizeof(aChildInfo.mExtAddress));
aChildInfo.mTimeout = aChild.mTimeout;
aChildInfo.mRloc16 = aChild.mValid.mRloc16;
aChildInfo.mChildId = GetChildId(aChild.mValid.mRloc16);
aChildInfo.mNetworkDataVersion = aChild.mNetworkDataVersion;
aChildInfo.mAge = Timer::MsecToSec(Timer::GetNow() - aChild.mLastHeard);
aChildInfo.mLinkQualityIn = aChild.mLinkInfo.GetLinkQuality(mNetif.GetMac().GetNoiseFloor());
aChildInfo.mAverageRssi = aChild.mLinkInfo.GetAverageRss();
aChildInfo.mRxOnWhenIdle = (aChild.mMode & ModeTlv::kModeRxOnWhenIdle) != 0;
aChildInfo.mTimeout = aChild.mTimeout;
aChildInfo.mRloc16 = aChild.mValid.mRloc16;
aChildInfo.mChildId = GetChildId(aChild.mValid.mRloc16);
aChildInfo.mNetworkDataVersion = aChild.mNetworkDataVersion;
aChildInfo.mAge = Timer::MsecToSec(Timer::GetNow() - aChild.mLastHeard);
aChildInfo.mLinkQualityIn = aChild.mLinkInfo.GetLinkQuality(mNetif.GetMac().GetNoiseFloor());
aChildInfo.mAverageRssi = aChild.mLinkInfo.GetAverageRss();
aChildInfo.mLastRssi = aChild.mLinkInfo.GetLastRss();
aChildInfo.mRxOnWhenIdle = (aChild.mMode & ModeTlv::kModeRxOnWhenIdle) != 0;
aChildInfo.mSecureDataRequest = (aChild.mMode & ModeTlv::kModeSecureDataRequest) != 0;
aChildInfo.mFullFunction = (aChild.mMode & ModeTlv::kModeFFD) != 0;
aChildInfo.mFullNetworkData = (aChild.mMode & ModeTlv::kModeFullNetworkData) != 0;
aChildInfo.mFullFunction = (aChild.mMode & ModeTlv::kModeFFD) != 0;
aChildInfo.mFullNetworkData = (aChild.mMode & ModeTlv::kModeFullNetworkData) != 0;
exit:
return error;
@@ -3512,15 +3514,16 @@ ThreadError MleRouter::GetRouterInfo(uint16_t aRouterId, otRouterInfo &aRouterIn
VerifyOrExit(router != NULL, error = kThreadError_InvalidArgs);
memcpy(&aRouterInfo.mExtAddress, &router->mMacAddr, sizeof(aRouterInfo.mExtAddress));
aRouterInfo.mAllocated = router->mAllocated;
aRouterInfo.mRouterId = routerId;
aRouterInfo.mRloc16 = GetRloc16(routerId);
aRouterInfo.mNextHop = router->mNextHop;
aRouterInfo.mAllocated = router->mAllocated;
aRouterInfo.mRouterId = routerId;
aRouterInfo.mRloc16 = GetRloc16(routerId);
aRouterInfo.mNextHop = router->mNextHop;
aRouterInfo.mLinkEstablished = router->mState == Neighbor::kStateValid;
aRouterInfo.mPathCost = router->mCost;
aRouterInfo.mLinkQualityIn = router->mLinkInfo.GetLinkQuality(mNetif.GetMac().GetNoiseFloor());
aRouterInfo.mLinkQualityOut = router->mLinkQualityOut;
aRouterInfo.mAge = static_cast<uint8_t>(Timer::MsecToSec(Timer::GetNow() - router->mLastHeard));
aRouterInfo.mPathCost = router->mCost;
aRouterInfo.mLinkQualityIn = router->mLinkInfo.GetLinkQuality(mNetif.GetMac().GetNoiseFloor());
aRouterInfo.mLinkQualityOut = router->mLinkQualityOut;
aRouterInfo.mAge = static_cast<uint8_t>(Timer::MsecToSec(Timer::GetNow() - router->mLastHeard));
exit:
return error;
@@ -3581,6 +3584,7 @@ exit:
aNeighInfo.mMleFrameCounter = neighbor->mValid.mMleFrameCounter;
aNeighInfo.mLinkQualityIn = neighbor->mLinkInfo.GetLinkQuality(mNetif.GetMac().GetNoiseFloor());
aNeighInfo.mAverageRssi = neighbor->mLinkInfo.GetAverageRss();
aNeighInfo.mLastRssi = neighbor->mLinkInfo.GetLastRss();
aNeighInfo.mRxOnWhenIdle = (neighbor->mMode & ModeTlv::kModeRxOnWhenIdle) != 0;
aNeighInfo.mSecureDataRequest = (neighbor->mMode & ModeTlv::kModeSecureDataRequest) != 0;
aNeighInfo.mFullFunction = (neighbor->mMode & ModeTlv::kModeFFD) != 0;
src/ncp/ncp_base.cpp
+6 -2
View File
@@ -2460,6 +2460,7 @@ ThreadError NcpBase::GetPropertyHandler_THREAD_CHILD_TABLE(uint8_t header, spine
SPINEL_DATATYPE_UINT8_S // Link Quality In
SPINEL_DATATYPE_INT8_S // Average RSS
SPINEL_DATATYPE_UINT8_S // Mode (flags)
SPINEL_DATATYPE_INT8_S // Most recent RSS
),
childInfo.mExtAddress.m8,
childInfo.mRloc16,
@@ -2468,7 +2469,8 @@ ThreadError NcpBase::GetPropertyHandler_THREAD_CHILD_TABLE(uint8_t header, spine
childInfo.mNetworkDataVersion,
childInfo.mLinkQualityIn,
childInfo.mAverageRssi,
modeFlags
modeFlags,
childInfo.mLastRssi
));
}
@@ -2527,6 +2529,7 @@ ThreadError NcpBase::GetPropertyHandler_THREAD_NEIGHBOR_TABLE(uint8_t header, sp
SPINEL_DATATYPE_BOOL_S // Is Child
SPINEL_DATATYPE_UINT32_S // Link Frame Counter
SPINEL_DATATYPE_UINT32_S // MLE Frame Counter
SPINEL_DATATYPE_INT8_S // Most recent RSS
),
neighInfo.mExtAddress.m8,
neighInfo.mRloc16,
@@ -2536,7 +2539,8 @@ ThreadError NcpBase::GetPropertyHandler_THREAD_NEIGHBOR_TABLE(uint8_t header, sp
modeFlags,
neighInfo.mIsChild,
neighInfo.mLinkFrameCounter,
neighInfo.mMleFrameCounter
neighInfo.mMleFrameCounter,
neighInfo.mLastRssi
));
}