diff --git a/ADHamaApp/src/hama.cpp b/ADHamaApp/src/hama.cpp index dbf21b9..eb4e3ca 100644 --- a/ADHamaApp/src/hama.cpp +++ b/ADHamaApp/src/hama.cpp @@ -985,6 +985,7 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ // dcamprop_getvalue(m_hdcam, DCAM_IDPROP_, &value_d); printf("[DEBUG]::writeInit32 ADReadStatus\n"); } + //-- Sensor mode and speed else if (index == hSensorMode) { printf("[DEBUG]::writeInit32 SensorMode %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_SENSORMODE, &dvalue); @@ -998,7 +999,6 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ if(failed(m_err)) { printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } - } else if (index == hReadoutDirection) { printf("[DEBUG]::writeInit32 ReadoutDirection %d\n", value); @@ -1007,14 +1007,7 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - - else if (index == hBitPerChannel) { - printf("[DEBUG]::writeInit32 BitPerChannel %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_BITSPERCHANNEL, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } + //-- Trigger else if (index == hTriggerSource) { printf("[DEBUG]::writeInit32 TriggerSource %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_TRIGGERSOURCE, &dvalue); @@ -1071,6 +1064,8 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } + //-- sensor cooler - implemented in the temperature task + /* else if (index == hSensorCoolerStatus) { printf("[DEBUG]::writeInit32 SensorCoolerStatus %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_SENSORCOOLERSTATUS, &dvalue); @@ -1078,20 +1073,8 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - else if (index == hDefectCorrectMode) { - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_DEFECTCORRECT_MODE, &dvalue); - printf("[DEBUG]::writeInit32 DefectCorrerMode %f\n", dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hHotPixelCorrectLevel) { - printf("[DEBUG]::writeInit32 HotPixelCorrectLevel %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_HOTPIXELCORRECT_LEVEL, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } + */ + //-- binning and ROI else if (index == hBinning) { updateSensorSize(); printf("[DEBUG]::writeInit32 Binning %d\n", value); @@ -1147,6 +1130,21 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ } } */ + //-- ALU + else if (index == hDefectCorrectMode) { + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_DEFECTCORRECT_MODE, &dvalue); + printf("[DEBUG]::writeInit32 DefectCorrerMode %f\n", dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hHotPixelCorrectLevel) { + printf("[DEBUG]::writeInit32 HotPixelCorrectLevel %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_HOTPIXELCORRECT_LEVEL, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } else if (index == hExtractionMode) { printf("[DEBUG]::writeInit32 ExtractionMode %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_EXTRACTION_MODE, &dvalue); @@ -1154,6 +1152,96 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } + //-- Output trigger + else if (index == hOutputTriggerSource0) { + printf("[DEBUG]::writeInit32 OutputTriggerSource0 %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_SOURCE, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hOutputTriggerPolarity0) { + printf("[DEBUG]::writeInit32 OutputTriggerPolaroty0 %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_POLARITY, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + //else if (index == hOutputTriggerActive0) { + // printf("[DEBUG]::writeInit32 OutputTriggerActive0 %d\n", value); + // m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_ACTIVE, &dvalue); + // if(failed(m_err)) { + // printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + // } + //} + else if (index == hOutputTriggerKind0) { + printf("[DEBUG]::writeInit32 OutputTriggerKind0 %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_KIND, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hOutputTriggerPreHsyncCount) { + printf("[DEBUG]::writeInit32 OutputTriggerPreHsynCount %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_PREHSYNCCOUNT, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hOutputTriggerBaseSensor0) { + printf("[DEBUG]::writeInit32 OutputTriggerBaseSensor0 %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_BASESENSOR, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + //-- Master pulse + else if (index == hMasterPulseMode) { + printf("[DEBUG]::writeInit32 MasterPulseMode %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_MODE, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hMasterPulseTriggerSource) { + printf("[DEBUG]::writeInit32 MasterPulseTriggerSource %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_TRIGGERSOURCE, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hIntensityLutMode) { + printf("[DEBUG]::writeInit32 IntensityLutMode %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_INTENSITYLUT_MODE, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + else if (index == hMasterPulseBurstTimes) { + printf("[DEBUG]::writeInit32 MasterPulseBurstTimes %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_BURSTTIMES, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + //-- Synchronous timing - nothing to implement either is in writeFloat64 + //-- System information + else if (index == hBitPerChannel) { + printf("[DEBUG]::writeInit32 BitPerChannel %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_BITSPERCHANNEL, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + +/* + else if (index == hBufferRowbytes) { + printf("[DEBUG]::writeInit32 BufferRowBytes %d\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_BUFFER_ROWBYTES, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } else if (index == hTimingExposure) { printf("[DEBUG]::writeInit32 TimingExposure %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_TIMING_EXPOSURE, &dvalue); @@ -1196,6 +1284,7 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } + */ else if (index == hImagePixelType) { printf("[DEBUG]::writeInit32 ImagePixelType %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_IMAGE_PIXELTYPE, &dvalue); @@ -1203,13 +1292,7 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - else if (index == hBufferRowbytes) { - printf("[DEBUG]::writeInit32 BufferRowBytes %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_BUFFER_ROWBYTES, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } +/* else if (index == hBufferFramebytes) { printf("[DEBUG]::writeInit32 BufferFrameBytes %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_BUFFER_FRAMEBYTES, &dvalue); @@ -1252,86 +1335,14 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - else if (index == hNumberOfOutputTriggerConnector) { - printf("[DEBUG]::writeInit32 NumberOutputTriggerConnector %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_NUMBEROF_OUTPUTTRIGGERCONNECTOR, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerSource0) { - printf("[DEBUG]::writeInit32 OutputTriggerSource0 %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_SOURCE, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerPolarity0) { - printf("[DEBUG]::writeInit32 OutputTriggerPolaroty0 %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_POLARITY, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerActive0) { - printf("[DEBUG]::writeInit32 OutputTriggerActive0 %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_ACTIVE, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerKind0) { - printf("[DEBUG]::writeInit32 OutputTriggerKind0 %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_KIND, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerBaseSensor0) { - printf("[DEBUG]::writeInit32 OutputTriggerBaseSensor0 %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_BASESENSOR, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerPreHsyncCount) { - printf("[DEBUG]::writeInit32 OutputTriggerPreHsynCount %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_PREHSYNCCOUNT, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - - else if (index == hMasterPulseMode) { - printf("[DEBUG]::writeInit32 MasterPulseMode %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_MODE, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hMasterPulseTriggerSource) { - printf("[DEBUG]::writeInit32 MasterPulseTriggerSource %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_TRIGGERSOURCE, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hIntensityLutMode) { - printf("[DEBUG]::writeInit32 IntensityLutMode %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_INTENSITYLUT_MODE, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hMasterPulseBurstTimes) { - printf("[DEBUG]::writeInit32 MasterPulseBurstTimes %d\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_BURSTTIMES, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - - else if (index == hSystemAlive) { + //else if (index == hNumberOfOutputTriggerConnector) { + // printf("[DEBUG]::writeInit32 NumberOutputTriggerConnector %d\n", value); + // m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_NUMBEROF_OUTPUTTRIGGERCONNECTOR, &dvalue); + // if(failed(m_err)) { + // printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + // } + //} + else if (index == hSystemAlive) { printf("[DEBUG]::writeInit32 SystemAlive %d\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_SYSTEM_ALIVE, &dvalue); if(failed(m_err)) { @@ -1373,6 +1384,8 @@ asynStatus Hama::writeInt32(asynUser *pasynUser, epicsInt32 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } + */ + else{ if(index < FIRST_HAMA_PARAM){ status = ADDriver::writeInt32(pasynUser, value); @@ -1413,8 +1426,8 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){ double dvalue = value; getParamName(index, ¶mName); - - + //-- Sensor mode and speed + //-- Feature if(index == ADAcquireTime) { printf("[DEBUG]::function ADAcquireTime from camera: %f\n", value); status = (asynStatus)setFeature(DCAM_IDPROP_EXPOSURETIME, value); @@ -1423,6 +1436,7 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } + //-- Trigger else if (index == hTriggerDelay) { printf("[DEBUG]::function TriggerDelay %f\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_TRIGGERDELAY, &dvalue); @@ -1430,16 +1444,34 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - /* - else if (index == hExposureTime) { - printf("[DEBUG]::function ADImageMode %f\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_EXPOSURETIME, &dvalue); + //-- Sensor cooler - nothing + //-- Binning and ROI - nothing + //-- ALU - nothing + //-- Output trigger + else if (index == hOutputTriggerDelay0) { + printf("[DEBUG]::function OutputTriggerDelay0 %f\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_DELAY, &dvalue); if(failed(m_err)) { printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - */ - + else if (index == hOutputTriggerPeriod0) { + printf("[DEBUG]::function OutputTriggerPeriod0 %f\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_PERIOD, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + //-- Master Pulse + else if (index == hMasterPulseInterval) { + printf("[DEBUG]::function MasterPulseInterval %f\n", value); + m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_INTERVAL, &dvalue); + if(failed(m_err)) { + printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); + } + } + //-- Synchronous timing + /* else if (index == hTimingReadoutTime) { printf("[DEBUG]::function TimingReadoutTime %f\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_TIMING_READOUTTIME, &dvalue); @@ -1481,7 +1513,7 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){ if(failed(m_err)) { printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } - } + }*/ else if (index == hInternalFrameRate) { int sensorMode = 0; getIntegerParam(hSensorMode, &sensorMode); @@ -1516,27 +1548,7 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } - else if (index == hOutputTriggerDelay0) { - printf("[DEBUG]::function OutputTriggerDelay0 %f\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_DELAY, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hOutputTriggerPeriod0) { - printf("[DEBUG]::function OutputTriggerPeriod0 %f\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_OUTPUTTRIGGER_PERIOD, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } - else if (index == hMasterPulseInterval) { - printf("[DEBUG]::function MasterPulseInterval %f\n", value); - m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_MASTERPULSE_INTERVAL, &dvalue); - if(failed(m_err)) { - printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); - } - } + /* else if (index == hConversionFactorCoeff) { printf("[DEBUG]::function ConversionFactorCoeff %f\n", value); m_err = dcamprop_setgetvalue(m_hdcam, DCAM_IDPROP_CONVERSIONFACTOR_COEFF, &dvalue); @@ -1565,6 +1577,7 @@ asynStatus Hama::writeFloat64(asynUser *pasynUser, epicsFloat64 value){ printError(m_hdcam, m_err, "dcamprop_setgetvalue()", "IDPROP:0x%08x, VALUE:%f\n", index, dvalue); } } + */ else{ if(index < FIRST_HAMA_PARAM){ status = ADDriver::writeFloat64(pasynUser, value); @@ -1635,35 +1648,6 @@ return status; } //============================================================================ -/* -asynStatus Hama::readEnum(asynUser *pasynUser, char *strings[], int values[], - int severities[], size_t nElements, size_t *nIn){ - - printf("[DEBUG]::readEnum\t"); - const char* functionName = "readEnum"; - const char *paramName; - - int function = pasynUser->reason; - asynStatus status = asynSuccess; - - - getParamName(function, ¶mName); - - - double value = 0; - - *nIn = 0; - - status = (asynStatus) callParamCallbacks(); - - asynPrint(pasynUserSelf, ASYN_TRACEIO_DRIVER, - "%s:%s: entry, function=%d, string=%s\n", driverName, functionName, function, strings[0]); - -return(asynSuccess); -} -*/ -//============================================================================ - void Hama::report(FILE *fp, int details){ double dvalue = 0; fprintf(fp, "Hamamatsu Orca Flash4.0 driver\n");