- fix burst statistics

- change defaults to float decoder, no eq

4 files changed, 10 insertions, 5 deletions

diff --git a/gsm-tvoid/src/lib/gsm.i b/gsm-tvoid/src/lib/gsm.i
index 624cc30..a362421 100644..100755
--- a/gsm-tvoid/src/lib/gsm.i
+++ b/gsm-tvoid/src/lib/gsm.i
@@ -69,6 +69,7 @@ public:
 	long			d_normal_count;
 	long			d_dummy_count;
 	long			d_unknown_count;
+	long			d_total_count;
 	
 	int				sync_state();
 	float 			last_freq_offset(void);
diff --git a/gsm-tvoid/src/lib/gsm_burst.cc b/gsm-tvoid/src/lib/gsm_burst.cc
index 711d3e7..ff5fac1 100644..100755
--- a/gsm-tvoid/src/lib/gsm_burst.cc
+++ b/gsm-tvoid/src/lib/gsm_burst.cc
@@ -148,6 +148,7 @@ void gsm_burst::full_reset(void)
 	d_normal_count=0;
 	d_dummy_count=0;
 	d_unknown_count=0;
+	d_total_count=0;
 		  	
 	d_freq_offset=0.0;
 	d_freq_off_sum=0.0;
@@ -752,6 +753,7 @@ int gsm_burst::get_burst(void)
 	}
 
 	if (got_burst) {
+		d_total_count++;
 		//do callback
 		//do_tuner_callback(p_tuner,1.0);
 		//if (p_callback)
diff --git a/gsm-tvoid/src/lib/gsm_burst.h b/gsm-tvoid/src/lib/gsm_burst.h
index d80b9a9..b5313c4 100644..100755
--- a/gsm-tvoid/src/lib/gsm_burst.h
+++ b/gsm-tvoid/src/lib/gsm_burst.h
@@ -180,6 +180,7 @@ public:
 	long			d_normal_count;
 	long			d_dummy_count;
 	long			d_unknown_count;
+	long			d_total_count;
 	
 	////// Options
 	unsigned long	d_clock_options;
diff --git a/gsm-tvoid/src/python/gsm_scan.py b/gsm-tvoid/src/python/gsm_scan.py
index f8fa033..432b16e 100755
--- a/gsm-tvoid/src/python/gsm_scan.py
+++ b/gsm-tvoid/src/python/gsm_scan.py
@@ -108,7 +108,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
 				
 
 		#decoder options
-		parser.add_option("-D", "--decoder", type="string", default="c",
+		parser.add_option("-D", "--decoder", type="string", default="f",
 							help="Select decoder block to use. (c)omplex,(f)loat [default=%default]")
 		parser.add_option("-d", "--decim", type="int", default=112,
 							help="Set fgpa decimation rate to DECIM [default=%default]")
@@ -116,7 +116,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
 							help="Tuning offset frequency")
 		parser.add_option("-C", "--clock-offset", type="eng_float", default=0.0,
 							help="Sample clock offset frequency")
-		parser.add_option("-E", "--equalizer", type="string", default="fixed-dfe",
+		parser.add_option("-E", "--equalizer", type="string", default="none",
 							help="Type of equalizer to use.  none, fixed-dfe [default=%default]")
 		parser.add_option("-t", "--timing", type="string", default="cq",
 							help="Type of timing techniques to use. [default=%default] \n" +
@@ -479,9 +479,10 @@ class app_flow_graph(stdgui.gui_flow_graph):
 			self._set_status_msg("Invalid Channel")
 
 	def print_stats(self):
-		n_known = self.burst.d_fcch_count + self.burst.d_sch_count + self.burst.d_normal_count + self.burst.d_dummy_count
-		n_total = n_known + self.burst.d_dummy_count
-
+		n_total = self.burst.d_total_count
+		n_unknown = self.burst.d_unknown_count
+		n_known = n_total - n_unknown
+		
 		print "======== STATS ========="
 		print 'freq_offset:    ',self.burst.mean_freq_offset()
 		print 'sync_loss_count:',self.burst.d_sync_loss_count