Index: /trunk/FACT++/src/HeadersFeedback.h
===================================================================
--- /trunk/FACT++/src/HeadersFeedback.h	(revision 17024)
+++ /trunk/FACT++/src/HeadersFeedback.h	(revision 17025)
@@ -11,14 +11,11 @@
             kDisconnected,
             kConnecting,
-            kConnectedFSC,
-            kConnectedFAD,
             kConnected,
-            kTempCtrlIdle,        // 7
-            kFeedbackCtrlIdle,    // 8
-            kCurrentCtrlIdle,     // 9
-            kTempCtrlRunning,     // 9->10
-            kFeedbackCtrlRunning, // 10->11
-            kCurrentCtrlRunning,  // 12
-            kCalibrating,         // 11->13
+
+            kCalibrating,
+            kCalibrated,
+
+            kWaitingForData,
+            kInProgress,
         };
     }