[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r6563 - in gnuradio/trunk/gr-radar-mono/src: . fpga/to
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r6563 - in gnuradio/trunk/gr-radar-mono/src: . fpga/top python utils |
|
Date: |
Fri, 28 Sep 2007 15:44:05 -0600 (MDT) |
Author: jcorgan
Date: 2007-09-28 15:44:05 -0600 (Fri, 28 Sep 2007)
New Revision: 6563
Added:
gnuradio/trunk/gr-radar-mono/src/utils/
gnuradio/trunk/gr-radar-mono/src/utils/calc_avg.m
gnuradio/trunk/gr-radar-mono/src/utils/czpad.m
gnuradio/trunk/gr-radar-mono/src/utils/echo_image.m
gnuradio/trunk/gr-radar-mono/src/utils/fftcorr.m
gnuradio/trunk/gr-radar-mono/src/utils/pulse
gnuradio/trunk/gr-radar-mono/src/utils/read_avg.m
gnuradio/trunk/gr-radar-mono/src/utils/read_avg_sec.m
gnuradio/trunk/gr-radar-mono/src/utils/read_echos.m
Removed:
gnuradio/trunk/gr-radar-mono/src/utils/calc_avg.m
gnuradio/trunk/gr-radar-mono/src/utils/czpad.m
gnuradio/trunk/gr-radar-mono/src/utils/echo_image.m
gnuradio/trunk/gr-radar-mono/src/utils/fftcorr.m
gnuradio/trunk/gr-radar-mono/src/utils/pulse
gnuradio/trunk/gr-radar-mono/src/utils/read_avg.m
gnuradio/trunk/gr-radar-mono/src/utils/read_avg_sec.m
gnuradio/trunk/gr-radar-mono/src/utils/read_echos.m
Modified:
gnuradio/trunk/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf
gnuradio/trunk/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py
gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py
Log:
Merged r6552:6562 from jcorgan/radar into trunk. Updates gr-radar-mono with
changes from live field testing.
Modified: gnuradio/trunk/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf
===================================================================
(Binary files differ)
Modified: gnuradio/trunk/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/fpga/top/usrp_radar_mono.v 2007-09-28
21:38:34 UTC (rev 6562)
+++ gnuradio/trunk/gr-radar-mono/src/fpga/top/usrp_radar_mono.v 2007-09-28
21:44:05 UTC (rev 6563)
@@ -153,9 +153,12 @@
assign io_tx_b[5] = tx_side ? io_tx_ena : 1'bz;
// Route opposite of TX enable out to RFX receive mixer
- assign io_rx_a[5] = tx_side ? 1'bz : ~io_tx_ena;
- assign io_rx_b[5] = tx_side ? ~io_tx_ena : 1'bz;
+ //assign io_rx_a[5] = tx_side ? 1'bz : ~io_tx_ena;
+ //assign io_rx_b[5] = tx_side ? ~io_tx_ena : 1'bz;
+ assign io_rx_a[5] = 1'b1;
+ assign io_rx_b[5] = 1'b1;
+
// Route TX enable out to RX/TX switch
assign io_tx_a[6] = tx_side ? 1'bz : ~io_tx_ena;
assign io_tx_b[6] = tx_side ? ~io_tx_ena : 1'bz;
Modified: gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py 2007-09-28
21:38:34 UTC (rev 6562)
+++ gnuradio/trunk/gr-radar-mono/src/python/radar_mono.py 2007-09-28
21:44:05 UTC (rev 6563)
@@ -26,6 +26,9 @@
n2s = eng_notation.num_to_str
+txp_delay = 60 # Pipeline delay to turn on transmit mixer
+rxp_delay = 76 # Pipeline delay to turn off transmit mixer
+
#-----------------------------------------------------------------------
# FPGA Register Definitions
#-----------------------------------------------------------------------
@@ -92,7 +95,7 @@
self._u._write_fpga_reg(FR_RADAR_TON, self._ton_ticks)
def set_tsw(self, tsw):
- self._tsw_ticks = 2*(int(tsw*64e6)/2)-1 # Even number, then subtract 1
+ self._tsw_ticks = 2*(int(tsw*64e6)/2)-1+rxp_delay # Even number, then
subtract 1
if self._verbose:
print "Setting pulse switching time to", tsw, " sec
("+`self._tsw_ticks+1`+" ticks)"
self._u._write_fpga_reg(FR_RADAR_TSW, self._tsw_ticks)
@@ -246,7 +249,8 @@
self.set_reset(True)
self.set_tx_board(self._trans.subdev_spec())
self.set_debug(self._debug)
-
+ self.set_atrdel()
+
def _write_mode(self):
self._trans._u._write_fpga_reg(FR_RADAR_MODE, self._mode)
@@ -291,7 +295,7 @@
self._trans.set_freq(center_freq, chirp_width)
self._rcvr.tune(center_freq)
- def set_atrdel(self, tx_delay, rx_delay):
+ def set_atrdel(self, tx_delay=txp_delay, rx_delay=rxp_delay):
if self._verbose:
print "Setting TX delay of", tx_delay, "clocks, RX delay of",
rx_delay
self._trans._u._write_fpga_reg(FR_RADAR_ATRDEL, tx_delay << 16 |
rx_delay)
Modified: gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py 2007-09-28
21:38:34 UTC (rev 6562)
+++ gnuradio/trunk/gr-radar-mono/src/python/usrp_radar_mono.py 2007-09-28
21:44:05 UTC (rev 6563)
@@ -52,11 +52,11 @@
help="set waveform amplitude in % full scale, default is
%default,")
parser.add_option("", "--ton", type="eng_float", default=5e-6,
help="set pulse on period in seconds, default is
%default,")
- parser.add_option("", "--tsw", type="eng_float", default=406.25e-9,
+ parser.add_option("", "--tsw", type="eng_float", default=0.0,
help="set transmitter switching period in seconds,
default is %default,")
parser.add_option("", "--tlook", type="eng_float", default=5e-6,
help="set receiver look time in seconds, default is
%default,")
- parser.add_option("", "--prf", type="eng_float", default=10e3,
+ parser.add_option("", "--prf", type="eng_float", default=100,
help="set pulse repetition frequency in Hz, default is
%default,")
parser.add_option("-v", "--verbose", action="store_true", default=False,
help="enable verbose output, default is disabled")
@@ -84,7 +84,6 @@
r.set_prf(options.prf)
r.set_amplitude(options.amplitude)
r.set_freq(options.frequency, options.chirp_width)
- r.set_atrdel(64, 70) # TODO: parameterize
r.start()
raw_input("Press ENTER to stop.")
Copied: gnuradio/trunk/gr-radar-mono/src/utils (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils)
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/calc_avg.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/calc_avg.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/calc_avg.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/calc_avg.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/calc_avg.m 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,8 @@
+function avg = calc_avg(rlen, mintime)
+ avg = read_avg('echos.dat', rlen);
+ x = 1:rlen;
+ x = (x/64e6+mintime)*3e8/2;
+ plot(x, abs(avg), "^;Amplitude;");
+ xlabel("Range (meters)");
+ axis([max(x) 0])
+endfunction
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/czpad.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/czpad.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/czpad.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/czpad.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/czpad.m 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,8 @@
+# Center and zero pad v to length n
+function pad = czpad(v, n)
+ c = n/2;
+ l = length(v);
+ pad(c-l/2+1:c+l/2) = v;
+ pad(c+l/2+1:n) = 0;
+endfunction
+
\ No newline at end of file
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/echo_image.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/echo_image.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/echo_image.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/echo_image.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/echo_image.m 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,6 @@
+function echo_image(filename, data)
+ d = abs(data);
+ d = d-min(min(d));
+ d = d/(max(max(d)))*255;
+ pngwrite(filename, d, d, d, ones(size(d)));
+endfunction
\ No newline at end of file
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/fftcorr.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/fftcorr.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/fftcorr.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/fftcorr.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/fftcorr.m 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,4 @@
+# Perform circular correlation via FFT
+function corr = fftcorr(v,ref)
+ corr = ifft(conj(fft(ref)).*fft(v));
+endfunction
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/pulse
Copied: gnuradio/trunk/gr-radar-mono/src/utils/pulse (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/pulse)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/pulse
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/pulse 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,396 @@
+# Created by Octave 2.1.73, Tue Sep 25 14:17:22 2007 EDT <address@hidden>
+# name: __nargin__
+# type: scalar
+0
+# name: pulse321
+# type: complex matrix
+# rows: 64
+# columns: 1
+ (-0.0003662109375,0.9998779296875)
+ (-0.0003662109375,0.9998779296875)
+ (0,-0.9996337890625)
+ (0,-0.9996337890625)
+ (-0.0010986328125,-0.961181640625)
+ (-0.0010986328125,-0.961181640625)
+ (0.0072021484375,0.882568359375)
+ (0.0072021484375,0.882568359375)
+ (-0.0279541015625,-0.7666015625)
+ (-0.0279541015625,-0.7666015625)
+ (0.0765380859375,0.616943359375)
+ (0.0765380859375,0.616943359375)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.1688232421875,-0.4447021484375)
+ (0.3212890625,0.26611328125)
+ (0.3212890625,0.26611328125)
+ (-0.54638671875,-0.1092529296875)
+ (-0.54638671875,-0.1092529296875)
+ (0.843994140625,0.012451171875)
+ (0.843994140625,0.012451171875)
+ (0.8046875,-0.019775390625)
+ (0.8046875,-0.019775390625)
+ (-0.444580078125,0.1688232421875)
+ (-0.444580078125,0.1688232421875)
+ (0.147705078125,-0.477294921875)
+ (0.147705078125,-0.477294921875)
+ (-0.0032958984375,0.921142578125)
+ (-0.0032958984375,0.921142578125)
+ (0.09228515625,0.5811767578125)
+ (0.09228515625,0.5811767578125)
+ (-0.4447021484375,-0.1688232421875)
+ (-0.4447021484375,-0.1688232421875)
+ (0.9996337890625,0.000244140625)
+ (0.9996337890625,0.000244140625)
+ (0.4127197265625,-0.19140625)
+ (0.4127197265625,-0.19140625)
+ (-0.0379638671875,0.728759765625)
+ (-0.0379638671875,0.728759765625)
+ (0.09228515625,0.5811767578125)
+ (0.09228515625,0.5811767578125)
+ (-0.617919921875,-0.0762939453125)
+ (-0.617919921875,-0.0762939453125)
+ (-0.6170654296875,0.0765380859375)
+ (-0.6170654296875,0.0765380859375)
+ (0.0621337890625,-0.654296875)
+ (0.0621337890625,-0.654296875)
+ (-0.127685546875,-0.511962890625)
+ (-0.127685546875,-0.511962890625)
+ (0.843994140625,0.012451171875)
+ (0.843994140625,0.012451171875)
+ (0.29296875,-0.293212890625)
+ (0.29296875,-0.293212890625)
+ (-0.01953125,-0.8046875)
+ (-0.01953125,-0.8046875)
+ (0.654296875,0.0618896484375)
+ (0.654296875,0.0618896484375)
+ (0.3505859375,-0.239990234375)
+ (0.3505859375,-0.239990234375)
+ (-0.0279541015625,-0.7666015625)
+ (-0.0279541015625,-0.7666015625)
+ (0.805419921875,0.01953125)
+ (0.805419921875,0.01953125)
+ (0.1688232421875,-0.444580078125)
+ (0.1688232421875,-0.444580078125)
+# name: pulse325
+# type: complex matrix
+# rows: 320
+# columns: 1
+ (-0.0003662109375,0.9998779296875)
+ (-0.0003662109375,0.9998779296875)
+ (0,-0.9996337890625)
+ (0,-0.9996337890625)
+ (-0.0010986328125,-0.961181640625)
+ (-0.0010986328125,-0.961181640625)
+ (0.0072021484375,0.882568359375)
+ (0.0072021484375,0.882568359375)
+ (-0.0279541015625,-0.7666015625)
+ (-0.0279541015625,-0.7666015625)
+ (0.0765380859375,0.616943359375)
+ (0.0765380859375,0.616943359375)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.1688232421875,-0.4447021484375)
+ (0.3212890625,0.26611328125)
+ (0.3212890625,0.26611328125)
+ (-0.54638671875,-0.1092529296875)
+ (-0.54638671875,-0.1092529296875)
+ (0.843994140625,0.012451171875)
+ (0.843994140625,0.012451171875)
+ (0.8046875,-0.019775390625)
+ (0.8046875,-0.019775390625)
+ (-0.444580078125,0.1688232421875)
+ (-0.444580078125,0.1688232421875)
+ (0.147705078125,-0.477294921875)
+ (0.147705078125,-0.477294921875)
+ (-0.0032958984375,0.921142578125)
+ (-0.0032958984375,0.921142578125)
+ (0.09228515625,0.5811767578125)
+ (0.09228515625,0.5811767578125)
+ (-0.4447021484375,-0.1688232421875)
+ (-0.4447021484375,-0.1688232421875)
+ (0.9996337890625,0.000244140625)
+ (0.9996337890625,0.000244140625)
+ (0.4127197265625,-0.19140625)
+ (0.4127197265625,-0.19140625)
+ (-0.0379638671875,0.728759765625)
+ (-0.0379638671875,0.728759765625)
+ (0.09228515625,0.5811767578125)
+ (0.09228515625,0.5811767578125)
+ (-0.617919921875,-0.0762939453125)
+ (-0.617919921875,-0.0762939453125)
+ (-0.6170654296875,0.0765380859375)
+ (-0.6170654296875,0.0765380859375)
+ (0.0621337890625,-0.654296875)
+ (0.0621337890625,-0.654296875)
+ (-0.127685546875,-0.511962890625)
+ (-0.127685546875,-0.511962890625)
+ (0.843994140625,0.012451171875)
+ (0.843994140625,0.012451171875)
+ (0.29296875,-0.293212890625)
+ (0.29296875,-0.293212890625)
+ (-0.01953125,-0.8046875)
+ (-0.01953125,-0.8046875)
+ (0.654296875,0.0618896484375)
+ (0.654296875,0.0618896484375)
+ (0.3505859375,-0.239990234375)
+ (0.3505859375,-0.239990234375)
+ (-0.0279541015625,-0.7666015625)
+ (-0.0279541015625,-0.7666015625)
+ (0.805419921875,0.01953125)
+ (0.805419921875,0.01953125)
+ (0.1688232421875,-0.444580078125)
+ (0.1688232421875,-0.444580078125)
+ (-0.1910400390625,-0.4127197265625)
+ (-0.1910400390625,-0.4127197265625)
+ (-0.6912841796875,0.049072265625)
+ (-0.6912841796875,0.049072265625)
+ (0.0009765625,0.9613037109375)
+ (0.0009765625,0.9613037109375)
+ (-0.8055419921875,-0.0194091796875)
+ (-0.8055419921875,-0.0194091796875)
+ (-0.076171875,0.6177978515625)
+ (-0.076171875,0.6177978515625)
+ (0.4771728515625,0.14794921875)
+ (0.4771728515625,0.14794921875)
+ (0.2144775390625,-0.3812255859375)
+ (0.2144775390625,-0.3812255859375)
+ (-0.3214111328125,-0.2659912109375)
+ (-0.3214111328125,-0.2659912109375)
+ (-0.29296875,0.293212890625)
+ (-0.29296875,0.293212890625)
+ (0.293212890625,0.29296875)
+ (0.293212890625,0.29296875)
+ (0.265869140625,-0.3212890625)
+ (0.265869140625,-0.3212890625)
+ (-0.3814697265625,-0.2144775390625)
+ (-0.3814697265625,-0.2144775390625)
+ (-0.1480712890625,0.4774169921875)
+ (-0.1480712890625,0.4774169921875)
+ (0.617919921875,0.0760498046875)
+ (0.617919921875,0.0760498046875)
+ (0.019287109375,-0.805419921875)
+ (0.019287109375,-0.805419921875)
+ (0.961181640625,-0.0009765625)
+ (0.961181640625,-0.0009765625)
+ (-0.049072265625,-0.6915283203125)
+ (-0.049072265625,-0.6915283203125)
+ (-0.412353515625,0.19091796875)
+ (-0.412353515625,0.19091796875)
+ (0.4444580078125,0.1689453125)
+ (0.4444580078125,0.1689453125)
+ (0.019287109375,-0.805419921875)
+ (0.019287109375,-0.805419921875)
+ (0.7664794921875,-0.02783203125)
+ (0.7664794921875,-0.02783203125)
+ (-0.2401123046875,-0.3507080078125)
+ (-0.2401123046875,-0.3507080078125)
+ (-0.06201171875,0.6541748046875)
+ (-0.06201171875,0.6541748046875)
+ (-0.804443359375,0.0194091796875)
+ (-0.804443359375,0.0194091796875)
+ (0.293212890625,0.29296875)
+ (0.293212890625,0.29296875)
+ (0.012451171875,-0.843994140625)
+ (0.012451171875,-0.843994140625)
+ (0.5118408203125,-0.127685546875)
+ (0.5118408203125,-0.127685546875)
+ (-0.6541748046875,-0.062255859375)
+ (-0.6541748046875,-0.062255859375)
+ (-0.07666015625,-0.6170654296875)
+ (-0.07666015625,-0.6170654296875)
+ (-0.076171875,0.6177978515625)
+ (-0.076171875,0.6177978515625)
+ (-0.581298828125,0.0921630859375)
+ (-0.581298828125,0.0921630859375)
+ (0.7286376953125,0.037841796875)
+ (0.7286376953125,0.037841796875)
+ (0.1912841796875,0.412353515625)
+ (0.1912841796875,0.412353515625)
+ (0,-0.9996337890625)
+ (0,-0.9996337890625)
+ (0.1688232421875,-0.444580078125)
+ (0.1688232421875,-0.444580078125)
+ (0.581298828125,-0.0924072265625)
+ (0.581298828125,-0.0924072265625)
+ (-0.9212646484375,-0.003662109375)
+ (-0.9212646484375,-0.003662109375)
+ (-0.4775390625,-0.1478271484375)
+ (-0.4775390625,-0.1478271484375)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.01953125,-0.8046875)
+ (-0.01953125,-0.8046875)
+ (-0.012451171875,0.8438720703125)
+ (-0.012451171875,0.8438720703125)
+ (-0.109375,0.5462646484375)
+ (-0.109375,0.5462646484375)
+ (-0.26611328125,0.321533203125)
+ (-0.26611328125,0.321533203125)
+ (-0.444580078125,0.1688232421875)
+ (-0.444580078125,0.1688232421875)
+ (-0.6170654296875,0.0765380859375)
+ (-0.6170654296875,0.0765380859375)
+ (-0.7666015625,0.02783203125)
+ (-0.7666015625,0.02783203125)
+ (-0.882568359375,0.00732421875)
+ (-0.882568359375,0.00732421875)
+ (-0.9613037109375,0.0010986328125)
+ (-0.9613037109375,0.0010986328125)
+ (0.9996337890625,0.000244140625)
+ (0.9996337890625,0.000244140625)
+ (0.9996337890625,0.000244140625)
+ (0.9996337890625,0.000244140625)
+ (-0.9613037109375,0.0010986328125)
+ (-0.9613037109375,0.0010986328125)
+ (-0.882568359375,0.00732421875)
+ (-0.882568359375,0.00732421875)
+ (-0.7666015625,0.02783203125)
+ (-0.7666015625,0.02783203125)
+ (-0.6170654296875,0.0765380859375)
+ (-0.6170654296875,0.0765380859375)
+ (-0.444580078125,0.1688232421875)
+ (-0.444580078125,0.1688232421875)
+ (-0.26611328125,0.321533203125)
+ (-0.26611328125,0.321533203125)
+ (-0.109375,0.5462646484375)
+ (-0.109375,0.5462646484375)
+ (-0.012451171875,0.8438720703125)
+ (-0.012451171875,0.8438720703125)
+ (-0.01953125,-0.8046875)
+ (-0.01953125,-0.8046875)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.4775390625,-0.1478271484375)
+ (-0.4775390625,-0.1478271484375)
+ (-0.9212646484375,-0.003662109375)
+ (-0.9212646484375,-0.003662109375)
+ (0.581298828125,-0.0924072265625)
+ (0.581298828125,-0.0924072265625)
+ (0.1688232421875,-0.444580078125)
+ (0.1688232421875,-0.444580078125)
+ (0,-0.9996337890625)
+ (0,-0.9996337890625)
+ (0.1912841796875,0.412353515625)
+ (0.1912841796875,0.412353515625)
+ (0.7286376953125,0.037841796875)
+ (0.7286376953125,0.037841796875)
+ (-0.581298828125,0.0921630859375)
+ (-0.581298828125,0.0921630859375)
+ (-0.076171875,0.6177978515625)
+ (-0.076171875,0.6177978515625)
+ (-0.07666015625,-0.6170654296875)
+ (-0.07666015625,-0.6170654296875)
+ (-0.6541748046875,-0.062255859375)
+ (-0.6541748046875,-0.062255859375)
+ (0.5118408203125,-0.127685546875)
+ (0.5118408203125,-0.127685546875)
+ (0.012451171875,-0.843994140625)
+ (0.012451171875,-0.843994140625)
+ (0.293212890625,0.29296875)
+ (0.293212890625,0.29296875)
+ (-0.804443359375,0.0194091796875)
+ (-0.804443359375,0.0194091796875)
+ (-0.06201171875,0.6541748046875)
+ (-0.06201171875,0.6541748046875)
+ (-0.2401123046875,-0.3507080078125)
+ (-0.2401123046875,-0.3507080078125)
+ (0.7664794921875,-0.02783203125)
+ (0.7664794921875,-0.02783203125)
+ (0.019287109375,-0.805419921875)
+ (0.019287109375,-0.805419921875)
+ (0.4444580078125,0.1689453125)
+ (0.4444580078125,0.1689453125)
+ (-0.412353515625,0.19091796875)
+ (-0.412353515625,0.19091796875)
+ (-0.049072265625,-0.6915283203125)
+ (-0.049072265625,-0.6915283203125)
+ (0.961181640625,-0.0009765625)
+ (0.961181640625,-0.0009765625)
+ (0.019287109375,-0.805419921875)
+ (0.019287109375,-0.805419921875)
+ (0.617919921875,0.0760498046875)
+ (0.617919921875,0.0760498046875)
+ (-0.1480712890625,0.4774169921875)
+ (-0.1480712890625,0.4774169921875)
+ (-0.3814697265625,-0.2144775390625)
+ (-0.3814697265625,-0.2144775390625)
+ (0.265869140625,-0.3212890625)
+ (0.265869140625,-0.3212890625)
+ (0.293212890625,0.29296875)
+ (0.293212890625,0.29296875)
+ (-0.29296875,0.293212890625)
+ (-0.29296875,0.293212890625)
+ (-0.3214111328125,-0.2659912109375)
+ (-0.3214111328125,-0.2659912109375)
+ (0.2144775390625,-0.3812255859375)
+ (0.2144775390625,-0.3812255859375)
+ (0.4771728515625,0.14794921875)
+ (0.4771728515625,0.14794921875)
+ (-0.076171875,0.6177978515625)
+ (-0.076171875,0.6177978515625)
+ (-0.8055419921875,-0.0194091796875)
+ (-0.8055419921875,-0.0194091796875)
+ (0.0009765625,0.9613037109375)
+ (0.0009765625,0.9613037109375)
+ (-0.6912841796875,0.049072265625)
+ (-0.6912841796875,0.049072265625)
+ (-0.1910400390625,-0.4127197265625)
+ (-0.1910400390625,-0.4127197265625)
+ (0.1688232421875,-0.444580078125)
+ (0.1688232421875,-0.444580078125)
+ (0.805419921875,0.01953125)
+ (0.805419921875,0.01953125)
+ (-0.0279541015625,-0.7666015625)
+ (-0.0279541015625,-0.7666015625)
+ (0.3505859375,-0.239990234375)
+ (0.3505859375,-0.239990234375)
+ (0.654296875,0.0618896484375)
+ (0.654296875,0.0618896484375)
+ (-0.01953125,-0.8046875)
+ (-0.01953125,-0.8046875)
+ (0.29296875,-0.293212890625)
+ (0.29296875,-0.293212890625)
+ (0.843994140625,0.012451171875)
+ (0.843994140625,0.012451171875)
+ (-0.127685546875,-0.511962890625)
+ (-0.127685546875,-0.511962890625)
+ (0.0621337890625,-0.654296875)
+ (0.0621337890625,-0.654296875)
+ (-0.6170654296875,0.0765380859375)
+ (-0.6170654296875,0.0765380859375)
+ (-0.617919921875,-0.0762939453125)
+ (-0.617919921875,-0.0762939453125)
+ (0.09228515625,0.5811767578125)
+ (0.09228515625,0.5811767578125)
+ (-0.0379638671875,0.728759765625)
+ (-0.0379638671875,0.728759765625)
+ (0.4127197265625,-0.19140625)
+ (0.4127197265625,-0.19140625)
+ (0.9996337890625,0.000244140625)
+ (0.9996337890625,0.000244140625)
+ (-0.4447021484375,-0.1688232421875)
+ (-0.4447021484375,-0.1688232421875)
+ (0.09228515625,0.5811767578125)
+ (0.09228515625,0.5811767578125)
+ (-0.0032958984375,0.921142578125)
+ (-0.0032958984375,0.921142578125)
+ (0.147705078125,-0.477294921875)
+ (0.147705078125,-0.477294921875)
+ (-0.444580078125,0.1688232421875)
+ (-0.444580078125,0.1688232421875)
+ (0.8046875,-0.019775390625)
+ (0.8046875,-0.019775390625)
+ (0.843994140625,0.012451171875)
+ (0.843994140625,0.012451171875)
+ (-0.54638671875,-0.1092529296875)
+ (-0.54638671875,-0.1092529296875)
+ (0.3212890625,0.26611328125)
+ (0.3212890625,0.26611328125)
+ (-0.1688232421875,-0.4447021484375)
+ (-0.1688232421875,-0.4447021484375)
+ (0.0765380859375,0.616943359375)
+ (0.0765380859375,0.616943359375)
+ (-0.0279541015625,-0.7666015625)
+ (-0.0279541015625,-0.7666015625)
+ (0.0072021484375,0.882568359375)
+ (0.0072021484375,0.882568359375)
+ (-0.0010986328125,-0.961181640625)
+ (-0.0010986328125,-0.961181640625)
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/read_avg.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/read_avg.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/read_avg.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/read_avg.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/read_avg.m 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,22 @@
+function avg = read_avg(name, vlen)
+
+ f = fopen(name, "rb");
+ s = zeros(1, vlen);
+ n = 0;
+
+ while (!feof(f))
+ t = fread(f, [2, vlen], "float");
+ if (size(t) == [2, vlen])
+ n = n+1;
+ c = t(1,:)+t(2,:)*j;
+ if (n > 10)
+ s = s+c;
+ endif
+ endif
+ endwhile
+
+ avg = s/(n-1);
+
+ fclose(f);
+
+endfunction
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/read_avg_sec.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/read_avg_sec.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/read_avg_sec.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/read_avg_sec.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/read_avg_sec.m 2007-09-28
21:44:05 UTC (rev 6563)
@@ -0,0 +1,25 @@
+function avg = read_avg_sec(name, vlen)
+
+ f = fopen(name, "rb");
+ s = zeros(1, vlen);
+ n = 0;
+ m = 0;
+
+ while (!feof(f))
+ t = fread(f, [2, vlen], "float");
+ if (size(t) == [2, vlen])
+ n = n+1;
+ c = t(1,:)+t(2,:)*j;
+ s = s+c;
+ m = m+1;
+ if (m == 1000)
+ avg(n/1000,:) = s/1000;
+ s = zeros(1, vlen);
+ m = 0;
+ endif
+ endif
+ endwhile
+
+ fclose(f);
+
+endfunction
Deleted: gnuradio/trunk/gr-radar-mono/src/utils/read_echos.m
Copied: gnuradio/trunk/gr-radar-mono/src/utils/read_echos.m (from rev 6562,
gnuradio/branches/developers/jcorgan/radar/gr-radar-mono/src/utils/read_echos.m)
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/utils/read_echos.m
(rev 0)
+++ gnuradio/trunk/gr-radar-mono/src/utils/read_echos.m 2007-09-28 21:44:05 UTC
(rev 6563)
@@ -0,0 +1,7 @@
+# Read echos from file into array
+function echos = read_echos(filename, len, drop)
+ e = read_complex_binary(filename);
+ n = length(e)/len-drop;
+ start = drop*len+1;
+ echos = reshape(e(start:end), len, n).';
+endfunction
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r6563 - in gnuradio/trunk/gr-radar-mono/src: . fpga/top python utils,
jcorgan <=