From 025d5de311a500a0a77153988972c567e99d09d4 Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Wed, 17 Apr 2013 23:51:16 +0000 Subject: [PATCH] Added additional information for report; support for KP, KI, LF --- motorApp/NewportSrc/AG_CONEX.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/motorApp/NewportSrc/AG_CONEX.h b/motorApp/NewportSrc/AG_CONEX.h index 8e3b2439..cf15b999 100644 --- a/motorApp/NewportSrc/AG_CONEX.h +++ b/motorApp/NewportSrc/AG_CONEX.h @@ -33,6 +33,7 @@ public: private: AG_CONEXController *pC_; /**< Pointer to the asynMotorController to which this axis belongs. * Abbreviated because it is used very frequently */ + asynStatus getClosedLoop(bool *closedLoop); double currentPosition_; double positionOffset_; double encoderIncrement_; @@ -40,6 +41,10 @@ private: double stepSize_; double highLimit_; double lowLimit_; + double KP_; + double KI_; + double LF_; + char stageID_[40]; friend class AG_CONEXController; }; @@ -56,6 +61,7 @@ public: private: int controllerID_; + char controllerVersion_[40]; friend class AG_CONEXAxis; };