lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Ensemble no longer uses outBitNum, and never did use inBitNum.

Browse Source 
Ensemble doesn't use motorCurrent*Raw, or motorMinSpeed, or motorMaxSpeed.
Added pulseMode, pulsePositions, numPulsePositions.
Defined MAX_PSO_PULSES per email from Aerotech.
This commit is contained in:
timmmooney
2014-05-02 18:36:46 +00:00
parent b5ac1b7d3d
commit 79a5016a7d
1 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/AerotechSrc/EnsembleTrajectoryScan.h
+24 -44
View File
@@ -88,28 +88,15 @@ monitor timeTrajectory;
string trajectoryFile; assign trajectoryFile to "{P}{R}TrajectoryFile.VAL";
monitor trajectoryFile;
/*** BEGIN: Specific to MAX_trajectoryScan.st ***/
/*** BEGIN: Specific to EnsembleTrajectoryScan.st ***/
/* time since trajectory start */
double elapsedTime; assign elapsedTime to "{P}{R}ElapsedTime.VAL";
/* Number (0..15) of general purpose I/O bit to be used for output pulses (e.g., to trigger detector). */
int outBitNum; assign outBitNum to "{P}{R}OutBitNum.VAL";
monitor outBitNum;
/* Number (0..15) of general purpose I/O bit to be used for input start-trajectory pulse. */
int inBitNum; assign inBitNum to "{P}{R}InBitNum.VAL";
monitor inBitNum;
/* time in seconds from trajectory start */
double realTimeTrajectory[MAX_ELEMENTS];
assign realTimeTrajectory to "{P}{R}realTimeTrajectory.VAL";
/* raw values read from the controller, generally while a trajectory is executing */
int motorCurrentRaw[MAX_AXES];
int motorCurrentVRaw[MAX_AXES];
int motorCurrentARaw[MAX_AXES];
/* EPICS motor record resolution */
double epicsMotorMres[MAX_AXES];
assign epicsMotorMres to {"","","","","","","",""};
@@ -128,32 +115,6 @@ double epicsMotorLLM[MAX_AXES];
assign epicsMotorLLM to {"","","","","","","",""};
monitor epicsMotorLLM;
double motorMinSpeed[MAX_AXES];
assign motorMinSpeed to
{"{P}{R}M1MinSpeed.VAL",
"{P}{R}M2MinSpeed.VAL",
"{P}{R}M3MinSpeed.VAL",
"{P}{R}M4MinSpeed.VAL",
"{P}{R}M5MinSpeed.VAL",
"{P}{R}M6MinSpeed.VAL",
"{P}{R}M7MinSpeed.VAL",
"{P}{R}M8MinSpeed.VAL"};
double motorMaxSpeed[MAX_AXES];
assign motorMaxSpeed to
{"{P}{R}M1MaxSpeed.VAL",
"{P}{R}M2MaxSpeed.VAL",
"{P}{R}M3MaxSpeed.VAL",
"{P}{R}M4MaxSpeed.VAL",
"{P}{R}M5MaxSpeed.VAL",
"{P}{R}M6MaxSpeed.VAL",
"{P}{R}M7MaxSpeed.VAL",
"{P}{R}M8MaxSpeed.VAL"};
/*** END: Specific to MAX_trajectoryScan.st ***/
/*** BEGIN: Specific to MAX_trajectoryScan.st and EnsembleTrajectoryScan.st ***/
double motorStart[MAX_AXES];
assign motorStart to
{"{P}{R}M1Start.VAL",
@@ -165,10 +126,6 @@ assign motorStart to
"{P}{R}M7Start.VAL",
"{P}{R}M8Start.VAL"};
/*** END: Specific to MAX_trajectoryScan.st and EnsembleTrajectoryScan.st ***/
/*** BEGIN: Specific to EnsembleTrajectoryScan.st ***/
int pulseDir;
assign pulseDir to "{P}{R}PulseDir";
monitor pulseDir;
@@ -181,6 +138,29 @@ int pulseSrc;
assign pulseSrc to "{P}{R}PulseSrc";
monitor pulseSrc;
/* Pulse modes */
#define PULSE_MODE_FIXED 0
#define PULSE_MODE_ARRAY 1
#define PULSE_MODE_TRAJPTS 2
#define PULSE_MODE_NONE 3
#define MAX_PSO_PULSES 8192
double pulsePositions[MAX_PULSES];
assign pulsePositions to "{P}{R}PulsePositions";
monitor pulsePositions;
evflag pulsePositionsMon; sync pulsePositions pulsePositionsMon;
int numPulsePositions; assign numPulsePositions to "{P}{R}PulsePositions.NORD";
monitor numPulsePositions;
#define PULSE_POSITIONS_LOADED_NONE 0
#define PULSE_POSITIONS_LOADED_ARRAY 1
#define PULSE_POSITIONS_LOADED_TRAJ 1
int pulseMode; assign pulseMode to "{P}{R}PulseMode.VAL";
monitor pulseMode;
/*** END: Specific to EnsembleTrajectoryScan.st ***/
int moveAxis[MAX_AXES];