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

Merge branch 'master' into 'initializer_for_EL734Axis'

Browse Source 
# Conflicts:
#   sinqEPICSApp/src/EL734Driver.cpp
This commit is contained in:
mathis_s
2024-09-10 09:19:06 +02:00
parent a6a8f14b26 33f118ce1e
commit 35c12274b0
6 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sinqEPICSApp/src/EL734Driver.cpp
View File

@ -262,6 +262,7 @@ EL734Axis::EL734Axis(EL734Controller *pC, int axisNo)
1 means that the axis is not moving and has no errors.
*/
oredMSR = 1;
next_poll = -1;
}
/** Reports on status of the axis

1
sinqEPICSApp/src/EuroMoveDriver.cpp
View File

@ -279,6 +279,7 @@ EuroMoveAxis::EuroMoveAxis(EuroMoveController *pC, int axisNo)
pC_(pC)
{
motNo = axisNo;
next_poll = -1;
}

8
sinqEPICSApp/src/MasterMACSDriver.cpp
View File

@ -191,13 +191,13 @@ asynStatus
startTime = DoubleTime();
status =
pasynOctetSyncIO->writeRead(pasynUserController_, mmacsData,
len - 1, mmacsResponse, 35, 10., &out,
len - 1, mmacsResponse, 35, 20., &out,
&in, &reason);
if(timeDebug) {
now = DoubleTime();
if((now - startTime) > 1.) {
errlogSevPrintf(errlogMajor, "Unusual response time %lf to command %s\n", (now - startTime), command);
errlogSevPrintf(errlogMajor, "Unusual long response time %lf to command %s\n", (now - startTime), command);
}
}
@ -399,6 +399,7 @@ pC_(pC)
int devStatus = readStatus();
setIntegerParam(pC_->enableAxis_, isOn(devStatus));
setIntegerParam(pC_->axisEnabled_, isOn(devStatus));
lastPoll = -1;
}
/** Reports on status of the axis
@ -657,6 +658,9 @@ asynStatus MasterMACSAxis::poll(bool * moving)
}
} else {
errlogPrintf("MMACS: communication problem reading axis %d position\n", axisNo_);
*moving = false;
comStatus = asynError;
goto skip;
}
// Read the overall status of this motor */

2
sinqEPICSApp/src/NanotecDriver.cpp
View File

@ -138,7 +138,7 @@ NanotecAxis::NanotecAxis(NanotecController *pC, int axisNo, int busAddress)
pC_(pC)
{
this->busAddress = busAddress;
next_poll = -1;
}

3
sinqEPICSApp/src/PhytronDriver.cpp
View File

@ -185,7 +185,7 @@ asynStatus PhytronController::transactController(int axisNo,char command[COMLEN]
SINQAxis *axis = getAxis(axisNo);
pasynOctetSyncIO->flush(pasynUserController_);
/* pasynOctetSyncIO->flush(pasynUserController_); */
memset(myCommand,0,sizeof(myCommand));
@ -249,6 +249,7 @@ PhytronAxis::PhytronAxis(PhytronController *pC, int axisNo, int enc)
}
haveBrake = 0;
brakeIO = -1;
next_poll = -1;
}
int PhytronAxis::setBrake(int brakeNO)

2
sinqEPICSApp/src/pmacAxis.cpp
View File

@ -635,7 +635,7 @@ asynStatus pmacAxis::enable(int on) {
* ======================================================*/
SeleneAxis::SeleneAxis(SeleneController *pC, int axisNo, double limitTarget)
: pmacAxis(pC, axisNo, false) {
static const char *functionName = "pmacAxis::pmacAxis";
static const char *functionName = "SeleneAxis::SeleneAxis";
pC_->debugFlow(functionName);