Changeset 16449 for trunk

Timestamp:

05/30/13 00:33:44 (11 years ago)

Author:

tbretz

Message:

Changed some SendCommand to SendCommandNB - no need to block; added some debugging log to know how much command were sent during calibration; replaced DimClient by Dim

File:

• trunk/FACT++/src/ratecontrol.cc (modified) (6 diffs)

trunk/FACT++/src/ratecontrol.cc

@@ -147 +147 @@
 
         const uint32_t val[2] = { idx,  diff };
-        DimClient::sendCommandNB("FTM_CONTROL/SET_THRESHOLD", (void*)val, 8);
+        Dim::SendCommandNB("FTM_CONTROL/SET_THRESHOLD", val);
 
         fBlock[idx/4] = true;
@@ -348 +348 @@
 
         const uint32_t val[2] = { -1,  diff };
-        DimClient::sendCommandNB("FTM_CONTROL/SET_THRESHOLD", (void*)val, 8);
+        DimClient::SendCommandNB("FTM_CONTROL/SET_THRESHOLD", val);
 
         fThresholdMin = diff;
@@ -492 +492 @@
         fThresholds.assign(160, fThresholdMin);
 
+        int counter = 1;
+
         const int32_t val[2] = { -1, fThresholdMin };
-        Dim::SendCommand("FTM_CONTROL/SET_THRESHOLD", val);
+        Dim::SendCommandNB("FTM_CONTROL/SET_THRESHOLD", val);
 
         double avg2 = 0;
@@ -506 +508 @@
 
                 const int32_t dat[2] = { i, fThresholds[i] };
-                Dim::SendCommand("FTM_CONTROL/SET_THRESHOLD", dat);
+                Dim::SendCommandNB("FTM_CONTROL/SET_THRESHOLD", dat);
 
                 fBlock[i/4] = true;
+
+                counter++;
             }
         }
@@ -517 +521 @@
         fDimThreshold.setQuality(2);
         fDimThreshold.Update(data);
+
+        Info("Sent a total of "+to_string(counter)+" commands for threshold setting");
 
         ostringstream out;
@@ -535 +541 @@
 
         const int32_t val[2] = { -1, fThresholdReference };
-        Dim::SendCommand("FTM_CONTROL/SET_THRESHOLD", val);
+        Dim::sendCommandNB("FTM_CONTROL/SET_THRESHOLD", val);
 
         fThresholds.assign(160, fThresholdReference);