From 76184ef940bb6ad3ef08a49d9c881d2fa54a4c26 Mon Sep 17 00:00:00 2001 From: timmmooney Date: Mon, 28 Feb 2011 16:43:39 +0000 Subject: [PATCH] elapsedTime PV; digital I/O bit numbers are now PVs; realTimeTrajectories are now PVs; added motorCurrentVRaw and ..ARaw for testing --- motorApp/OmsSrc/MAX_trajectoryScan.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/motorApp/OmsSrc/MAX_trajectoryScan.h b/motorApp/OmsSrc/MAX_trajectoryScan.h index 1638d1e4..38af4c7b 100644 --- a/motorApp/OmsSrc/MAX_trajectoryScan.h +++ b/motorApp/OmsSrc/MAX_trajectoryScan.h @@ -53,6 +53,7 @@ int moveMode; assign moveMode to "{P}{R}MoveMode.VAL"; monitor moveMode; double time; assign time to "{P}{R}Time.VAL"; monitor time; +double elapsedTime; assign elapsedTime to "{P}{R}ElapsedTime.VAL"; double timeScale; assign timeScale to "{P}{R}TimeScale.VAL"; monitor timeScale; int timeMode; assign timeMode to "{P}{R}TimeMode.VAL"; @@ -86,6 +87,13 @@ monitor timeTrajectory; string trajectoryFile; assign trajectoryFile to "{P}{R}TrajectoryFile.VAL"; monitor trajectoryFile; +int inBitNum; assign inBitNum to "{P}{R}InBitNum.VAL"; +monitor inBitNum; +int outBitNum; assign outBitNum to "{P}{R}OutBitNum.VAL"; +monitor outBitNum; +double realTimeTrajectory[MAX_ELEMENTS]; +assign realTimeTrajectory to "{P}{R}realTimeTrajectory.VAL"; + int moveAxis[MAX_AXES]; assign moveAxis to {"{P}{R}M1Move.VAL", @@ -144,6 +152,8 @@ assign motorCurrent to "{P}{R}M8Current.VAL"}; int motorCurrentRaw[MAX_AXES]; +int motorCurrentVRaw[MAX_AXES]; +int motorCurrentARaw[MAX_AXES]; double motorMDVS[MAX_AXES]; assign motorMDVS to