Diff: DW1000Setup.cpp

Revision:

9:326bf149c8bc

Parent:

8:0b408e77b701

--- a/DW1000Setup.cpp	Mon Apr 18 16:58:27 2016 +0000
+++ b/DW1000Setup.cpp	Wed Apr 20 11:03:41 2016 +0000
@@ -3,6 +3,7 @@
 
 DW1000Setup::DW1000Setup(UWBMode modeToUse)
 {
+    setGPIO(0x0180);
     switch (modeToUse) {
         case user110k:  // values from Matthias Grob & Manuel Stalder - ETH Zürich - library
 
@@ -13,7 +14,7 @@
             setPreambleLength(pre1024);
             setPreambleCode(3);
             setSmartPower(false);
-//            setTxPower(18);
+            setTxPower(18);
             break;
         case tunedDefault:    // User Manual "2.5.5 Default Configurations that should be modified" p. 22
         default:
@@ -24,7 +25,7 @@
             setPreambleLength(pre128);
             setPreambleCode(3);
             setSmartPower(false);
-//            setTxPower(18);
+            setTxPower(18);
             break;
         case fastLocationC5:
             setChannel(5);
@@ -34,7 +35,7 @@
             setPreambleLength(pre64);
             setPreambleCode(10);
             setSmartPower(true);
-//            setTxPower(18);
+            setTxPower(18);
             break;
         case fastLocationC4:
             setChannel(4);
@@ -44,7 +45,7 @@
             setPreambleLength(pre64);
             setPreambleCode(18);
             setSmartPower(true);
-//            setTxPower(18);
+            setTxPower(18);
             break;
         case rangeRateCompromise:
             setChannel(4);
@@ -54,7 +55,7 @@
             setPreambleLength(pre256);
             setPreambleCode(18);
             setSmartPower(false);
-//            setTxPower(18);
+            setTxPower(18);
             break;
     }
 }
@@ -212,14 +213,15 @@
             break;
     }
 
-    snprintf(buffer,len,"Channel:\t%u\r\nPRF:\t%s\r\nData Rate:\t%s\r\nPreamble length:\t%s\r\nPreamble code:\t%u\r\nSmart power:\t%s\r\nSFD:\t%s\r\n",
+    snprintf(buffer,len,"Channel:\t%u\r\nPRF:\t%s\r\nData Rate:\t%s\r\nPreamble length:\t%s\r\nPreamble code:\t%u\r\nSmart power:\t%s\r\nSFD:\t%s\r\nTx Gain:\t%.1f,%.1f,%.1f,%.1f\r\n",
              channel,
              (prf == prf16MHz)?"16 MHz":"64 MHz",
              dataRateString,
              preambleString,
              preambleCode,
              enableSmartPower?"Enabled":"Disabled",
-             (sfd == standard)?"Standard":"Non-standard");
+             (sfd == standard)?"Standard":"Non-standard",
+             powers[0],powers[1],powers[2],powers[3]);
 }
 
     bool DW1000Setup::setSmartTxPower(float powerdBm,float power500us,float power250us,float power125us) {