From 77ad7e778d668a2bddc9bf431088b586707bd279 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 22 Sep 2009 11:17:29 -0700 Subject: made rxdspno a parameter for: start/stop streaming, and quadradio32fc --- gr-vrt/src/vrt_quadradio_source_32fc.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gr-vrt/src/vrt_quadradio_source_32fc.h') diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index 6193efa10..eaf2741c1 100644 --- a/gr-vrt/src/vrt_quadradio_source_32fc.h +++ b/gr-vrt/src/vrt_quadradio_source_32fc.h @@ -33,19 +33,21 @@ typedef boost::shared_ptr vrt_quadradio_source_32fc_s vrt_quadradio_source_32fc_sptr vrt_make_quadradio_source_32fc(const std::string &ip, size_t rx_bufsize = 0, - size_t samples_per_pkt = 0); + size_t samples_per_pkt = 0, + int rxdspno = 0); class vrt_quadradio_source_32fc : public vrt_source_32fc { size_t d_samples_per_pkt; boost::shared_ptr d_qr; + int d_rxdspno; vrt_quadradio_source_32fc(const std::string &ip, size_t rx_bufsize, - size_t samples_per_pkt); + size_t samples_per_pkt, int rxdspno); friend vrt_quadradio_source_32fc_sptr vrt_make_quadradio_source_32fc(const std::string &ip, size_t rx_bufsize, - size_t samples_per_pkt); + size_t samples_per_pkt, int rxdspno); public: virtual ~vrt_quadradio_source_32fc(); -- cgit From 7e9c7be46de8329c1aa884197378246d54cf05cd Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 23 Sep 2009 04:53:58 -0700 Subject: fix white space --- gr-vrt/src/vrt_quadradio_source_32fc.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-vrt/src/vrt_quadradio_source_32fc.h') diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index eaf2741c1..69384ca31 100644 --- a/gr-vrt/src/vrt_quadradio_source_32fc.h +++ b/gr-vrt/src/vrt_quadradio_source_32fc.h @@ -34,13 +34,13 @@ vrt_quadradio_source_32fc_sptr vrt_make_quadradio_source_32fc(const std::string &ip, size_t rx_bufsize = 0, size_t samples_per_pkt = 0, - int rxdspno = 0); + int rxdspno = 0); class vrt_quadradio_source_32fc : public vrt_source_32fc { size_t d_samples_per_pkt; boost::shared_ptr d_qr; - int d_rxdspno; + int d_rxdspno; vrt_quadradio_source_32fc(const std::string &ip, size_t rx_bufsize, size_t samples_per_pkt, int rxdspno); -- cgit From e3902a9557e2a8c8bdd1e86fab30d754e909f843 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 25 Sep 2009 19:04:35 -0700 Subject: reading the lo back and storing it --- gr-vrt/src/vrt_quadradio_source_32fc.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-vrt/src/vrt_quadradio_source_32fc.h') diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index 69384ca31..4589908f1 100644 --- a/gr-vrt/src/vrt_quadradio_source_32fc.h +++ b/gr-vrt/src/vrt_quadradio_source_32fc.h @@ -112,6 +112,9 @@ public: bool set_cal_freq(double freq); bool set_beamforming(std::vector gains); bool set_cal_enb(bool enb); + + double get_cal_freq(void){return d_actual_cal_freq;} + double get_lo_freq(void){return d_actual_lo_freq;} }; -- cgit From 85a8e6cdb0fb05b12b071c81f9eb025b380fb155 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 28 Sep 2009 19:04:38 -0700 Subject: added access methods and parsing for caldiv if context --- gr-vrt/src/vrt_quadradio_source_32fc.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gr-vrt/src/vrt_quadradio_source_32fc.h') diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index 4589908f1..799b07e86 100644 --- a/gr-vrt/src/vrt_quadradio_source_32fc.h +++ b/gr-vrt/src/vrt_quadradio_source_32fc.h @@ -113,8 +113,15 @@ public: bool set_beamforming(std::vector gains); bool set_cal_enb(bool enb); - double get_cal_freq(void){return d_actual_cal_freq;} - double get_lo_freq(void){return d_actual_lo_freq;} + //caldiv public access methods + double get_cal_freq(void){return d_cal_freq;} + bool get_cal_locked(void){return d_cal_locked;} + bool get_cal_enabled(void){return d_cal_enabled;} + double get_lo_freq(void){return d_lo_freq;} + bool get_lo_locked(void){return d_lo_locked;} + double get_caldiv_temp(void){return d_caldiv_temp;} + int get_caldiv_ser_no(void){return d_caldiv_rev;} + int get_caldiv_rev_no(void){return d_caldiv_ser;} }; -- cgit From 57e810d3f07909947a9fb2daeb507b439d5f4f50 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 29 Sep 2009 15:34:58 -0700 Subject: added access methods for gps stuff --- gr-vrt/src/vrt_quadradio_source_32fc.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gr-vrt/src/vrt_quadradio_source_32fc.h') diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index 799b07e86..45dad1f89 100644 --- a/gr-vrt/src/vrt_quadradio_source_32fc.h +++ b/gr-vrt/src/vrt_quadradio_source_32fc.h @@ -120,8 +120,14 @@ public: double get_lo_freq(void){return d_lo_freq;} bool get_lo_locked(void){return d_lo_locked;} double get_caldiv_temp(void){return d_caldiv_temp;} - int get_caldiv_ser_no(void){return d_caldiv_rev;} - int get_caldiv_rev_no(void){return d_caldiv_ser;} + int get_caldiv_serial(void){return d_caldiv_rev;} + int get_caldiv_revision(void){return d_caldiv_ser;} + + //gps public access methods + int get_utc_time(void){return d_utc_time;} + double get_altitude(void){return d_altitude;} + double get_longitude(void){return d_longitude;} + double get_latitude(void){return d_latitude;} }; -- cgit From 2875cf23fcb5d38866a42327cafa2b43abe2fbf4 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Wed, 21 Oct 2009 12:30:03 -0700 Subject: query the model number from the host --- gr-vrt/src/vrt_quadradio_source_32fc.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-vrt/src/vrt_quadradio_source_32fc.h') diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index 45dad1f89..bb3935c46 100644 --- a/gr-vrt/src/vrt_quadradio_source_32fc.h +++ b/gr-vrt/src/vrt_quadradio_source_32fc.h @@ -120,8 +120,9 @@ public: double get_lo_freq(void){return d_lo_freq;} bool get_lo_locked(void){return d_lo_locked;} double get_caldiv_temp(void){return d_caldiv_temp;} - int get_caldiv_serial(void){return d_caldiv_rev;} - int get_caldiv_revision(void){return d_caldiv_ser;} + int get_caldiv_revision(void){return d_caldiv_rev;} + int get_caldiv_serial(void){return d_caldiv_ser;} + int get_caldiv_model(void){return d_caldiv_mod;} //gps public access methods int get_utc_time(void){return d_utc_time;} -- cgit