Changeset 11938 for trunk/FACT++

Timestamp:

09/01/11 21:39:02 (13 years ago)

Author:

tbretz

Message:

Added some more configuration options and a voltage limit

File:

• trunk/FACT++/src/biasctrl.cc (modified) (18 diffs)

trunk/FACT++/src/biasctrl.cc

@@ -78 +78 @@
 
     uint16_t fUpdateTime;
+    uint16_t fSyncTime;
 
     bool fIsInitializing;
@@ -89 +90 @@
     vector<int16_t>  fCurrent;     // Current in ADC units (12bit = 5mA)
 
+    uint16_t fVoltMax;
+
     virtual void UpdateA()
     {
@@ -103 +106 @@
         {
             Error(cmd+" - DAC value out of range.");
+            return false;
+        }
+        if (dac>fVoltMax)
+        {
+            Error(cmd+" - DAC value exceeds fVoltMax.");
             return false;
         }
@@ -199 +207 @@
                 Warn("Initial answer doesn't seem to be a reset as naively expected.");
 
-                // FIXME:
                 //ostringstream msg;
                 //msg << hex << setfill('0');
@@ -463 +470 @@
     void ScheduleSync(int counter=0)
     {
-        fSyncTimer.expires_from_now(boost::posix_time::milliseconds(1000));
+        fSyncTimer.expires_from_now(boost::posix_time::milliseconds(fSyncTime));
         fSyncTimer.async_wait(boost::bind(&ConnectionBias::HandleSyncTimer, this, counter, dummy::error));
     }
@@ -511 +518 @@
         }
 
-        if (is_open())
-        {
-            if (fIsRamping)
-            {
-                Info("Schedule of update timer skipped.");
-                ScheduleUpdate(fUpdateTime);
-            }
-            else
-                ReadAllChannels(true);
-        }
+        if (!is_open())
+            return;
+
+        if (fIsRamping)
+            ScheduleUpdate(fUpdateTime);
+        else
+            ReadAllChannels(true);
     }
 
@@ -565 +569 @@
     bool RampOneStep()
     {
+        if (fRampTime<0)
+        {
+            Warn("Ramping step time not yet set... ramping not started.");
+            return false;
+        }
+        if (fRampStep<0)
+        {
+            Warn("Ramping step not yet set... ramping not started.");
+            return false;
+        }
+
         vector<uint16_t> dac(kNumChannels);
 
@@ -626 +641 @@
     void ScheduleRampStep()
     {
-        Message("Schedule ramping");
         fRampTimer.expires_from_now(boost::posix_time::milliseconds(fRampTime));
         fRampTimer.async_wait(boost::bind(&ConnectionBias::HandleRampTimer, this, dummy::error));
@@ -644 +658 @@
         fRampStep(-1),
         fRampTime(-1),
+        fSyncTime(333),
         fUpdateTime(3000),
         fIsRamping(false),
@@ -791 +806 @@
 
         fIsRamping = RampOneStep();
-
-        ostringstream msg;
-        msg << "Ramp=" << fIsRamping;
-        Message(msg);
     }
 
@@ -826 +837 @@
 
         fVoltCmd[ch] = dac;
-
-        // FIXME: How to ensure the correct evaluation of the answer?
 
         ostringstream msg;
@@ -983 +992 @@
 
     // -------------------------------------------------------------------
+
+    void SetUpdateInterval(uint16_t val)
+    {
+        fUpdateTime = val;
+    }
+
+    void SetSyncDelay(uint16_t val)
+    {
+        fSyncTime = val;
+    }
+
+    void SetVoltMax(float max)
+    {
+        fVoltMax = max*4096/90;
+        if (fVoltMax>4095)
+            fVoltMax = 4095;
+        if (max<0)
+            fVoltMax = 0;
+    }
+
+
 /*
     void AdaptVoltages()
@@ -1292 +1322 @@
         // deletion and creation of threads and more.
 
-        T::Warn("FIXME -- implement a state for 'at reference'");
-
         // State names
         T::AddStateName(ConnectionBias::kDisconnected, "Disconnected",
@@ -1436 +1464 @@
             return 1;
         }
-        if (time>10000) // 5V
-        {
-            T::Error("ramp-time exceeds allowed range.");
-            return 2;
-        }
 
         fBias.SetRampStep(step);
         fBias.SetRampTime(time);
+        fBias.SetUpdateInterval(conf.Get<uint16_t>("update-interval"));
+        fBias.SetSyncDelay(conf.Get<uint16_t>("sync-delay"));
+
+        const float maxv = conf.Get<float>("volt-max");
+        if (maxv>90)
+        {
+            T::Error("volt-max exceeds 90V.");
+            return 2;
+        }
+        if (maxv>75)
+            T::Warn("volt-max exceeds 75V.");
+        if (maxv<70)
+            T::Warn("volt-max below 70V.");
+        if (maxv<0)
+        {
+            T::Error("volt-max negative.");
+            return 3;
+        }
+
+        fBias.SetVoltMax(maxv);
 
         // --------------------------------------------------------------------------
@@ -1477 +1520 @@
             {
                 T::Error("Invalid board/channel read from FACTmapV5.txt.");
-                return 3;
+                return 4;
             }
 
@@ -1487 +1530 @@
         {
             T::Error("Reading reference voltages from FACTmapV5.txt failed.");
-            return 4;
+            return 5;
         }
 
@@ -1493 +1536 @@
         {
             T::Error("Setting reference voltages failed.");
-            return 5;
+            return 6;
         }
 
@@ -1518 +1561 @@
     po::options_description control("BIAS control options");
     control.add_options()
-        ("no-dim,d",      po_bool(),  "Disable dim services")
-        ("dev",           var<string>("FTE00FOH"),  "Device address of USB port to bias-power supply")
-        ("quiet,q",       po_bool(),        "Disable printing contents of all received messages (except dynamic data) in clear text.")
-        ("ramp-time",     var<uint16_t>(),  "")
-        ("ramp-step",     var<uint16_t>(),  "")
+        ("no-dim,d",        po_bool(),  "Disable dim services")
+        ("dev",             var<string>("FTE00FOH"),  "Device address of USB port to bias-power supply")
+        ("quiet,q",         po_bool(),        "Disable printing contents of all received messages (except dynamic data) in clear text.")
+        ("ramp-time",       var<uint16_t>(15),   "")
+        ("ramp-step",       var<uint16_t>(46),   "")
+        ("update-interval", var<uint16_t>(3000), "")
+        ("sync-delay",      var<uint16_t>(333),  "")
+        ("volt-max",        var<float>(75),      "")
         ;
-    // FIXME: Update interval
-    // FIXME: Synchronization interval
-    // FIXME: Make sure ramping / request and commands are not sent at the same time.
-    // FIXME: Add limit of 75V
+    // FIXME: Make sure ramping / request and commands are
+    //        not sent at the same time.
 
     conf.AddOptions(control);