[Commit-gnuradio] r10546 - gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python

[michaelld]

Author: michaelld
Date: 2009-03-01 12:44:19 -0700 (Sun, 01 Mar 2009)
New Revision: 10546

Modified:
   
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_rx_sfile.py
   
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_usrp_fft.py
Log:
Modified the Python examples to use gr.and_const_XX instead of
gpio.and_const_XX (i.e., replacing 'gpio.' with 'gr.' for those
blocks).



Modified: 
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_rx_sfile.py
===================================================================
--- 
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_rx_sfile.py
 2009-03-01 19:43:55 UTC (rev 10545)
+++ 
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_rx_sfile.py
 2009-03-01 19:44:19 UTC (rev 10546)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -79,8 +79,8 @@
            self.connect(u, head)
            src = head
 
-       ana_strip = gpio.and_const_ss(0xFFFE)
-       dig_strip = gpio.and_const_ss(0x0001)
+       ana_strip = gr.and_const_ss(0xFFFE)
+       dig_strip = gr.and_const_ss(0x0001)
         ana_sink = gr.file_sink(gr.sizeof_short, options.ana_filename)
        dig_sink = gr.file_sink(gr.sizeof_short, options.dig_filename)
     

Modified: 
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_usrp_fft.py
===================================================================
--- 
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_usrp_fft.py
 2009-03-01 19:43:55 UTC (rev 10545)
+++ 
gnuradio/branches/developers/michaelld/two_mods/gr-gpio/src/python/gpio_usrp_fft.py
 2009-03-01 19:44:19 UTC (rev 10546)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -144,10 +144,10 @@
           thr = gr.throttle(gr.sizeof_short, input_rate)
           self.connect(self.filesrc,thr,self.is2c,self.scope)
         elif options.digital:
-          self.select_dig=gpio.and_const_ss(0x0001)
+          self.select_dig=gr.and_const_ss(0x0001)
           self.connect(self.u, self.select_dig,self.is2c,self.scope)
         elif options.analog:
-          self.select_ana=gpio.and_const_ss(0xFFFE)
+          self.select_ana=gr.and_const_ss(0xFFFE)
           self.connect(self.u, self.select_ana,self.is2c,self.scope)
         else:
           self.connect(self.u,self.is2c,self.scope)