diff options
| author | Johnathan Corgan | 2009-08-26 16:52:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-08-26 16:58:08 -0700 |
| commit | 1aa216df204197b4849581dd4f42b2e7680eb72f (patch) | |
| tree | 0452ddfd7f971398d3ece4f0d7638c63d0b262cb /vrt/include | |
| parent | 20e87ef0575d6bf09ab19fa1d025dbe71eec27fb (diff) | |
| parent | 60633c60dda8bd0ac8c7b5fde72eac62aa0f9490 (diff) | |
| download | gnuradio-1aa216df204197b4849581dd4f42b2e7680eb72f.tar.gz gnuradio-1aa216df204197b4849581dd4f42b2e7680eb72f.tar.bz2 gnuradio-1aa216df204197b4849581dd4f42b2e7680eb72f.zip | |
Merge vrt of http://gnuradio.org/git/jblum.git into master
* automatic store for empty traces on enable
* added traces to fft window
* added quadradio method to enable/disable cal
* use enum for band select
* added get band select
Diffstat (limited to 'vrt/include')
| -rw-r--r-- | vrt/include/vrt/quadradio.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vrt/include/vrt/quadradio.h b/vrt/include/vrt/quadradio.h index 747ca8ef4..83323f093 100644 --- a/vrt/include/vrt/quadradio.h +++ b/vrt/include/vrt/quadradio.h @@ -38,6 +38,14 @@ typedef enum{ } vrt_test_sig_t; +typedef enum{ + VRT_BAND_SEL_A='A', + VRT_BAND_SEL_B='B', + VRT_BAND_SEL_C='C', + VRT_BAND_SEL_D='D', + + } vrt_band_sel_t; + namespace vrt { /* @@ -53,7 +61,7 @@ namespace vrt { int d_data_port; // our data port number vrt::rx::sptr d_rx; // has-a rx - int d_band_select; // band select setting + vrt_band_sel_t d_band_select; // band select setting int d_rx_antenna; // antenna type rf/cal int d_attenuation0; // attenuation setting int d_attenuation1; // attenuation setting @@ -92,7 +100,8 @@ namespace vrt { /* convenience methods that ultimately write the dboard pins */ bool set_center_freq(double target_freq); - bool set_band_select(const std::string &band); + bool set_band_select(vrt_band_sel_t band); + vrt_band_sel_t get_band_select(void){return d_band_select;} //void set_10dB_atten(bool on); bool set_attenuation0(int attenuation); bool select_rx_antenna(const std::string &ant); @@ -110,6 +119,7 @@ namespace vrt { bool set_lo_freq(double freq); bool set_cal_freq(double freq); bool set_beamforming(int32_t gains[8]); + bool set_cal_enb(bool enb); /* * The first parameter for these is a bitmask which indicates which * daughterboard or daughterboards to apply the operation to. |