[Commit-gnuradio] r5600 - in gnuradio/branches/features/ofdm/receiver: gnuradio-core/src/lib/general gnuradio-core/src/python/gnuradio gnuradio-core/src/python/gnuradio/blksimpl gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-06-01 17:44:20 -0600 (Fri, 01 Jun 2007)
New Revision: 5600

Modified:
   
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
   
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
   
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
   
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
   
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/ofdm_sync.m
   
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
Log:
OFDM mostly working with no noise or space between packets

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
        2007-06-01 23:36:00 UTC (rev 5599)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
        2007-06-01 23:44:20 UTC (rev 5600)
@@ -175,7 +175,7 @@
            printf("%02x", d_packet[k]);
          printf("\n");
          
-         assert(d_packetlen < 500);
+         assert(d_packetlen < 1500);
          
          while((j < bytes) && (d_packetlen_cnt < d_packetlen)) {
            d_packet[d_packetlen_cnt++] = bytes_out[j++];

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
        2007-06-01 23:36:00 UTC (rev 5599)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_receiver.py
        2007-06-01 23:44:20 UTC (rev 5600)
@@ -39,9 +39,10 @@
         # Energy Detection from ML Sync
 
         # Create a delay line
-        delayline = [0.0 for i in range(fft_length+1)]
-        delayline[fft_length] = 1.0
-        self.delay = gr.fir_filter_ccf(1,delayline)
+        #delayline = [0.0 for i in range(fft_length+1)]
+        #delayline[fft_length] = 1.0
+        #self.delay = gr.fir_filter_ccf(1,delayline)
+        self.delay = gr.delay(gr.sizeof_gr_complex, fft_length)
         self.fg.connect(self.input, self.delay)
 
         # magnitude squared blocks
@@ -66,7 +67,6 @@
         movingsum2_taps = [1.0 for i in range(cp_length)]
         self.movingsum2 = gr.fir_filter_ccf(1,movingsum2_taps)
         
-
         # Correlator data handler
         self.c2mag = gr.complex_to_mag()
         self.angle = gr.complex_to_arg()
@@ -74,12 +74,20 @@
         self.fg.connect(self.delay,self.conjg,(self.mixer,0))
         self.fg.connect(self.mixer,self.movingsum2,self.c2mag)
         self.fg.connect(self.movingsum2,self.angle)
-             
+
         # ML Sync output arg, need to find maximum point of this
         self.diff = gr.sub_ff()
         self.fg.connect(self.c2mag,(self.diff,0))
         self.fg.connect(self.moving_sum_filter,(self.diff,1))
 
+
+        self.fg.connect(self.input, gr.file_sink(gr.sizeof_gr_complex, 
"input.dat"))
+        self.fg.connect(self.delay, gr.file_sink(gr.sizeof_gr_complex, 
"g.dat"))
+        self.fg.connect(self.conjg, gr.file_sink(gr.sizeof_gr_complex, 
"g1.dat"))
+        self.fg.connect(self.mixer, gr.file_sink(gr.sizeof_gr_complex, 
"k.dat"))
+        self.fg.connect(self.movingsum2, gr.file_sink(gr.sizeof_gr_complex, 
"h.dat"))
+                     
+
         #ML measurements input to sampler block and detect
         nco_sensitivity = 1.0/fft_length
         self.f2c = gr.float_to_complex()

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
     2007-06-01 23:36:00 UTC (rev 5599)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
     2007-06-01 23:44:20 UTC (rev 5600)
@@ -128,8 +128,8 @@
     if pad_for_usrp:
         usrp_packing = _npadding_bytes(packet_length, samples_per_symbol, 
bits_per_symbol) * '\x55'
         pkt_dt = pkt_dt + usrp_packing
-    #pkt = pkt_hd + whiten(pkt_dt, whitener_offset)
-    pkt = pkt_hd + pkt_dt
+    pkt = pkt_hd + whiten(pkt_dt, whitener_offset)
+    #pkt = pkt_hd + pkt_dt
 
     #print "make_packet: len(pkt) =", len(pkt)
 
@@ -163,8 +163,8 @@
 
     @param whitened_payload_with_crc: string
     """
-    #payload_with_crc = dewhiten(whitened_payload_with_crc, whitener_offset)
-    payload_with_crc = whitened_payload_with_crc
+    payload_with_crc = dewhiten(whitened_payload_with_crc, whitener_offset)
+    #payload_with_crc = whitened_payload_with_crc
     ok, payload = gru.check_crc32(payload_with_crc)
 
     if 0:

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
    2007-06-01 23:36:00 UTC (rev 5599)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/benchmark_ofdm.py
    2007-06-01 23:44:20 UTC (rev 5600)
@@ -180,8 +180,10 @@
 
     while n < nbytes:
         #r = ''.join([chr(random.randint(0,255)) for i in range(pkt_size-2)])
+        #pkt_contents = struct.pack('!H', pktno) + r
+
         pkt_contents = struct.pack('!H', pktno) + (pkt_size - 2) * chr(pktno & 
0xff)
-        #pkt_contents = struct.pack('!H', pktno) + r
+
         send_pkt(pkt_contents)
         n += pkt_size
         #sys.stderr.write('.')

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/ofdm_sync.m
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/ofdm_sync.m
  2007-06-01 23:36:00 UTC (rev 5599)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/ofdm_sync.m
  2007-06-01 23:44:20 UTC (rev 5600)
@@ -1,6 +1,6 @@
 %
 
-function theta = ofdm_sync(signal,SNR,FFTSIZE,CPLEN)
+function [theta, g, g1, k, h] = ofdm_sync(signal,SNR,FFTSIZE,CPLEN)
 
   rho = SNR/(SNR+1);
 

Modified: 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
===================================================================
--- 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
      2007-06-01 23:36:00 UTC (rev 5599)
+++ 
gnuradio/branches/features/ofdm/receiver/gnuradio-examples/python/ofdm/receive_path.py
      2007-06-01 23:44:20 UTC (rev 5600)
@@ -43,7 +43,7 @@
         self._log         = options.log
         self._rx_callback = rx_callback      # this callback is fired when 
there's a packet available
 
-        if 1:
+        if 0:
             bw = (float(options.occupied_tones) / float(options.fft_length)) / 
2.0
             tb = bw*0.08