removed caldiv stuff from gr-vrt

diff --git a/gr-vrt/src/vrt_source_32fc.cc b/gr-vrt/src/vrt_source_32fc.cc
index f9375d31cb6e2f124505f3526a8f67ed2f766cfc..f3c9beed61d2574f097e6a3646a5d6024d244bd4 100644 (file)
--- a/gr-vrt/src/vrt_source_32fc.cc
+++ b/gr-vrt/src/vrt_source_32fc.cc
@@ -171,16 +171,6 @@ vrt_source_32fc::work(int noutput_items,
   //we have a context packet, grab its useful information...
   //remember that things are in network byte order!
   if (h.get_if_context()){
-    //extract caldiv stuff
-    d_lo_freq = vrt_freq_to_double(ntohx(h.get_if_context()->caldiv.lo_freq));
-    d_cal_freq = vrt_freq_to_double(ntohx(h.get_if_context()->caldiv.cal_freq));
-    d_lo_locked = bool(ntohx(h.get_if_context()->caldiv.lo_locked));
-    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_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 c43170e83beb779b553dedd072200f5e9604940e..f4e96f1535b2512d36b040bc9af9c5f7bc04b34c 100644 (file)
--- a/gr-vrt/src/vrt_source_32fc.h
+++ b/gr-vrt/src/vrt_source_32fc.h
@@ -34,17 +34,6 @@ protected:
   std::vector< std::complex<float> >   d_remainder;
   missing_pkt_checker                  d_checker;
 
-  //caldiv settings parsed from if context
-  double d_cal_freq;
-  bool   d_cal_locked;
-  bool   d_cal_enabled;
-  double d_lo_freq;
-  bool   d_lo_locked;
-  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;
   double d_altitude;

diff --git a/vrt/include/vrt/if_context.h b/vrt/include/vrt/if_context.h
index 24aba7a9e6da47a666cf2b33e6ecadded1e8e7b4..7deb41d6308fe13dc8ff8f4cf79d588e2d32f44f 100644 (file)
--- a/vrt/include/vrt/if_context.h
+++ b/vrt/include/vrt/if_context.h
@@ -206,32 +206,18 @@ typedef struct gain_if_cntx_tag {
   uint32_t             gain;
 } __attribute__((packed)) gain_if_cntx_t;
 
-typedef struct caldiv_if_cntx_tag {
-  if_context_hdr_t     cntx_hdr;
-  uint64_t lo_freq;
-  uint32_t lo_locked;
-  uint64_t cal_freq;
-  uint32_t cal_locked;
-  uint32_t cal_enabled;
-  uint32_t temp;
-  uint32_t rev;
-  uint32_t ser;
-  uint32_t mod;
-} __attribute__((packed)) caldiv_if_cntx_t;
-
 // FIXME the rest...
 
 // ------------------------------------------------------------------------
 // All of them concatenated
 
-#define        NCONTEXT_PKTS   7       // number of context pkts aggregated here
+#define        NCONTEXT_PKTS   6       // number of context pkts aggregated here
 
 typedef struct all_context_tag {
   beamformer_if_cntx_t beamformer;
   gain_if_cntx_t       db[4];
 
   // FIXME add Extension Context for board types, revs, serial numbers, temps
-  caldiv_if_cntx_t caldiv;
 
   gps_if_cntx_t                gps;            // must be last
 } __attribute__((packed)) all_context_t;