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

VxWorks 5.5.2 DOES support iostream. Backing out -r 13350 changes.

Browse Source
This commit is contained in:
Ron Sluiter
2011-08-30 17:57:09 +00:00
parent 86abfdcb63
commit dfb4d7530d
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/asynMotorAxis.cpp
+5 -1
View File
@@ -8,6 +8,10 @@
#include <stdlib.h>
#include <string.h>
#include <iostream>
using std::endl;
using std::cout;
#include <epicsThread.h>
#include <asynPortDriver.h>
@@ -125,7 +129,7 @@ asynStatus asynMotorAxis::poll(bool *moving)
*/
asynStatus asynMotorAxis::doMoveToHome()
{
asynPrint(pasynUser_, ASYN_TRACEIO_DRIVER, "Dummy implementation of asynMotorAxis::doMoveToHome. Axis: %d\n", pC_->moveToHomeAxis_);
cout << "Dummy implementation of asynMotorAxis::doMoveToHome. Axis: " << pC_->moveToHomeAxis_ << endl;
return asynError;
}
motorApp/MotorSrc/asynMotorController.cpp
+7 -4
View File
@@ -8,10 +8,13 @@
#include <stdlib.h>
#include <string.h>
#include <iostream>
using std::endl;
using std::cout;
#include <epicsThread.h>
#include <epicsExport.h>
#include <iocsh.h>
#include <errlog.h>
#include <asynPortDriver.h>
#define epicsExportSharedSymbols
@@ -671,18 +674,18 @@ asynStatus asynMotorEnableMoveToHome(const char *portName, int axis, int distanc
pC = (asynMotorController*) findAsynPortDriver(portName);
if (!pC) {
errlogPrintf("%s:%s:: Error port %s not found\n", driverName, functionName, portName);
cout << driverName << "::" << functionName << " Error port " << portName << " not found." << endl;
return asynError;
}
pA = pC->getAxis(axis);
if (!pA) {
errlogPrintf("%s:%s:: Error axis %d not found\n", driverName, functionName, axis);
cout << driverName << "::" << functionName << " Error axis " << axis << " not found." << endl;
return asynError;
}
if (distance<=0) {
errlogPrintf("Error in asynMotorEnableMoveToHome. distance must be positive integer.\n");
cout << "Error in asynMotorEnableMoveToHome. distance must be positive integer." << endl;
} else {
pA->setReferencingModeMove(distance);
}