[Commit-gnuradio] r3581 - gnuradio/branches/developers/jcorgan/pager/gr-pager/src

[jcorgan]

Author: jcorgan
Date: 2006-09-18 23:57:02 -0600 (Mon, 18 Sep 2006)
New Revision: 3581

Modified:
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.cc
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.h
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/usrp_flex.py
Log:
Work in progress

Modified: gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am 
2006-09-19 04:46:55 UTC (rev 3580)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/Makefile.am 
2006-09-19 05:57:02 UTC (rev 3581)
@@ -27,6 +27,9 @@
 TESTS = \
     run_tests
 
+bin_SCRIPTS = \
+    usrp_flex.py
+
 noinst_PYTHON = \
     qa_pager.py
 

Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.cc    
    2006-09-19 04:46:55 UTC (rev 3580)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.cc    
    2006-09-19 05:57:02 UTC (rev 3581)
@@ -31,3 +31,13 @@
 };
 
 const int num_flex_modes = sizeof(flex_modes);
+
+int find_flex_mode(gr_int32 sync_code)
+{
+       for (int i = 0; i < num_flex_modes; i++)
+               if (flex_modes[i].sync == sync_code)
+                       return i;
+       
+       // Not found
+       return -1;
+}

Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.h
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.h 
2006-09-19 04:46:55 UTC (rev 3580)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pageri_flex_modes.h 
2006-09-19 05:57:02 UTC (rev 3581)
@@ -42,4 +42,6 @@
 extern const flex_mode_t flex_modes[];
 extern const int num_flex_modes;
 
+int find_flex_mode(gr_int32 sync_code);
+
 #endif // INCLUDED_PAGERI_FLEX_MODES_H

Modified: gnuradio/branches/developers/jcorgan/pager/gr-pager/src/usrp_flex.py
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-pager/src/usrp_flex.py        
2006-09-19 04:46:55 UTC (rev 3580)
+++ gnuradio/branches/developers/jcorgan/pager/gr-pager/src/usrp_flex.py        
2006-09-19 05:57:02 UTC (rev 3581)
@@ -1,12 +1,10 @@
 #!/usr/bin/env python
 
-from gnuradio import gr, gru, usrp, optfir, eng_notation, blks
+from gnuradio import gr, gru, usrp, optfir, eng_notation, blks, pager
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import time, os, sys
 
-from flex_demod import flex_demod
-
 """
 This example application demonstrates receiving and demodulating the
 FLEX pager protocol.
@@ -115,7 +113,7 @@
                         1.0,               # Initial gain
                         1.0)               # Maximum gain
        
-        FLEX = flex_demod(self, 32000)      
+        FLEX = pager.flex_demod(self, 32000)      
 
         SINK = gr.file_sink(4, options.filename)