op25
/
op25
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

class variable naming conflict

This commit is contained in:
Max 2022-06-05 14:56:27 -04:00
parent 387cf57662
commit 3af1dbe0db
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
op25/gr-op25/lib/fsk4_demod_ff_impl.cc
View File

@ -27,6 +27,7 @@
#include <stdio.h> #include <stdio.h>
#include <gnuradio/io_signature.h> #include <gnuradio/io_signature.h>
#include <boost/scoped_array.hpp>
#include "fsk4_demod_ff_impl.h" #include "fsk4_demod_ff_impl.h"
/* /*
@ -186,7 +187,7 @@ namespace gr {
gr::io_signature::make(1, 1, sizeof(float)), gr::io_signature::make(1, 1, sizeof(float)),
gr::io_signature::make(1, 1, sizeof(float))), gr::io_signature::make(1, 1, sizeof(float))),
d_block_rate(sample_rate_Hz / symbol_rate_Hz), d_block_rate(sample_rate_Hz / symbol_rate_Hz),
d_history(new float[NTAPS]), my_d_history(new float[NTAPS]),
d_history_last(0), d_history_last(0),
d_queue(queue), d_queue(queue),
d_symbol_clock(0.0), d_symbol_clock(0.0),
@ -196,7 +197,7 @@ namespace gr {
fine_frequency_correction = 0.0; fine_frequency_correction = 0.0;
coarse_frequency_correction = 0.0; coarse_frequency_correction = 0.0;
std::fill(&d_history[0], &d_history[NTAPS], 0.0); std::fill(&my_d_history[0], &my_d_history[NTAPS], 0.0);
} }
/* /*
@ -269,7 +270,7 @@ namespace gr {
{ {
d_symbol_clock += d_symbol_time; d_symbol_clock += d_symbol_time;
d_history[d_history_last++] = input; my_d_history[d_history_last++] = input;
d_history_last %= NTAPS; d_history_last %= NTAPS;
if(d_symbol_clock > 1.0) { if(d_symbol_clock > 1.0) {
@ -296,8 +297,8 @@ namespace gr {
double interp = 0.0; double interp = 0.0;
double interp_p1 = 0.0; double interp_p1 = 0.0;
for(size_t i = 0, j = d_history_last; i < NTAPS; ++i) { for(size_t i = 0, j = d_history_last; i < NTAPS; ++i) {
interp += TAPS[imu][i] * d_history[j]; interp += TAPS[imu][i] * my_d_history[j];
interp_p1 += TAPS[imu_p1][i] * d_history[j]; interp_p1 += TAPS[imu_p1][i] * my_d_history[j];
j = (j + 1) % NTAPS; j = (j + 1) % NTAPS;
} }
#else #else
@ -306,8 +307,8 @@ namespace gr {
double interp_p1 = 0.0; double interp_p1 = 0.0;
for(int i=0; i<NTAPS; i++) for(int i=0; i<NTAPS; i++)
{ {
interp += TAPS[imu ][i] * d_history[j]; interp += TAPS[imu ][i] * my_d_history[j];
interp_p1 += TAPS[imu_p1][i] * d_history[j]; interp_p1 += TAPS[imu_p1][i] * my_d_history[j];
j = (j+1) % NTAPS; j = (j+1) % NTAPS;
} }
#endif #endif

2
op25/gr-op25/lib/fsk4_demod_ff_impl.h
View File

@ -33,7 +33,7 @@ namespace gr {
{ {
private: private:
const float d_block_rate; const float d_block_rate;
boost::scoped_array<float> d_history; boost::scoped_array<float> my_d_history;
size_t d_history_last; size_t d_history_last;
gr::msg_queue::sptr d_queue; gr::msg_queue::sptr d_queue;
double d_symbol_clock; double d_symbol_clock;