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

Update JamDetector to invoke handler every second when jam is detected (#972)

Browse Source
This commit is contained in:
Abtin Keshavarzian
2016-11-15 16:17:51 +08:00
committed by Jonathan Hui
parent a7668d6475
commit dd61e9cce6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openthread-jam-detection.h
+1 -2
View File
@@ -130,7 +130,7 @@ uint8_t otGetJamDetectionBusyPeriod(otInstance *aInstance);
* Start the jamming detection. * Start the jamming detection.
* *
* @param[in] aInstance A pointer to an OpenThread instance. * @param[in] aInstance A pointer to an OpenThread instance.
* @param[in] aCallback A pointer to a function called when jamming state changes. * @param[in] aCallback A pointer to a function called to notify of jamming state change.
* @param[in] aContext A pointer to application-specific context. * @param[in] aContext A pointer to application-specific context.
* *
* @retval kThreadErrorNone Successfully started the jamming detection. * @retval kThreadErrorNone Successfully started the jamming detection.
@@ -159,7 +159,6 @@ ThreadError otStopJamDetection(otInstance *aInstance);
*/ */
bool otIsJamDetectionEnabled(otInstance *aInstance); bool otIsJamDetectionEnabled(otInstance *aInstance);
/** /**
* Get the Jam Detection State * Get the Jam Detection State
* *
src/core/utils/jam_detector.cpp
+9 -3
View File
@@ -183,6 +183,8 @@ exit:
void JamDetector::UpdateHistory(bool aDidExceedThreshold) void JamDetector::UpdateHistory(bool aDidExceedThreshold)
{ {
uint32_t now = Timer::GetNow();
// If the RSSI is ever below the threshold, update mAlwaysAboveThreshold // If the RSSI is ever below the threshold, update mAlwaysAboveThreshold
// for current second interval. // for current second interval.
if (!aDidExceedThreshold) if (!aDidExceedThreshold)
@@ -191,7 +193,7 @@ void JamDetector::UpdateHistory(bool aDidExceedThreshold)
} }
// If we reached end of current one second interval, update the history bitmap // If we reached end of current one second interval, update the history bitmap
if (Timer::GetNow() - mCurSecondStartTime >= kOneSecondInterval) if (now - mCurSecondStartTime >= kOneSecondInterval)
{ {
mHistoryBitmap <<= 1; mHistoryBitmap <<= 1;
@@ -201,7 +203,11 @@ void JamDetector::UpdateHistory(bool aDidExceedThreshold)
} }
mAlwaysAboveThreshold = true; mAlwaysAboveThreshold = true;
mCurSecondStartTime += kOneSecondInterval;
while (now - mCurSecondStartTime >= kOneSecondInterval)
{
mCurSecondStartTime += kOneSecondInterval;
}
UpdateJamState(); UpdateJamState();
} }
@@ -227,7 +233,7 @@ void JamDetector::UpdateJamState(void)
mJamState = (numJammedSeconds >= mBusyPeriod); mJamState = (numJammedSeconds >= mBusyPeriod);
// If there is a change, invoke the handler. // If there is a change, invoke the handler.
if (mJamState != oldJamState) if ((mJamState != oldJamState) || (mJamState == true))
{ {
mHandler(mJamState, mContext); mHandler(mJamState, mContext);
} }