commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r4149 - gnuradio/trunk/gnuradio-core/src/lib/io


From: eb
Subject: [Commit-gnuradio] r4149 - gnuradio/trunk/gnuradio-core/src/lib/io
Date: Tue, 19 Dec 2006 12:45:52 -0700 (MST)

Author: eb
Date: 2006-12-19 12:45:52 -0700 (Tue, 19 Dec 2006)
New Revision: 4149

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_oscope_guts.cc
Log:
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.


Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_oscope_guts.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_oscope_guts.cc   2006-12-19 
06:32:17 UTC (rev 4148)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_oscope_guts.cc   2006-12-19 
19:45:52 UTC (rev 4149)
@@ -60,11 +60,11 @@
     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 @@
   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 ()





reply via email to

[Prev in Thread] Current Thread [Next in Thread]