Changeset 12177 for trunk

Timestamp:

10/13/11 09:09:22 (13 years ago)

Author:

tbretz

Message:

Added new commands ENABLE_PATCH and DISABLE_PATCH

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (3 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -1106 +1106 @@
 
         for (int i=0; i<=FTM::StaticData::kMaxPixelIdx; i++)
-            data.EnablePixel(i, i<0 || i/9==idx);
+            data.EnablePixel(i, i/9==idx);
+
+        CmdSendStatDat(data);
+
+        return true;
+    }
+
+    bool EnablePatch(int16_t idx, bool enable)
+    {
+        if (idx>FTM::StaticData::kMaxPatchIdx)
+            return false;
+
+        FTM::StaticData data(fStaticData);
+
+        for (int i=0; i<=FTM::StaticData::kMaxPixelIdx; i++)
+            if (i/9==idx)
+                data.EnablePixel(i, enable);
 
         CmdSendStatDat(data);
@@ -1703 +1719 @@
     }
 
+    int EnablePatch(const EventImp &evt, bool enable)
+    {
+        if (!CheckEventSize(evt.GetSize(), "EnablePatch", 2))
+            return T::kSM_FatalError;
+
+        if (!fFTM.EnablePatch(evt.GetUShort(), enable))
+            T::Warn("EnablePatch -  Value out of range.");
+
+        return T::GetCurrentState();
+    }
+
     int TogglePixel(const EventImp &evt)
     {
@@ -2000 +2027 @@
         T::AddEvent("DISABLE_ALL_PATCHES_EXCEPT", "S:1", FTM::kIdle)
             (bind(&StateMachineFTM::DisableAllPatchesExcept, this, placeholders::_1))
+            ("");
+
+        T::AddEvent("ENABLE_PATCH", "S:1", FTM::kIdle)
+            (bind(&StateMachineFTM::EnablePatch, this, placeholders::_1, true))
+            ("");
+
+        T::AddEvent("DISABLE_PATCH", "S:1", FTM::kIdle)
+            (bind(&StateMachineFTM::EnablePatch, this, placeholders::_1, false))
             ("");