[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r5683 - in gnuradio/branches/developers/gnychis/inband
From: |
gnychis |
Subject: |
[Commit-gnuradio] r5683 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband |
Date: |
Tue, 5 Jun 2007 08:40:19 -0600 (MDT) |
Author: gnychis
Date: 2007-06-05 08:40:19 -0600 (Tue, 05 Jun 2007)
New Revision: 5683
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_rx.cc
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
Log:
No longer throwing an exception, will test in hardware after writing and
testing a stub
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_rx.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_rx.cc
2007-06-05 06:32:30 UTC (rev 5682)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/apps/test_usrp_inband_rx.cc
2007-06-05 14:40:19 UTC (rev 5683)
@@ -120,7 +120,6 @@
d_done_sending(false),
d_amplitude(16384)
{
- // std::cout << "[TEST_USRP_TX] Initializing...\n";
d_rx = define_port("rx0", "usrp-rx", false, mb_port::INTERNAL);
d_cs = define_port("cs", "usrp-server-cs", false, mb_port::INTERNAL);
@@ -176,8 +175,6 @@
pmt_t status = PMT_F;
std::string error_msg;
- //std::cout << msg << std::endl;
-
switch(d_state){
case OPENING_USRP:
if (pmt_eq(event, s_response_open)){
@@ -211,11 +208,10 @@
case RECEIVING:
if (pmt_eq(event, s_response_recv_raw_samples)){
- handle = pmt_nth(0, data);
status = pmt_nth(1, data);
if (pmt_eq(status, PMT_T)){
- handle_response_recv_raw_samples(handle);
+ handle_response_recv_raw_samples(data);
return;
}
else {
@@ -320,7 +316,7 @@
const char *samples = (const char *) pmt_uniform_vector_elements(v_samples,
n_bytes);
d_ofile.write(samples, n_bytes);
- std::cout << "Wrote " << n_bytes << std::endl;
+ std::cout << ".";
d_nsamples_recvd++;
}
Modified:
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
===================================================================
---
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
2007-06-05 06:32:30 UTC (rev 5682)
+++
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/usrp_server.cc
2007-06-05 14:40:19 UTC (rev 5683)
@@ -810,10 +810,8 @@
pmt_t pkt = pmt_nth(2, data);
- std::cout << pkt << std::endl;
-
d_rx[0]->send(s_response_recv_raw_samples,
- pmt_list5(PMT_NIL,
+ pmt_list5(PMT_F,
PMT_T,
pkt,
pmt_from_long(0xffff),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r5683 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband,
gnychis <=