From 47e21e8227fa1af3ff9e53b3367ff19902cb0079 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Mon, 15 Apr 2013 23:54:45 +0000
Subject: [PATCH] Converting from AG_UC to CONEX

---
 motorApp/NewportSrc/AG_CONEX.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/motorApp/NewportSrc/AG_CONEX.h b/motorApp/NewportSrc/AG_CONEX.h
index 4f4d2c34..bf9ca60b 100644
--- a/motorApp/NewportSrc/AG_CONEX.h
+++ b/motorApp/NewportSrc/AG_CONEX.h
@@ -32,7 +32,7 @@ private:
                                    *   Abbreviated because it is used very frequently */
   int currentPosition_;
   int positionOffset_;
-  int controllerID_;
+  double encoderIncrement_;
   
 friend class AG_CONEXController;
 };
@@ -47,5 +47,8 @@ public:
   asynStatus writeAgilis();
   asynStatus writeAgilis(const char *output, double timeout);
 
+private:
+  int controllerID_;
+
   friend class AG_CONEXAxis;
 };