summaryrefslogtreecommitdiff
path: root/gnuradio-core
diff options
context:
space:
mode:
authoreb2006-12-19 19:45:52 +0000
committereb2006-12-19 19:45:52 +0000
commit81d3ab82071b3c24f1e750f5f33753436b58fc2d (patch)
treee4a0b12c5db9ff910db55ebad7ffefa9f506fe9e /gnuradio-core
parent0b81b3001db022aeb3107799a0241b51810a34da (diff)
downloadgnuradio-81d3ab82071b3c24f1e750f5f33753436b58fc2d.tar.gz
gnuradio-81d3ab82071b3c24f1e750f5f33753436b58fc2d.tar.bz2
gnuradio-81d3ab82071b3c24f1e750f5f33753436b58fc2d.zip
Fix for ticket:104, huge initial value plotted.
Problem was due to uninitialized internal buffer, combined with incorrect initial state. Thanks for the patch, Don. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4149 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core')
-rw-r--r--gnuradio-core/src/lib/io/gr_oscope_guts.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.cc b/gnuradio-core/src/lib/io/gr_oscope_guts.cc
index 2a152b95a..83b523254 100644
--- a/gnuradio-core/src/lib/io/gr_oscope_guts.cc
+++ b/gnuradio-core/src/lib/io/gr_oscope_guts.cc
@@ -60,11 +60,11 @@ gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, gr_msg_queue_
d_update_rate (20),
d_trigger_level (0),
d_obi (0),
- d_state (LOOK_FOR_TRIGGER),
+ d_state (HOLD_OFF),
d_decimator_count (0),
d_decimator_count_init (1),
d_hold_off_count (0),
- d_hold_off_count_init (0),
+ d_hold_off_count_init (OUTPUT_RECORD_SIZE/2),
d_post_trigger_count (0),
d_post_trigger_count_init (OUTPUT_RECORD_SIZE/2),
d_prev_sample (0)
@@ -77,11 +77,14 @@ gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, gr_msg_queue_
for (int i = 0; i < MAX_CHANNELS; i++)
d_buffer[i] = 0;
- for (int i = 0; i < d_nchannels; i++)
+ for (int i = 0; i < d_nchannels; i++){
d_buffer[i] = new float [OUTPUT_RECORD_SIZE];
+ for (int j = 0; j < OUTPUT_RECORD_SIZE; j++)
+ d_buffer[i][j] = 0.0;
+ }
+ enter_hold_off ();
update_rate_or_decimation_changed ();
- enter_look_for_trigger ();
}
gr_oscope_guts::~gr_oscope_guts ()