From 5408fe5ee7fd1584fc6bb44e7d354e97801c7d15 Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Tue, 16 Apr 2013 17:07:10 +0000
Subject: [PATCH] Create AG_CONEX_Axis object in AG_CONEXController
 constructor; add more info to report()

---
 motorApp/NewportSrc/AG_CONEX.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/motorApp/NewportSrc/AG_CONEX.cpp b/motorApp/NewportSrc/AG_CONEX.cpp
index 0b5a0b52..baa5623a 100644
--- a/motorApp/NewportSrc/AG_CONEX.cpp
+++ b/motorApp/NewportSrc/AG_CONEX.cpp
@@ -59,6 +59,9 @@ AG_CONEXController::AG_CONEXController(const char *portName, const char *serialP
   sprintf(outString_, "%dVE", controllerID_);
   status = writeReadController();
   printf("Agilis controller firmware version = %s\n", inString_);
+  
+  // Create the axis object
+  new AG_CONEXAxis(this);
 
   startPoller(movingPollPeriod, idlePollPeriod, 2);
 }
@@ -155,7 +158,7 @@ AG_CONEXAxis* AG_CONEXController::getAxis(int axisNo)
 AG_CONEXAxis::AG_CONEXAxis(AG_CONEXController *pC)
   : asynMotorAxis(pC, 0),
     pC_(pC), 
-    currentPosition_(0), positionOffset_(0)
+    currentPosition_(0.), positionOffset_(0.)
 {
   // Read the encoder increment
   sprintf(pC_->outString_, "%dSU?", pC->controllerID_);
@@ -180,8 +183,8 @@ AG_CONEXAxis::AG_CONEXAxis(AG_CONEXController *pC)
 void AG_CONEXAxis::report(FILE *fp, int level)
 {
   if (level > 0) {
-    fprintf(fp, "  encoderIncrement=%f\n",
-            encoderIncrement_);
+    fprintf(fp, "  currentPosition=%f, positionOffset=%f, encoderIncrement=%f, lowLimit=%f, highLimit=%f\n",
+            currentPosition_, positionOffset_, encoderIncrement_, lowLimit_, highLimit_);
   }
 
   // Call the base class method