diff options
| author | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2017-03-15 23:23:36 +0300 |
|---|---|---|
| committer | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2017-03-22 18:09:00 +0000 |
| commit | 1dd05cf35a8c5e3c2acfbc4e23e26d41ea4a9aa9 (patch) | |
| tree | 9efd28ce2955b6cd045b3156d573d2c6c6784c66 /Transceiver52M/sigProcLib.cpp | |
| parent | 14d13b67dcd4fa35b03cbbef0c5ddd2622b89155 (diff) | |
sigProcLib: make energyDetect() simpler by returning actual energy.
Change-Id: I9bf97f2dc03fea9bebcf43198dfb05f6e4694e9c
Diffstat (limited to 'Transceiver52M/sigProcLib.cpp')
| -rw-r--r-- | Transceiver52M/sigProcLib.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index c1cf12e..41b18cf 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -1721,10 +1721,7 @@ static float computePeakRatio(signalVector *corr, return (amp.abs()) / rms; } -bool energyDetect(signalVector &rxBurst, - unsigned windowLength, - float detectThreshold, - float *avgPwr) +float energyDetect(signalVector &rxBurst, unsigned windowLength) { signalVector::const_iterator windowItr = rxBurst.begin(); //+rxBurst.size()/2 - 5*windowLength/2; @@ -1735,8 +1732,7 @@ bool energyDetect(signalVector &rxBurst, energy += windowItr->norm2(); windowItr+=4; } - if (avgPwr) *avgPwr = energy/windowLength; - return (energy/windowLength > detectThreshold*detectThreshold); + return energy/windowLength; } /* |