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

Committing the last status of selene work in the corona lockdown.

Browse Source 
The problem is in the MCU, probably
This commit is contained in:
koennecke
2020-03-18 15:53:44 +01:00
parent a25f8cabb9
commit f56ef2c74c
6 changed files with 277 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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;
};
@@ -84,7 +88,7 @@ class SeleneAxis : public pmacAxis
{
public:
SeleneAxis(SeleneController *pController, int axisNo, double limitTarget) : pmacAxis((pmacController *)pController,axisNo)
SeleneAxis(SeleneController *pController, int axisNo, double limitTarget) : pmacAxis((pmacController *)pController, axisNo, false)
{
this->limitTarget = limitTarget;
};
@@ -113,11 +117,15 @@ class SeleneAxis : public pmacAxis
Mark Koennecke, February 2020
The axis should not be enabled automatically
Michele Brambilla, February 2020
*/
class LiftAxis : public pmacAxis
{
public:
LiftAxis(pmacController *pController, int axisNo) : pmacAxis((pmacController *)pController,axisNo) {};
LiftAxis(pmacController *pController, int axisNo) : pmacAxis((pmacController *)pController,axisNo,false) {};
asynStatus move(double position, int relative, double min_velocity, double max_velocity, double acceleration);
asynStatus poll(bool *moving);
asynStatus stop(double acceleration);