commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r3597 - in gnuradio/branches/developers/trondeau/digit

From: trondeau
Subject: [Commit-gnuradio] r3597 - in gnuradio/branches/developers/trondeau/digital-wip: gnuradio-core/src/lib/general gnuradio-examples/python/gmsk2
Date: Thu, 21 Sep 2006 14:55:31 -0600 (MDT) 
Author: trondeau
Date: 2006-09-21 14:55:31 -0600 (Thu, 21 Sep 2006)
New Revision: 3597

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
Log:
made default values for AGC's consistent and swapped decay_gain and attack_gain 
in AGC2 function defs

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
       2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.cc
       2006-09-21 20:55:31 UTC (rev 3597)
@@ -29,18 +29,18 @@
 #include <gri_agc2_cc.h>
 
 gr_agc2_cc_sptr
-gr_make_agc2_cc (float decay_rate, float attack_rate, float reference, 
+gr_make_agc2_cc (float attack_rate, float decay_rate, float reference, 
                 float gain, float max_gain)
 {
-  return gr_agc2_cc_sptr (new gr_agc2_cc (decay_rate, attack_rate, reference, 
gain, max_gain));
+  return gr_agc2_cc_sptr (new gr_agc2_cc (attack_rate, decay_rate, reference, 
gain, max_gain));
 }
 
-gr_agc2_cc::gr_agc2_cc (float decay_rate, float attack_rate, float reference, 
+gr_agc2_cc::gr_agc2_cc (float attack_rate, float decay_rate, float reference, 
                       float gain, float max_gain)
   : gr_sync_block ("gr_agc2_cc",
                   gr_make_io_signature (1, 1, sizeof (gr_complex)),
                   gr_make_io_signature (1, 1, sizeof (gr_complex))), 
-    gri_agc2_cc (decay_rate,  attack_rate, reference, gain, max_gain)
+    gri_agc2_cc (attack_rate,  decay_rate, reference, gain, max_gain)
 {
 }
 

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
        2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.h
        2006-09-21 20:55:31 UTC (rev 3597)
@@ -30,8 +30,8 @@
 typedef boost::shared_ptr<gr_agc2_cc> gr_agc2_cc_sptr;
 
 gr_agc2_cc_sptr
-gr_make_agc2_cc (float decay_rate = 1e-1, float attack_rate = 1e-2, float 
reference = 1.0, 
-                float gain = 1.0, float max_gain = 1000.0);
+gr_make_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
+                float gain = 1.0, float max_gain = 0.0);
 /*!
  * \brief high performance Automatic Gain Control class
  *
@@ -40,9 +40,9 @@
 
 class gr_agc2_cc : public gr_sync_block, public gri_agc2_cc
 {
-  friend gr_agc2_cc_sptr gr_make_agc2_cc (float decay_rate, float attack_rate, 
float reference, 
+  friend gr_agc2_cc_sptr gr_make_agc2_cc (float attack_rate, float decay_rate, 
float reference, 
                                          float gain, float max_gain);
-  gr_agc2_cc (float decay_rate, float attack_rate, float reference, 
+  gr_agc2_cc (float attack_rate, float decay_rate, float reference, 
              float gain, float max_gain);
   
  public:

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
        2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_cc.i
        2006-09-21 20:55:31 UTC (rev 3597)
@@ -25,11 +25,11 @@
 %include <gri_agc2_cc.i>
 
 gr_agc2_cc_sptr
-gr_make_agc2_cc (float decay_rate = 1e-1, float attack_rate = 1e-2, float 
reference = 1.0, 
-                float gain = 1.0, float max_gain = 1000.0);
+gr_make_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
+                float gain = 1.0, float max_gain = 0.0);
 
 class gr_agc2_cc : public gr_sync_block , public gri_agc2_cc
 {
-  gr_agc2_cc (float decay_rate, float attack_rate, float reference, 
+  gr_agc2_cc (float attack_rate, float decay_rate, float reference, 
              float gain, float max_gain);
 };

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
       2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.cc
       2006-09-21 20:55:31 UTC (rev 3597)
@@ -29,19 +29,19 @@
 #include <gri_agc2_ff.h>
 
 gr_agc2_ff_sptr
-gr_make_agc2_ff (float decay_rate, float attack_rate, float reference, 
+gr_make_agc2_ff (float attack_rate, float decay_rate, float reference, 
                 float gain, float max_gain)
 {
-  return gr_agc2_ff_sptr (new gr_agc2_ff (decay_rate, attack_rate, reference, 
+  return gr_agc2_ff_sptr (new gr_agc2_ff (attack_rate, decay_rate, reference, 
                                          gain, max_gain));
 }
 
-gr_agc2_ff::gr_agc2_ff (float decay_rate, float attack_rate, float reference, 
+gr_agc2_ff::gr_agc2_ff (float attack_rate, float decay_rate, float reference, 
                        float gain, float max_gain)
   : gr_sync_block ("gr_agc2_ff",
                   gr_make_io_signature (1, 1, sizeof (float)),
                   gr_make_io_signature (1, 1, sizeof (float)))
-  , gri_agc2_ff (decay_rate, attack_rate,  reference, gain, max_gain)
+  , gri_agc2_ff (attack_rate, decay_rate,  reference, gain, max_gain)
 {
 }
 

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
        2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.h
        2006-09-21 20:55:31 UTC (rev 3597)
@@ -29,7 +29,7 @@
 typedef boost::shared_ptr<gr_agc2_ff> gr_agc2_ff_sptr;
 
 gr_agc2_ff_sptr
-gr_make_agc2_ff (float decay_rate = 1e-1, float attack_rate = 1e-2, float 
reference = 1.0, 
+gr_make_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
                 float gain = 1.0, float max_gain = 0.0);
 /*!
  * \brief high performance Automatic Gain Control class
@@ -39,9 +39,9 @@
 
 class gr_agc2_ff : public gr_sync_block, public gri_agc2_ff
 {
-  friend gr_agc2_ff_sptr gr_make_agc2_ff (float decay_rate, float attack_rate,
+  friend gr_agc2_ff_sptr gr_make_agc2_ff (float attack_rate, float decay_rate,
                                          float reference, float gain, float 
max_gain);
-  gr_agc2_ff (float decay_rate, float attack_rage, float reference, float 
gain, float max_gain);
+  gr_agc2_ff (float attack_rate, float decay_rate, float reference, float 
gain, float max_gain);
 
  public:
   virtual int work (int noutput_items,

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
        2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc2_ff.i
        2006-09-21 20:55:31 UTC (rev 3597)
@@ -25,10 +25,11 @@
 %include <gri_agc2_ff.i>
 
 gr_agc2_ff_sptr
-gr_make_agc2_ff (float decay_rate = 1e-1, float attack_rate = 1e-2, float 
reference = 1.0, 
+gr_make_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
                 float gain = 1.0, float max_gain = 0.0);
 
 class gr_agc2_ff : public gr_sync_block , public gri_agc2_ff
 {
-  gr_agc2_ff (float decay_rate, float attack_rate, float reference, float 
gain, float max_gain);
+  gr_agc2_ff (float attack_rate, float decay_rate, float reference, 
+             float gain, float max_gain);
 };

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
 2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.h
 2006-09-21 20:55:31 UTC (rev 3597)
@@ -30,7 +30,7 @@
 
 gr_agc_cc_sptr
 gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, 
-               float gain = 1.0, float max_gain = 1000.0);
+               float gain = 1.0, float max_gain = 0.0);
 /*!
  * \brief high performance Automatic Gain Control class
  *

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
 2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gr_agc_cc.i
 2006-09-21 20:55:31 UTC (rev 3597)
@@ -26,7 +26,7 @@
 
 gr_agc_cc_sptr
 gr_make_agc_cc (float rate = 1e-4, float reference = 1.0, 
-               float gain = 1.0, float max_gain = 1000.0);
+               float gain = 1.0, float max_gain = 0.0);
 
 class gr_agc_cc : public gr_sync_block , public gri_agc_cc
 {

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
       2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.h
       2006-09-21 20:55:31 UTC (rev 3597)
@@ -34,9 +34,9 @@
 class gri_agc2_cc {
 
  public:
-  gri_agc2_cc (float decay_rate = 1e-1, float attack_rate = 1e-2, float 
reference = 1.0, 
-              float gain = 1.0, float max_gain = 1000.0)
-    : _decay_rate(decay_rate), _attack_rate(attack_rate), 
_reference(reference),
+  gri_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
+              float gain = 1.0, float max_gain = 0.0)
+    : _attack_rate(attack_rate), _decay_rate(decay_rate), 
_reference(reference),
       _gain(gain), _max_gain(max_gain) {};
 
   float decay_rate () const  { return _decay_rate; }

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
       2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_cc.i
       2006-09-21 20:55:31 UTC (rev 3597)
@@ -32,8 +32,8 @@
 class gri_agc2_cc {
 
  public:
-  gri_agc2_cc (float decay_rate = 1e-2, float attack_rate = 1e-2, float 
reference = 1.0, 
-              float gain = 1.0, float max_gain = 1000.0);
+  gri_agc2_cc (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
+              float gain = 1.0, float max_gain = 0.0);
   float decay_rate ();
   float attack_rate ();
   float reference ();

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
       2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.h
       2006-09-21 20:55:31 UTC (rev 3597)
@@ -34,9 +34,9 @@
 class gri_agc2_ff {
 
  public:
-  gri_agc2_ff (float decay_rate = 1e-4, float attack_rate = 1e-2, float 
reference = 1.0, 
+  gri_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2, float 
reference = 1.0, 
               float gain = 1.0, float max_gain = 0.0)
-    : _decay_rate(decay_rate), _attack_rate(attack_rate), 
_reference(reference), 
+    : _attack_rate(attack_rate), _decay_rate(decay_rate), 
_reference(reference), 
       _gain(gain), _max_gain(max_gain) {};
 
   float decay_rate () const  { return _decay_rate; }

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
       2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc2_ff.i
       2006-09-21 20:55:31 UTC (rev 3597)
@@ -32,6 +32,6 @@
 class gri_agc2_ff {
 
  public:
-  gri_agc2_ff (float decay_rate = 1e-1, float attack_rate = 1e-2,
+  gri_agc2_ff (float attack_rate = 1e-1, float decay_rate = 1e-2,
               float reference = 1.0, float gain = 1.0, float max_gain = 0.0);
   };

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
        2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.h
        2006-09-21 20:55:31 UTC (rev 3597)
@@ -35,7 +35,7 @@
 
  public:
   gri_agc_cc (float rate = 1e-4, float reference = 1.0, 
-              float gain = 1.0, float max_gain = 1000.0)
+              float gain = 1.0, float max_gain = 0.0)
     : _rate(rate), _reference(reference),
       _gain(gain), _max_gain(max_gain) {};
 

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
        2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/lib/general/gri_agc_cc.i
        2006-09-21 20:55:31 UTC (rev 3597)
@@ -33,7 +33,7 @@
 
  public:
   gri_agc_cc (float rate = 1e-4, float reference = 1.0, 
-              float gain = 1.0, float max_gain = 1000.0);
+              float gain = 1.0, float max_gain = 0.0);
   float rate ();
   float reference ();
   float gain ();

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
   2006-09-21 20:26:48 UTC (rev 3596)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-examples/python/gmsk2/transmit_path.py
   2006-09-21 20:55:31 UTC (rev 3597)
@@ -66,7 +66,7 @@
         # Set center frequency of USRP
         ok = self.set_freq(self._tx_freq)
         if not ok:
-            print "Failed to set Tx frequency to %s" % 
(eng_notation.num_to_str(options.freq),)
+            print "Failed to set Tx frequency to %s" % 
(eng_notation.num_to_str(options.tx_freq),)
             raise ValueError
     
         # transmitter
reply via email to
[Prev in Thread] Current Thread [Next in Thread]