From 5a402fd3f1032bf89f82a59071bc6f5197b2970f Mon Sep 17 00:00:00 2001 From: timmmooney Date: Wed, 29 Jan 2014 18:12:04 +0000 Subject: [PATCH] Added motor-start PVs, and a PV by which user can choose whether or not software should add accel/decel trajectory segments. Added evflag to moveMode, so we can forbid hybrid mode, which is not supported (yet?) for Ensemble or MAXv. --- motorApp/OmsSrc/MAX_trajectoryScan.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/motorApp/OmsSrc/MAX_trajectoryScan.h b/motorApp/OmsSrc/MAX_trajectoryScan.h index daa6c641..4c8501cb 100644 --- a/motorApp/OmsSrc/MAX_trajectoryScan.h +++ b/motorApp/OmsSrc/MAX_trajectoryScan.h @@ -157,6 +157,22 @@ assign motorMaxSpeed to "{P}{R}M7MaxSpeed.VAL", "{P}{R}M8MaxSpeed.VAL"}; +double motorStart[MAX_AXES]; +assign motorStart to + {"{P}{R}M1Start.VAL", + "{P}{R}M2Start.VAL", + "{P}{R}M3Start.VAL", + "{P}{R}M4Start.VAL", + "{P}{R}M5Start.VAL", + "{P}{R}M6Start.VAL", + "{P}{R}M7Start.VAL", + "{P}{R}M8Start.VAL"}; + +int addAccelDecel; assign addAccelDecel to "{P}{R}AddAccelDecel.VAL"; +monitor addAccelDecel; +evflag moveModeMon; sync moveMode moveModeMon; +int moveModePrev; + /*** END: Specific to MAX_trajectoryScan.st ***/ int moveAxis[MAX_AXES]; @@ -337,3 +353,5 @@ evflag readbackMon; sync readback readbackMon; evflag nelementsMon; sync nelements nelementsMon; evflag motorMDVSMon; sync motorMDVS motorMDVSMon; + +