lin-epics-modules/sinqepicsapp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amor-selene'

Browse Source 
Conflicts:
	.gitignore
	sinqEPICSApp/src/pmacAxis.cpp
	sinqEPICSApp/src/pmacAxis.h
	sinqEPICSApp/src/pmacController.cpp
	sinqEPICSApp/src/pmacController.h
This commit is contained in:
koennecke
2020-10-01 09:31:23 +02:00
parent d86da602d2 d1beb9b0d8
commit 6de4a878ef
11 changed files with 324 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sinqEPICSApp/src/pmacAxis.h
View File

@@ -28,7 +28,7 @@ class pmacAxis : public SINQAxis
{
public:
/* These are the methods we override from the base class */
pmacAxis(pmacController *pController, int axisNo);
pmacAxis(pmacController *pController, int axisNo, bool enable=true);
virtual ~pmacAxis();
asynStatus move(double position, int relative, double min_velocity, double max_velocity, double acceleration);
asynStatus moveVelocity(double min_velocity, double max_velocity, double acceleration);
@@ -62,6 +62,10 @@ class pmacAxis : public SINQAxis
int homing;
double statusPos;
time_t next_poll;
bool autoEnable;
friend class pmacController;
};
/*----------------------------------------------------------------------------------------------*/
@@ -83,12 +87,11 @@ class pmacHRPTAxis : public pmacAxis
/*--------------------------------------------------------------------------------------------*/
class SeleneAxis : public pmacAxis
{
public:
SeleneAxis(SeleneController *pController, int axisNo, double limitTarget);
asynStatus move(double position, int relative, double min_velocity, double max_velocity, double acceleration);
asynStatus setPosition(double position);
asynStatus home(double min_velocity, double max_velocity, double acceleration, int forwards);
public:
SeleneAxis(SeleneController *pController, int axisNo, double limitTarget);
asynStatus move(double position, int relative, double min_velocity, double max_velocity, double acceleration);
asynStatus setPosition(double position);
asynStatus home(double min_velocity, double max_velocity, double acceleration, int forwards);
protected:
friend class SeleneController;
@@ -112,6 +115,10 @@ class SeleneAxis : public pmacAxis
Mark Koennecke, February 2020
The axis should not be enabled automatically
Michele Brambilla, February 2020
*/
class LiftAxis : public pmacAxis
{