[Commit-gnuradio] r5795 - grc/branches/jblum_work/src/SignalBlockDefs

[jblum]

Author: jblum
Date: 2007-06-19 01:24:18 -0600 (Tue, 19 Jun 2007)
New Revision: 5795

Modified:
   grc/branches/jblum_work/src/SignalBlockDefs/Conversions.py
   grc/branches/jblum_work/src/SignalBlockDefs/Filters.py
   grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py
Log:
added vco and map blocks

Modified: grc/branches/jblum_work/src/SignalBlockDefs/Conversions.py
===================================================================
--- grc/branches/jblum_work/src/SignalBlockDefs/Conversions.py  2007-06-19 
03:35:42 UTC (rev 5794)
+++ grc/branches/jblum_work/src/SignalBlockDefs/Conversions.py  2007-06-19 
07:24:18 UTC (rev 5795)
@@ -22,18 +22,20 @@
 
 from DataTypes import *
 from gnuradio import gr
-from SignalBlockConstants import all_choices,all_vector_choices
+from SignalBlockConstants import 
all_choices,all_vector_choices,default_samp_rate
 from Constants import MAX_NUM_SOCKETS
 
 def ComplexComponents(sb):             
        vlen = Int(1, min=1)
        sb.add_input_socket('in', Complex(), vlen=vlen)
        sb.add_output_socket('out', Float(), vlen=vlen)
-       sb.add_param('Output Type', Enum([('Real', gr.complex_to_real),
-                                                                               
                ('Imaginary', gr.complex_to_imag),
-                                                                               
                ('Magnitude', gr.complex_to_mag),
-                                                                               
                ('Magnitude Squared', gr.complex_to_mag_squared),
-                                                                               
                ('Phase Angle', gr.complex_to_arg)]), type=True)        
+       sb.add_param('Output Type', Enum([
+               ('Real', gr.complex_to_real),
+               ('Imaginary', gr.complex_to_imag),
+               ('Magnitude', gr.complex_to_mag),
+               ('Magnitude Squared', gr.complex_to_mag_squared),
+               ('Phase Angle', gr.complex_to_arg),
+       ]), type=True)  
        sb.add_param('Vector Length', vlen)
        return sb, lambda fg, type, vlen: type.parse()(vlen.parse())
        
@@ -101,9 +103,11 @@
        return sb, lambda fg: fcn()
        
 def UnpackedToPacked(sb):
-       type = Enum([('Byte', (gr.unpacked_to_packed_bb, Byte())),
-                                       ('Short', (gr.unpacked_to_packed_ss, 
Short())),
-                                       ('Int', (gr.unpacked_to_packed_ii, 
Int())),])   
+       type = Enum([
+               ('Byte', (gr.unpacked_to_packed_bb, Byte())),
+               ('Short', (gr.unpacked_to_packed_ss, Short())),
+               ('Int', (gr.unpacked_to_packed_ii, Int())),
+       ])      
        sb.add_input_socket('in', Variable(type, index=1))
        sb.add_output_socket('out', Variable(type, index=1))
        sb.add_param('Type', type, False, type=True)
@@ -113,9 +117,11 @@
        return sb, lambda fg, type, bits_per_chunk, endianness: 
type.parse()[0](bits_per_chunk.parse(), endianness.parse())
        
 def PackedToUnpacked(sb):
-       type = Enum([('Byte', (gr.packed_to_unpacked_bb, Byte())),
-                                       ('Short', (gr.packed_to_unpacked_ss, 
Short())),
-                                       ('Int', (gr.packed_to_unpacked_ii, 
Int())),])   
+       type = Enum([
+               ('Byte', (gr.packed_to_unpacked_bb, Byte())),
+               ('Short', (gr.packed_to_unpacked_ss, Short())),
+               ('Int', (gr.packed_to_unpacked_ii, Int())),
+       ])      
        sb.add_input_socket('in', Variable(type, index=1))
        sb.add_output_socket('out', Variable(type, index=1))
        sb.add_param('Type', type, False, type=True)
@@ -260,4 +266,28 @@
        sb.set_docs('''Merge a vector-stream of size N into a single 
stream.''')        
        return sb, lambda fg, type, items_per_block, vlen: 
fcn(type.parse()[1].get_num_bytes()*vlen.parse(), items_per_block.parse())
        
+def Map(sb):
+       fcn = gr.map_bb
+       sb.add_input_socket('in', Byte())
+       sb.add_output_socket('out', Byte())
+       sb.add_param('Vector', IntVector(''))
+       sb.set_docs('''output[i] = map[input[i]]''')    
+       return sb, lambda fg, vector: fcn(vector.parse())
+       
+def VCO(sb):
+       fcn = gr.vco_f
+       sb.add_input_socket('in', Float())
+       sb.add_output_socket('out', Float())
+       sb.add_param('Sampling Rate', Float(default_samp_rate))
+       sb.add_param('Sensitivity', Float(1))
+       sb.add_param('Amplitude', Float(1))
+       sb.set_docs('''\
+VCO - Voltage controlled oscillator.
+
+Parameters:
+       sampling_rate   sampling rate (Hz)
+       sensitivity     units are radians/sec/volt
+       amplitude       output amplitude        
+''')   
+       return sb, lambda fg, samp_rate, sense, amp: fcn(samp_rate.parse(), 
sense.parse(), amp.parse())
        
\ No newline at end of file

Modified: grc/branches/jblum_work/src/SignalBlockDefs/Filters.py
===================================================================
--- grc/branches/jblum_work/src/SignalBlockDefs/Filters.py      2007-06-19 
03:35:42 UTC (rev 5794)
+++ grc/branches/jblum_work/src/SignalBlockDefs/Filters.py      2007-06-19 
07:24:18 UTC (rev 5795)
@@ -255,7 +255,7 @@
        sb.add_param('Filter Type', filters, type=True)         
        sb.add_param('Decimation', Int(1, min=1))
        sb.add_param('Gain', Float(1))
-       sb.add_param('Sampling Rate', Float(default_samp_rate), False)
+       sb.add_param('Sampling Rate', Float(default_samp_rate))
        sb.add_param('Symbol Rate', Float(100))
        sb.add_param('Alpha', Float(6.76))
        sb.add_param('Num Taps', Int(20, min=0))                

Modified: grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py
===================================================================
--- grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py      
2007-06-19 03:35:42 UTC (rev 5794)
+++ grc/branches/jblum_work/src/SignalBlockDefs/SignalBlockTree.py      
2007-06-19 07:24:18 UTC (rev 5795)
@@ -94,6 +94,8 @@
                                ('Unpack k Bits', Conversions.UnpackKBits),
                                ('Binary Slicer', Conversions.BinarySlicer),
                                ('Chunks to Symbols', 
Conversions.ChunksToSymbols),
+                               ('Map', Conversions.Map),
+                               ('VCO', Conversions.VCO),
                                ('Interleave', Conversions.Interleave),
                                ('Deinterleave', Conversions.Deinterleave),
                                ('Streams to Stream', 
Conversions.StreamsToStream),