From a44b72ba2a9e572145cf96a7b9f7758bc58238be Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Mon, 17 Sep 2007 22:08:05 +0000
Subject: Merged -r6379:6451 from jcorgan/radar into trunk. Adds working
receiver implementation to gr-radar-mono.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6452 221aa14e-8319-0410-a670-987f0aec2ac5
---
gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf | Bin 122679 -> 123637 bytes
gr-radar-mono/src/fpga/top/usrp_radar_mono.v | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'gr-radar-mono/src/fpga/top')
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf b/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf
index f36c3ac763..13c36c78a9 100644
Binary files a/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf and b/gr-radar-mono/src/fpga/top/usrp_radar_mono.rbf differ
diff --git a/gr-radar-mono/src/fpga/top/usrp_radar_mono.v b/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
index f6f862938f..0382734b87 100644
--- a/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
+++ b/gr-radar-mono/src/fpga/top/usrp_radar_mono.v
@@ -86,7 +86,7 @@ module usrp_radar_mono
// TX
wire tx_sample_strobe;
- wire tx_empty;
+ wire auto_tr;
wire serial_strobe;
wire [6:0] serial_addr;
@@ -145,7 +145,7 @@ module usrp_radar_mono
radar radar_mono ( .clk_i(clk64),.saddr_i(serial_addr),.sdata_i(serial_data),.s_strobe_i(serial_strobe),
.tx_side_o(tx_side),.tx_strobe_o(tx_sample_strobe),.tx_dac_i_o(tx_i),.tx_dac_q_o(tx_q),
.rx_adc_i_i(rx_adc0_i),.rx_adc_q_i(rx_adc0_q),
- .rx_strobe_o(rx_strobe),.rx_ech_i_o(rx_buf_i),.rx_ech_q_o(rx_buf_q)
+ .rx_strobe_o(rx_strobe),.rx_ech_i_o(rx_buf_i),.rx_ech_q_o(rx_buf_q),.auto_tr_o(auto_tr)
);
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -155,7 +155,7 @@ module usrp_radar_mono
assign capabilities[7] = 0; // `TX_CAP_HB;
assign capabilities[6:4] = 1; // `TX_CAP_NCHAN;
assign capabilities[3] = 0; // `RX_CAP_HB;
- assign capabilities[2:0] = 1; // `RX_CAP_NCHAN;
+ assign capabilities[2:0] = 2; // `RX_CAP_NCHAN;
serial_io serial_io
( .master_clk(clk64),.serial_clock(SCLK),.serial_data_in(SDI),
@@ -175,7 +175,7 @@ module usrp_radar_mono
.interp_rate(),.decim_rate(),
.tx_sample_strobe(),.strobe_interp(),
.rx_sample_strobe(),.strobe_decim(),
- .tx_empty(tx_empty),
+ .tx_empty(auto_tr),
.debug_0(),.debug_1(),
.debug_2(),.debug_3(),
.reg_0(reg_0),.reg_1(reg_1),.reg_2(reg_2),.reg_3(reg_3) );
--
cgit v1.2.3