From ab1a55061a032deb53eec704857dad14e6b5a19a Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sat, 25 May 2019 10:32:43 +0000 Subject: [PATCH] - fixed nom to 10 - introduced XDs git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@465 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- gr-jay/lib/peak_detect_impl.cc | 7 ++++++- gr-jay/lib/peak_detect_impl.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gr-jay/lib/peak_detect_impl.cc b/gr-jay/lib/peak_detect_impl.cc index 87e9d22..53b7458 100644 --- a/gr-jay/lib/peak_detect_impl.cc +++ b/gr-jay/lib/peak_detect_impl.cc @@ -58,6 +58,7 @@ namespace gr { m_pXs = new float[vlen]; m_pXm = new float[vlen]; m_pXd = new float[vlen]; + m_pXds = new float[vlen]; m_pPeakPos = new int[vlen]; m_pPeakBox_rel = new float[vlen]; m_pPeakBox_abs = new float[vlen]; @@ -67,6 +68,7 @@ namespace gr { memset(m_pXs, 0, vlen*sizeof(float)); memset(m_pXm, 0, vlen*sizeof(float)); memset(m_pXd, 0, vlen*sizeof(float)); + memset(m_pXds, 0, vlen*sizeof(float)); memset(m_pPeakPos, 0, vlen*sizeof(int)); memset(m_pPeakBox_rel, 0, vlen*sizeof(float)); memset(m_pPeakBox_abs, 0, vlen*sizeof(float)); @@ -85,6 +87,7 @@ namespace gr { delete [] m_pPeakBox_abs; delete [] m_pPeakBox_rel; delete [] m_pPeakPos; + delete [] m_pXds; delete [] m_pXd; delete [] m_pXm; delete [] m_pXs; @@ -200,7 +203,9 @@ namespace gr { { // Create peak distances by subtracting Xm float Xd = m_pX[i]-m_pXm[i]; + float Xds = m_pXs[i]-m_pXm[i]; m_pXd[i] = Xd; + m_pXds[i] = Xds; } // ----------------------------------------------------------------- @@ -269,7 +274,7 @@ namespace gr { int pos = m_pPeakPos[i]; int left = pos; int right = pos; - float nom = m_pXd[pos]; + float nom = 10; int left_found = 0; int right_found = 0; while(!(left_found & right_found)) diff --git a/gr-jay/lib/peak_detect_impl.h b/gr-jay/lib/peak_detect_impl.h index 0f7d5db..5925733 100644 --- a/gr-jay/lib/peak_detect_impl.h +++ b/gr-jay/lib/peak_detect_impl.h @@ -67,6 +67,7 @@ namespace jay { float *m_pXs; float *m_pXm; float *m_pXd; + float *m_pXds; int *m_pPeakPos; float *m_pPeakBox_rel; float *m_pPeakBox_abs;