Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 13932)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 13933)
@@ -343,20 +343,21 @@
             // Status 4: Tracking
             if (status1==0)
-                status1 = 0x100-3;
+                status1 = 0x100;
 
             const bool ready = (pdo3&0xef00ef)==0xef00ef;
             if (!ready)
-                fState = 0;
+                fState = Drive::State::kNotReady;
             else   
-                fState = status1==1 ? armed+1 : status1;
-
-            //  1: Not ready
-            //  2: Not armed
-            //  3: Armed
-            //  4: Moving
-            //  5: Tracking
-            // 99: Error
-
-
+                fState = status1==1 ?
+                    Drive::State::kReady+armed :
+                    Drive::State::kNotReady+status1;
+
+            // kDisconnected = 1,
+            // kConnected,
+            // kNotReady,
+            // kReady,
+            // kArmed,
+            // kMoving,
+            // kTracking,
 
             // pdo3:
@@ -529,5 +530,5 @@
         if (IsConnected() && fState<0)
             return 2;
-        return fState+3;
+        return fState;
     }
 };