[Commit-gnuradio] r5961 - gnuradio/branches/features/pager/gr-pager/src

[jcorgan]

Author: jcorgan
Date: 2007-07-14 00:50:08 -0600 (Sat, 14 Jul 2007)
New Revision: 5961

Modified:
   gnuradio/branches/features/pager/gr-pager/src/pager_flex_parse.cc
   gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc
   gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h
   gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py
   gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py
Log:
Added page type display, wip.

Modified: gnuradio/branches/features/pager/gr-pager/src/pager_flex_parse.cc
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pager_flex_parse.cc   
2007-07-14 06:05:00 UTC (rev 5960)
+++ gnuradio/branches/features/pager/gr-pager/src/pager_flex_parse.cc   
2007-07-14 06:50:08 UTC (rev 5961)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2006,2007 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -37,8 +37,8 @@
 
 pager_flex_parse::pager_flex_parse(gr_msg_queue_sptr queue, float freq) :
     gr_sync_block("flex_parse",
-       gr_make_io_signature(1, 1, sizeof(gr_int32)),
-       gr_make_io_signature(0, 0, 0)),
+    gr_make_io_signature(1, 1, sizeof(gr_int32)),
+    gr_make_io_signature(0, 0, 0)),
     d_queue(queue),
     d_freq(freq)
 {
@@ -137,7 +137,7 @@
        d_payload << std::setprecision(6) << std::setw(7)
                  << d_freq/1e6 << FIELD_DELIM 
                  << std::setw(10) << d_capcode << FIELD_DELIM
-                 << std::setw(1)  << d_type << FIELD_DELIM;
+                 << flex_page_desc[d_type] << FIELD_DELIM;
 
        if (is_alphanumeric_page(d_type))
            parse_alphanumeric(mw1, mw2-1, j);

Modified: gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc  
2007-07-14 06:05:00 UTC (rev 5960)
+++ gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.cc  
2007-07-14 06:50:08 UTC (rev 5961)
@@ -34,6 +34,18 @@
 
 unsigned char flex_bcd[17] = "0123456789 U -][";
 
+const char *flex_page_desc[] =
+{
+    "ENC",
+    "UNK",
+    "TON",
+    "NUM",
+    "SPN",
+    "ALN",
+    "BIN",
+    "NNM"
+};
+
 int find_flex_mode(gr_int32 sync_code)
 {
     for (int i = 0; i < num_flex_modes; i++)

Modified: gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h   
2007-07-14 06:05:00 UTC (rev 5960)
+++ gnuradio/branches/features/pager/gr-pager/src/pageri_flex_modes.h   
2007-07-14 06:50:08 UTC (rev 5961)
@@ -35,6 +35,7 @@
 flex_mode_t;
 
 extern const flex_mode_t flex_modes[];
+extern const char *flex_page_desc[];
 extern const int num_flex_modes;
 int find_flex_mode(gr_int32 sync_code);
 extern unsigned char flex_bcd[];

Modified: gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py  2007-07-14 
06:05:00 UTC (rev 5960)
+++ gnuradio/branches/features/pager/gr-pager/src/usrp_flex.py  2007-07-14 
06:50:08 UTC (rev 5961)
@@ -110,8 +110,8 @@
                                     if_rate,      # Sample rate
                                    11000,         # One sided modulation 
bandwidth
                                    12500,        # One sided channel bandwidth
-                                   1.0,          # Passband ripple
-                                   40)           # Stopband attenuation
+                                   0.1,          # Passband ripple
+                                   60)           # Stopband attenuation
        
         CHAN = gr.freq_xlating_fir_filter_ccf(channel_decim, # Decimation rate
                                               CHAN_taps,     # Filter taps

Modified: gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py
===================================================================
--- gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py      
2007-07-14 06:05:00 UTC (rev 5960)
+++ gnuradio/branches/features/pager/gr-pager/src/usrp_flex_all.py      
2007-07-14 06:50:08 UTC (rev 5961)
@@ -56,8 +56,6 @@
                       help="Read from file instead of USRP")
     (options, args) = parser.parse_args()
 
-    print options
-    
     queue = gr.msg_queue()
     fg = app_flow_graph(options, queue)
     try: