[Commit-gnuradio] r7232 - in gnuradio/branches/developers/jcorgan/t127: usrp/host/lib/legacy usrpdb/src

[jcorgan]

Author: jcorgan
Date: 2007-12-20 09:33:00 -0700 (Thu, 20 Dec 2007)
New Revision: 7232

Modified:
   gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.cc
   gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_rx.py
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_tx.py
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_dbsrx.py
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lfrx.py
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lftx.py
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_dbsrx.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.i
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.cc
   gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.h
Log:
Work in progress, clean up.


Modified: 
gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.cc   
    2007-12-19 20:51:16 UTC (rev 7231)
+++ 
gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.cc   
    2007-12-20 16:33:00 UTC (rev 7232)
@@ -61,61 +61,31 @@
 }
 
 float
-usrp_hwa_rx::dac_pga_gain()
+usrp_hwa_rx::pga_gain()
 {
   throw std::runtime_error("not implemented");
 }
 
 float
-usrp_hwa_rx::dac_pga_min()
+usrp_hwa_rx::pga_min()
 {
-  throw std::runtime_error("not implemented");
-}
-
-float
-usrp_hwa_rx::dac_pga_max()
-{
-  throw std::runtime_error("not implemented");
-}
-
-float
-usrp_hwa_rx::dac_pga_db_per_step()
-{
-  throw std::runtime_error("not implemented");
-}
-
-void
-usrp_hwa_rx::set_dac_pga(float gain)
-{
-  throw std::runtime_error("not implemented");
-}
-
-float
-usrp_hwa_rx::adc_pga_gain()
-{
-  throw std::runtime_error("not implemented");
-}
-
-float
-usrp_hwa_rx::adc_pga_min()
-{
   return d_u->pga_min();
 }
 
 float
-usrp_hwa_rx::adc_pga_max()
+usrp_hwa_rx::pga_max()
 {
   return d_u->pga_max();
 }
 
 float
-usrp_hwa_rx::adc_pga_db_per_step()
+usrp_hwa_rx::pga_db_per_step()
 {
   return d_u->pga_db_per_step();
 }
 
 void
-usrp_hwa_rx::set_adc_pga(float gain)
+usrp_hwa_rx::set_pga(float gain)
 {
   if (USRP_HWA_RX_DEBUG)
     std::cout << "usrp_hwa_rx: setting ADC PGA gain to " << gain << std::endl;

Modified: 
gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.h    
    2007-12-19 20:51:16 UTC (rev 7231)
+++ 
gnuradio/branches/developers/jcorgan/t127/usrp/host/lib/legacy/usrp_hwa_rx.h    
    2007-12-20 16:33:00 UTC (rev 7232)
@@ -42,16 +42,11 @@
 
   virtual unsigned int side();
   virtual float fpga_master_clock_freq();
-  virtual float dac_pga_gain();
-  virtual float dac_pga_min();
-  virtual float dac_pga_max();
-  virtual float dac_pga_db_per_step();
-  virtual void set_dac_pga(float gain);
-  virtual float adc_pga_gain();
-  virtual float adc_pga_min();
-  virtual float adc_pga_max();
-  virtual float adc_pga_db_per_step();
-  virtual void set_adc_pga(float gain);
+  virtual float pga_gain();
+  virtual float pga_min();
+  virtual float pga_max();
+  virtual float pga_db_per_step();
+  virtual void set_pga(float gain);
   virtual void bypass_adc_buffers(bool bypass);
   virtual void write_oe(unsigned short mask, unsigned short val);
   virtual void set_refclk_divisor(int divisor);

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_rx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_rx.py 
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_rx.py 
2007-12-20 16:33:00 UTC (rev 7232)
@@ -43,13 +43,13 @@
        self.assertEqual(actual_baseband_freq, 0.0)
 
     def test_002_gain_range(self):
-       expected_range = (0.0, 20.0, 0.2)
+       expected_range = (0.0, 20.0, 1.0)
        gain_range = self.db.gain_range()
        self.assertFloatTuplesAlmostEqual(gain_range, expected_range, 5)
 
     def test_003_set_gain(self):
        self.db.set_gain(10.0)  
-       self.assertEqual(self.hwa.adc_pga_gain(), 10.0)
+       self.assertEqual(self.hwa.pga_gain(), 10.0)
 
     # FIXME: disabled due to ticket:181
     def xtest_004_set_gain_bad(self):

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_tx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_tx.py 
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_basic_tx.py 
2007-12-20 16:33:00 UTC (rev 7232)
@@ -43,13 +43,13 @@
        self.assertEqual(actual_baseband_freq, 0.0)
 
     def test_002_gain_range(self):
-       expected_range = (0.0, 20.0, 0.2)
+       expected_range = (0.0, 20.0, 1.0)
        gain_range = self.db.gain_range()
        self.assertFloatTuplesAlmostEqual(gain_range, expected_range, 5)
 
     def test_003_set_gain(self):
        self.db.set_gain(10.0)  
-       self.assertEqual(self.hwa.dac_pga_gain(), 10.0)
+       self.assertEqual(self.hwa.pga_gain(), 10.0)
 
     # FIXME: disabled due to ticket:181 problem
     def xtest_004_set_gain_bad(self):

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_dbsrx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_dbsrx.py    
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_dbsrx.py    
2007-12-20 16:33:00 UTC (rev 7232)
@@ -49,7 +49,7 @@
 
     def test_003_set_gain(self):
        self.db.set_gain(52)    
-       pass # TODO: check gc values
+       # TODO: check gc values
        
     # FIXME: disabled due to ticket:181
     def xtest_004_set_gain_bad(self):

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lfrx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lfrx.py     
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lfrx.py     
2007-12-20 16:33:00 UTC (rev 7232)
@@ -40,7 +40,7 @@
 
     # Test inheritance from basic_tx
     def test_001_gain_range(self):
-       expected_range = (0.0, 20.0, 0.2)
+       expected_range = (0.0, 20.0, 1.0)
        gain_range = self.db.gain_range()
        self.assertFloatTuplesAlmostEqual(gain_range, expected_range, 5)
 

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lftx.py
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lftx.py     
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/qa_lftx.py     
2007-12-20 16:33:00 UTC (rev 7232)
@@ -40,7 +40,7 @@
 
     # Test inheritance from basic_tx
     def test_001_gain_range(self):
-       expected_range = (0.0, 20.0, 0.2)
+       expected_range = (0.0, 20.0, 1.0)
        gain_range = self.db.gain_range()
        self.assertFloatTuplesAlmostEqual(gain_range, expected_range, 5)
 

Modified: 
gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc     
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_rx.cc     
2007-12-20 16:33:00 UTC (rev 7232)
@@ -62,9 +62,9 @@
 {
   // BasicRx boards have no gain, but report the DAC PGA settings
   std::vector<float> result(3);
-  result[0] = d_hwa->adc_pga_min();
-  result[1] = d_hwa->adc_pga_max();
-  result[2] = d_hwa->adc_pga_db_per_step();
+  result[0] = d_hwa->pga_min();
+  result[1] = d_hwa->pga_max();
+  result[2] = d_hwa->pga_db_per_step();
   return result;
 }
 
@@ -72,11 +72,11 @@
 usrpdb_basic_rx::set_gain(float gain)
 {
   // BasicRx boards have no gain, but adjust the DAC PGA setting
-  if (gain < d_hwa->adc_pga_min() || gain > d_hwa->adc_pga_max()) {
+  if (gain < d_hwa->pga_min() || gain > d_hwa->pga_max()) {
     throw std::invalid_argument("gain value is out of range");
   }
 
-  d_hwa->set_adc_pga(gain);
+  d_hwa->set_pga(gain);
 }
 
 bool

Modified: 
gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc     
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_basic_tx.cc     
2007-12-20 16:33:00 UTC (rev 7232)
@@ -62,9 +62,9 @@
 {
   // BasicTX boards have no gain, but report the DAC PGA settings
   std::vector<float> result(3);
-  result[0] = d_hwa->dac_pga_min();
-  result[1] = d_hwa->dac_pga_max();
-  result[2] = d_hwa->dac_pga_db_per_step();
+  result[0] = d_hwa->pga_min();
+  result[1] = d_hwa->pga_max();
+  result[2] = d_hwa->pga_db_per_step();
   return result;
 }
 
@@ -72,11 +72,11 @@
 usrpdb_basic_tx::set_gain(float gain)
 {
   // BasicTX boards have no gain, but adjust the DAC PGA setting
-  if (gain < d_hwa->dac_pga_min() || gain > d_hwa->dac_pga_max()) {
+  if (gain < d_hwa->pga_min() || gain > d_hwa->pga_max()) {
     throw std::invalid_argument("gain value is out of range");
   }
 
-  d_hwa->set_dac_pga(gain);
+  d_hwa->set_pga(gain);
 }
 
 bool

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_dbsrx.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_dbsrx.cc        
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_dbsrx.cc        
2007-12-20 16:33:00 UTC (rev 7232)
@@ -202,7 +202,7 @@
 usrpdb_dbsrx::set_pga(float gain)
 {
   assert(gain >= 0.0 && gain <= 20.0);
-  d_hwa->set_adc_pga(gain);
+  d_hwa->set_pga(gain);
 }
 
 float

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h   
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.h   
2007-12-20 16:33:00 UTC (rev 7232)
@@ -34,16 +34,11 @@
 
   virtual unsigned int side() = 0;
   virtual float fpga_master_clock_freq() = 0;
-  virtual float dac_pga_gain() = 0;
-  virtual float dac_pga_min() = 0;
-  virtual float dac_pga_max() = 0;
-  virtual float dac_pga_db_per_step() = 0;
-  virtual void set_dac_pga(float gain) = 0;
-  virtual float adc_pga_gain() = 0;
-  virtual float adc_pga_min() = 0;
-  virtual float adc_pga_max() = 0;
-  virtual float adc_pga_db_per_step() = 0;
-  virtual void set_adc_pga(float gain) = 0;
+  virtual float pga_gain() = 0;
+  virtual float pga_min() = 0;
+  virtual float pga_max() = 0;
+  virtual float pga_db_per_step() = 0;
+  virtual void set_pga(float gain) = 0;
   virtual void bypass_adc_buffers(bool bypass) = 0;
   virtual void write_oe(unsigned short mask, unsigned short val) = 0;
   virtual void set_refclk_divisor(int divisor) = 0;

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.i
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.i   
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa.i   
2007-12-20 16:33:00 UTC (rev 7232)
@@ -36,16 +36,11 @@
 
   virtual unsigned int side();
   virtual float fpga_master_clock_freq();
-  virtual float dac_pga_gain() throw (std::runtime_error);
-  virtual float dac_pga_min() throw (std::runtime_error);
-  virtual float dac_pga_max() throw (std::runtime_error);
-  virtual float dac_pga_db_per_step() throw (std::runtime_error);
-  virtual void set_dac_pga(float gain) throw (std::runtime_error);
-  virtual float adc_pga_gain() throw (std::runtime_error);
-  virtual float adc_pga_min() throw (std::runtime_error);
-  virtual float adc_pga_max() throw (std::runtime_error);
-  virtual float adc_pga_db_per_step() throw (std::runtime_error);
-  virtual void set_adc_pga(float gain) throw (std::runtime_error);
+  virtual float pga_gain() throw (std::runtime_error);
+  virtual float pga_min() throw (std::runtime_error);
+  virtual float pga_max() throw (std::runtime_error);
+  virtual float pga_db_per_step() throw (std::runtime_error);
+  virtual void set_pga(float gain) throw (std::runtime_error);
   virtual void bypass_adc_buffers(bool bypass);
   virtual void write_oe(unsigned short mask, unsigned short value);
   virtual void set_refclk_divisor(int divisor);

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.cc
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.cc       
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.cc       
2007-12-20 16:33:00 UTC (rev 7232)
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <iomanip>
 
-#define USRPDB_HWA_QA_DEBUG 0
+#define USRPDB_HWA_QA_DEBUG 1
 
 usrpdb_hwa_sptr 
 usrpdb_make_qa_hwa(int side)
@@ -38,8 +38,7 @@
 
 usrpdb_hwa_qa::usrpdb_hwa_qa(int side)
   : d_side(side),
-    d_adc_pga_gain(0.0),
-    d_dac_pga_gain(0.0),
+    d_pga_gain(0.0),
     d_output_enable(0x0000),
     d_refclk_divisor(1),
     d_refclk_enabled(false)
@@ -73,76 +72,41 @@
 }
 
 float
-usrpdb_hwa_qa::dac_pga_gain()
+usrpdb_hwa_qa::pga_gain()
 {
-  return d_dac_pga_gain;
+  return d_pga_gain;
 }
 
 float
-usrpdb_hwa_qa::dac_pga_min()
+usrpdb_hwa_qa::pga_min()
 {
   // mimic USRP1
   return 0.0;
 }
 
 float
-usrpdb_hwa_qa::dac_pga_max()
+usrpdb_hwa_qa::pga_max()
 {
   // mimic USRP1
   return 20.0;
 }
 
 float
-usrpdb_hwa_qa::dac_pga_db_per_step()
+usrpdb_hwa_qa::pga_db_per_step()
 {
   // mimic USRP1
-  return (dac_pga_max()-dac_pga_min())/100.0;
+  return (pga_max()-pga_min())/20.0;
 }
 
 void
-usrpdb_hwa_qa::set_dac_pga(float gain)
+usrpdb_hwa_qa::set_pga(float gain)
 {
   if (USRPDB_HWA_QA_DEBUG)
-    std::cout << "usrpdb_hwa_qa: setting DAC PGA gain to " << gain << 
std::endl;
-  d_dac_pga_gain = gain;
+    std::cout << "usrpdb_hwa_qa: setting PGA gain to " << gain << std::endl;
+  d_pga_gain = gain;
 }
 
-float
-usrpdb_hwa_qa::adc_pga_gain()
-{
-  return d_adc_pga_gain;
-}
-
-float
-usrpdb_hwa_qa::adc_pga_min()
-{
-  // mimic USRP1
-  return 0.0;
-}
-
-float
-usrpdb_hwa_qa::adc_pga_max()
-{
-  // mimic USRP1
-  return 20.0;
-}
-
-float
-usrpdb_hwa_qa::adc_pga_db_per_step()
-{
-  // mimic USRP1
-  return (adc_pga_max()-adc_pga_min())/100.0;
-}
-
 void
-usrpdb_hwa_qa::set_adc_pga(float gain)
-{
-  if (USRPDB_HWA_QA_DEBUG)
-    std::cout << "usrpdb_hwa_qa: setting ADC PGA gain to " << gain << 
std::endl;
-  d_adc_pga_gain = gain;
-}
-
-void
 usrpdb_hwa_qa::bypass_adc_buffers(bool bypass)
 {
   if (USRPDB_HWA_QA_DEBUG)

Modified: gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.h
===================================================================
--- gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.h        
2007-12-19 20:51:16 UTC (rev 7231)
+++ gnuradio/branches/developers/jcorgan/t127/usrpdb/src/usrpdb_hwa_qa.h        
2007-12-20 16:33:00 UTC (rev 7232)
@@ -36,8 +36,7 @@
 
   // Mimic dummy hardware
   unsigned int d_side;
-  float d_adc_pga_gain;
-  float d_dac_pga_gain;
+  float d_pga_gain;
   unsigned short d_output_enable;
   int d_refclk_divisor;
   bool d_refclk_enabled;
@@ -48,16 +47,11 @@
 
   unsigned int side();
   float fpga_master_clock_freq();
-  float dac_pga_gain();
-  float dac_pga_min();
-  float dac_pga_max();
-  float dac_pga_db_per_step();
-  void set_dac_pga(float gain);
-  float adc_pga_gain();
-  float adc_pga_min();
-  float adc_pga_max();
-  float adc_pga_db_per_step();
-  void set_adc_pga(float gain);
+  float pga_gain();
+  float pga_min();
+  float pga_max();
+  float pga_db_per_step();
+  void set_pga(float gain);
   void bypass_adc_buffers(bool bypass);
   void write_oe(unsigned short mask, unsigned short val);
   void set_refclk_divisor(int divisor);