Commit 735dd0a8 authored by kpetersn's avatar kpetersn
Browse files

Removed the commented-out code that is no longer needed now that there is a poller thread.

parent 98614910
......@@ -263,12 +263,7 @@ asynStatus Linkam::readFloat64(asynUser *pasynUser, epicsFloat64 *value)
"%s:%s, port %s, function = %d\n",
driverName, functionName, this->portName, function);
/* if (function == temperatureInValue_) {
// Read the temperature from the controller (Celsius)
status = readTemperature(value);
} else */ if (function == rampLimitInValue_) {
if (function == rampLimitInValue_) {
// Read the ramp limit from the controller (Celsius)
status = readRampLimit(value);
......@@ -278,27 +273,12 @@ asynStatus Linkam::readFloat64(asynUser *pasynUser, epicsFloat64 *value)
// Read the ramp rate from the controller (C/min)
status = readRampRate(value);
} /* else if (function == heaterPowerInValue_) {
// Read the temperature from the controller (Watts)
status = readHeaterPower(value);
} else if (function == lnpSpeedInValue_) {
// Read the LN Pump speed from the controller (0-100%)
status = readLnpSpeed(value);
} */ else if (function == vacuumLimitInValue_) {
} else if (function == vacuumLimitInValue_) {
// Read the vacuum limit from the controller (mBar)
status = readVacuumLimit(value);
} /* else if (function == pressureInValue_) {
// Read the vacuum pressure from the controller (mBar)
status = readPressure(value);
} */ else {
} else {
status = asynPortDriver::readFloat64(pasynUser,value);
}
......@@ -310,24 +290,6 @@ asynStatus Linkam::readFloat64(asynUser *pasynUser, epicsFloat64 *value)
return (status==0) ? asynSuccess : asynError;
}
/*asynStatus Linkam::readTemperature(epicsFloat64 *value)
{
static const char *functionName = "readTemperature";
this->lock();
*value = GetValue(u32Heater1TempR);
this->unlock();
// There probably isn't a good reason to retain the temperature in a private variable;
// The value is already stored in the parameter library
temperatureRbv_ = *value;
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %lf\n",
driverName, functionName, this->portName, *value);
return asynSuccess;
}*/
asynStatus Linkam::readRampLimit(epicsFloat64 *value)
{
static const char *functionName = "readRampLimit";
......@@ -358,36 +320,6 @@ asynStatus Linkam::readRampRate(epicsFloat64 *value)
return asynSuccess;
}
/*asynStatus Linkam::readHeaterPower(epicsFloat64 *value)
{
static const char *functionName = "readHeaterPower";
this->lock();
*value = GetValue(u32Heater1PowerR);
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %lf\n",
driverName, functionName, this->portName, *value);
return asynSuccess;
}*/
/*asynStatus Linkam::readLnpSpeed(epicsFloat64 *value)
{
static const char *functionName = "readLnpSpeed";
this->lock();
*value = GetValue(u32Heater1LnpSpeedR);
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %lf\n",
driverName, functionName, this->portName, *value);
return asynSuccess;
}*/
asynStatus Linkam::readVacuumLimit(epicsFloat64 *value)
{
static const char *functionName = "readVacuumLimit";
......@@ -403,20 +335,6 @@ asynStatus Linkam::readVacuumLimit(epicsFloat64 *value)
return asynSuccess;
}
/*asynStatus Linkam::readPressure(epicsFloat64 *value)
{
static const char *functionName = "readPressure";
this->lock();
*value = GetValue(u32VacuumR);
this->unlock();
asynPrint(this->pasynUserSelf, ASYN_TRACEIO_DRIVER,
"%s:%s, port %s, value = %lf\n",
driverName, functionName, this->portName, *value);
return asynSuccess;
}*/
/*
*
......
......@@ -125,22 +125,18 @@ protected:
private:
//
asynStatus readTemperature(epicsFloat64 *value);
asynStatus readRampLimit(epicsFloat64 *value);
asynStatus readRampRate(epicsFloat64 *value);
asynStatus setRampLimit(epicsFloat64 value);
asynStatus setRampRate(epicsFloat64 value);
asynStatus readHeaterPower(epicsFloat64 *value);
asynStatus setHeating(epicsInt32 value);
//
asynStatus setLnpMode(epicsInt32 value);
asynStatus setLnpSpeed(epicsInt32 value);
asynStatus readLnpSpeed(epicsFloat64 *value);
//
asynStatus setVacuum(epicsInt32 value);
asynStatus setVacuumLimit(epicsFloat64 value);
asynStatus readVacuumLimit(epicsFloat64 *value);
asynStatus readPressure(epicsFloat64 *value);
//
asynStatus readControllerConfig();
asynStatus readControllerError();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment