- Fixed reference run for Phytron
- Added brake handling to phytron - Added code to set speed for phytron - Removed scaling on Selene pmac limits - Removed enabling on Selene pmac axis
This commit is contained in:
@@ -64,7 +64,7 @@ class pmacAxis : public SINQAxis
|
||||
|
||||
friend class pmacController;
|
||||
};
|
||||
|
||||
/*----------------------------------------------------------------------------------------------*/
|
||||
class pmacHRPTAxis : public pmacAxis
|
||||
{
|
||||
public:
|
||||
@@ -80,14 +80,12 @@ class pmacHRPTAxis : public pmacAxis
|
||||
|
||||
};
|
||||
|
||||
/*--------------------------------------------------------------------------------------------*/
|
||||
class SeleneAxis : public pmacAxis
|
||||
{
|
||||
|
||||
public:
|
||||
SeleneAxis(SeleneController *pController, int axisNo, double limitTarget) : pmacAxis((pmacController *)pController,axisNo)
|
||||
{
|
||||
this->limitTarget = limitTarget;
|
||||
};
|
||||
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);
|
||||
@@ -98,6 +96,7 @@ class SeleneAxis : public pmacAxis
|
||||
|
||||
private:
|
||||
double limitTarget;
|
||||
asynStatus getSeleneAxisInitialStatus(void);
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user