commit 1dd05cf35a8c5e3c2acfbc4e23e26d41ea4a9aa9
author Alexander Chemeris <Alexander.Chemeris@gmail.com> Wed Mar 15 23:23:36 2017 +0300
committer Alexander Chemeris <Alexander.Chemeris@gmail.com> Wed Mar 22 18:09:00 2017 +0000
tree 9efd28ce2955b6cd045b3156d573d2c6c6784c66
parent 14d13b67dcd4fa35b03cbbef0c5ddd2622b89155

sigProcLib: make energyDetect() simpler by returning actual energy.

Change-Id: I9bf97f2dc03fea9bebcf43198dfb05f6e4694e9c

Transceiver52M/sigProcLib.cpp

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 @@
   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 @@
     energy += windowItr->norm2();
     windowItr+=4;
   }
-  if (avgPwr) *avgPwr = energy/windowLength;
-  return (energy/windowLength > detectThreshold*detectThreshold);
+  return energy/windowLength;
 }
 
 /*