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/Transceiver.cpp

diff --git a/Transceiver52M/Transceiver.cpp b/Transceiver52M/Transceiver.cpp
index f156ad4..3df482f 100644
--- a/Transceiver52M/Transceiver.cpp
+++ b/Transceiver52M/Transceiver.cpp
@@ -606,7 +606,7 @@
 {
   int rc;
   complex amp;
-  float toa, pow, max = -1.0, avg = 0.0;
+  float toa, max = -1.0, avg = 0.0;
   int max_i = -1;
   signalVector *burst;
   SoftVector *bits = NULL;
@@ -641,7 +641,7 @@
 
   /* Select the diversity channel with highest energy */
   for (size_t i = 0; i < radio_burst->chans(); i++) {
-    energyDetect(*radio_burst->getVector(i), 20 * mSPSRx, 0.0, &pow);
+    float pow = energyDetect(*radio_burst->getVector(i), 20 * mSPSRx);
     if (pow > max) {
       max = pow;
       max_i = i;