3 files changed, 27 insertions, 5 deletions
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<gr_complex> 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;}
 };
 
 
diff --git a/gr-vrt/src/vrt_source_32fc.cc b/gr-vrt/src/vrt_source_32fc.cc
index 551ea9821..0091619ab 100644
--- a/gr-vrt/src/vrt_source_32fc.cc
+++ b/gr-vrt/src/vrt_source_32fc.cc
@@ -171,7 +171,14 @@ 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()){
-    d_actual_lo_freq = vrt_freq_to_double(ntohll(h.get_if_context()->beamformer.rf_ref_freq));
+    d_lo_freq = vrt_freq_to_double(ntohll(h.get_if_context()->caldiv.lo_freq));
+    d_cal_freq = vrt_freq_to_double(ntohll(h.get_if_context()->caldiv.cal_freq));
+    d_lo_locked = bool(ntohl(h.get_if_context()->caldiv.lo_locked));
+    d_cal_locked = bool(ntohl(h.get_if_context()->caldiv.cal_locked));
+    d_cal_enabled = bool(ntohl(h.get_if_context()->caldiv.cal_enabled));
+    d_caldiv_temp = vrt_temp_to_double(ntohl(h.get_if_context()->caldiv.temp));
+    d_caldiv_ser = ntohl(h.get_if_context()->caldiv.ser);
+    d_caldiv_rev = ntohl(h.get_if_context()->caldiv.rev);
   }
 
   return oo;
diff --git a/gr-vrt/src/vrt_source_32fc.h b/gr-vrt/src/vrt_source_32fc.h
index 96e9cac42..9d53fae33 100644
--- a/gr-vrt/src/vrt_source_32fc.h
+++ b/gr-vrt/src/vrt_source_32fc.h
@@ -33,8 +33,16 @@ protected:
 
   std::vector< std::complex<float> >	d_remainder;
   missing_pkt_checker			d_checker;
-  double d_actual_lo_freq;
-  double d_actual_cal_freq;
+
+  //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;
 
 public:
   ~vrt_source_32fc();