Changeset 2386

Timestamp:

12/19/06 14:04:55 (6 years ago)

Author:

phelps

Message:

not tested yet, including dbsrx.h and dbsrx.cpp, more changes

Location:

platform/USRP/trunk/USRP

Files:

• dbsrx.cpp (modified) (1 diff)
• dbsrx.h (modified) (1 diff)

platform/USRP/trunk/USRP/dbsrx.cpp

@@ -354 +354 @@
 
 //Gain Setting Helper Function
-//NEED TO FIGURE THIS ONE OUT####################################################
 void dbsrx::set_gc1(int gc1_in);
 {
-
+        assert(gc1_in>=0&&gc1<4096);
+        gc1 = gc1_in;
+        u->write_aux_dac(which,0,(int) gc1_in);
 }
 
 //Gain Setting Helper Function
-//NEED TO FIGURE THIS ONE OUT####################################################
 void dbsrx::set_pga(int pga_gain_in);
 {
         assert(pga_gain>=0&&pga_gain<=20);
         if (which==0){
-                
+                u->set_pga(0, pga_gain);
+                u->set_pga(1, pga_gain);
+        }
+        else {
+                u->set_pga(2, pga_gain);
+                u->set_pga(3, pga_gain);
+        }       
 }
 

platform/USRP/trunk/USRP/dbsrx.h

@@ -48 +48 @@
   dbsrx();
 
-  int N = 950;
-  int DIV2 = 0;
-  int OSC = 5;
-  int CP = 3;
-  int R = 4;
-  int R_INT = 1;
-  int FDAC = 127;
-  int M = 2;
-  int DL = 0;
-  int ADE = 0;
-  int ADL = 0;
-  int GC2 = 31;
-  int DIAG = 0;
-  int REFCLK_DIVISOR = 16;
+  int n = 950;
+  int div2 = 0;
+  int osc = 5;
+  int cp = 3;
+  int r = 4;
+  int r_int = 1;
+  int fdac = 127;
+  int m = 2;
+  int dl = 0;
+  int ade = 0;
+  int adl = 0;
+  int gc2 = 31;
+  int diag = 0;
+  int refclk_divisor = 16;
 
 //Helper functions