diff options
| author | Josh Blum <josh@joshknows.com> | 2009-10-21 12:30:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2009-10-21 12:30:03 -0700 |
| commit | 2875cf23fcb5d38866a42327cafa2b43abe2fbf4 (patch) | |
| tree | f18828e4359f947339ff14c24e29322c697cbec6 | |
| parent | 538e6fa4380b55ed65dfab275c75302946b228bf (diff) | |
query the model number from the host
| -rw-r--r-- | gr-vrt/src/vrt_quadradio_source_32fc.h | 5 | ||||
| -rw-r--r-- | gr-vrt/src/vrt_source_32fc.cc | 3 | ||||
| -rw-r--r-- | gr-vrt/src/vrt_source_32fc.h | 1 | ||||
| -rw-r--r-- | vrt/include/vrt/if_context.h | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/gr-vrt/src/vrt_quadradio_source_32fc.h b/gr-vrt/src/vrt_quadradio_source_32fc.h index 45dad1f89a..bb3935c466 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;} diff --git a/gr-vrt/src/vrt_source_32fc.cc b/gr-vrt/src/vrt_source_32fc.cc index 3035813cc5..e56e3f2ad2 100644 --- a/gr-vrt/src/vrt_source_32fc.cc +++ b/gr-vrt/src/vrt_source_32fc.cc @@ -178,8 +178,9 @@ vrt_source_32fc::work(int noutput_items, d_cal_locked = bool(ntohx(h.get_if_context()->caldiv.cal_locked)); d_cal_enabled = bool(ntohx(h.get_if_context()->caldiv.cal_enabled)); d_caldiv_temp = vrt_temp_to_double(ntohx(h.get_if_context()->caldiv.temp)); - d_caldiv_ser = ntohx(h.get_if_context()->caldiv.ser); d_caldiv_rev = ntohx(h.get_if_context()->caldiv.rev); + d_caldiv_ser = ntohx(h.get_if_context()->caldiv.ser); + d_caldiv_mod = ntohx(h.get_if_context()->caldiv.mod); //extract gps stuff d_utc_time = ntohx(h.get_if_context()->gps.formatted_gps.integer_secs); d_altitude = vrt_altitude_to_double(ntohx(h.get_if_context()->gps.formatted_gps.altitude)); diff --git a/gr-vrt/src/vrt_source_32fc.h b/gr-vrt/src/vrt_source_32fc.h index 46d80f4426..c43170e83b 100644 --- a/gr-vrt/src/vrt_source_32fc.h +++ b/gr-vrt/src/vrt_source_32fc.h @@ -43,6 +43,7 @@ protected: double d_caldiv_temp; int d_caldiv_rev; int d_caldiv_ser; + int d_caldiv_mod; //gps settings parsed from if context int d_utc_time; diff --git a/vrt/include/vrt/if_context.h b/vrt/include/vrt/if_context.h index b1d5424597..24aba7a9e6 100644 --- a/vrt/include/vrt/if_context.h +++ b/vrt/include/vrt/if_context.h @@ -216,6 +216,7 @@ typedef struct caldiv_if_cntx_tag { uint32_t temp; uint32_t rev; uint32_t ser; + uint32_t mod; } __attribute__((packed)) caldiv_if_cntx_t; // FIXME the rest... |