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

Apply dbformat on template file, and add DESC field

Browse Source
This commit is contained in:
Douglas Araujo
2024-09-16 16:31:27 +02:00
parent 343a17ae9f
commit 7aacd3e881
3 changed files with 1070 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADOrcaApp/Db/orca.template
+1069 -1324
View File
File diff suppressed because it is too large Load Diff
ADOrcaApp/src/orca.cpp
+1 -23
View File
@@ -225,14 +225,6 @@ void Orca::createAsynParams() {
createParam(hConversionFactorOffsetString, asynParamFloat64,
&hConversionFactorOffset);
createParam(hNumberOfViewString, asynParamInt32, &hNumberOfView);
createParam(hImageDetectorPixelWidthString, asynParamFloat64,
&hImageDetectorPixelWidth);
createParam(hImageDetectorPixelHeightString, asynParamFloat64,
&hImageDetectorPixelHeight);
createParam(hImageDetectorPixelNumHorzString, asynParamInt32,
&hImageDetectorPixelNumHorz);
createParam(hImageDetectorPixelNumVertString, asynParamInt32,
&hImageDetectorPixelNumVert);
createParam(hTimeStampProducerString, asynParamInt32, &hTimeStampProducer);
createParam(hFrameStampProducerString, asynParamInt32, &hFrameStampProducer);
@@ -334,7 +326,6 @@ int Orca::initCamera() {
return err;
}
//============================================================================
int Orca::readParameterStr(int propertyID) {
const char* functionName = "readParameterStr";
asynStatus status = asynSuccess;
@@ -398,7 +389,6 @@ int Orca::readParameterStr(int propertyID) {
return status;
}
//============================================================================
int Orca::readParameter(int propertyID, bool processPV) {
const char* functionName = "readParameter";
asynStatus status = asynSuccess;
@@ -826,7 +816,6 @@ int Orca::readParameter(int propertyID, bool processPV) {
return status;
}
//============================================================================
void Orca::imageTask() {
const char* functionName = "imageTask";
int status;
@@ -1030,7 +1019,7 @@ void Orca::imageTask() {
callParamCallbacks();
}
}
//============================================================================
void Orca::temperatureTask() {
static const char* functionName = "tempTask";
double dvalue = 0;
@@ -1055,7 +1044,6 @@ void Orca::temperatureTask() {
}
}
//============================================================================
asynStatus Orca::writeInt32(asynUser* pasynUser, epicsInt32 value) {
int status = asynSuccess;
const char* functionName = "writeInt32";
@@ -1559,7 +1547,6 @@ void Orca::report(FILE* fp, int details) {
ADDriver::report(fp, details);
}
//============================================================================
int Orca::connectCamera(void) {
static const char* functionName = "connectCamera";
int nDevices = 0;
@@ -1616,7 +1603,6 @@ int Orca::allocateBuffers(unsigned int nBuffers) {
return asynSuccess;
}
//============================================================================
int Orca::freeBuffers() {
static const char* functionName = "freeBuffers";
m_err = dcambuf_release(m_hdcam);
@@ -1624,7 +1610,6 @@ int Orca::freeBuffers() {
return 0;
}
//============================================================================
asynStatus Orca::stopAcquire(void) {
static const char* functionName = "stopAcquire";
asynStatus status = asynSuccess;
@@ -1638,7 +1623,6 @@ asynStatus Orca::stopAcquire(void) {
return status;
}
//============================================================================
asynStatus Orca::startAcquire(void) {
asynStatus status = asynSuccess;
static const char* functionName = "startAcquire";
@@ -1658,7 +1642,6 @@ asynStatus Orca::startAcquire(void) {
return status;
}
//============================================================================
inline void* memcpy_s(void* dst, size_t dstsize, const void* src,
size_t srclen) {
if (dstsize < srclen)
@@ -1667,7 +1650,6 @@ inline void* memcpy_s(void* dst, size_t dstsize, const void* src,
return memcpy(dst, src, srclen);
}
//============================================================================
asynStatus Orca::accessCapturedImage(HDCAM hdcam, int32 iFrame, void* buf,
int32 rowbytes, int32 cx, int32 cy,
epicsUInt32& ts_sec,
@@ -1711,8 +1693,6 @@ asynStatus Orca::accessCapturedImage(HDCAM hdcam, int32 iFrame, void* buf,
return asynSuccess;
}
//========================================================================================================
void Orca::getImageInformation(HDCAM hdcam, int32& pixeltype, int32& width,
int32& rowbytes, int32& height,
int32& framebytes) {
@@ -1730,7 +1710,6 @@ void Orca::getImageInformation(HDCAM hdcam, int32& pixeltype, int32& width,
framebytes = (int32)propertyValue;
}
//============================================================================
asynStatus Orca::imageTransferStatus(HDCAM hdcam,
DCAMCAP_TRANSFERINFO& captransferinfo) {
DCAMERR err;
@@ -1796,7 +1775,6 @@ extern "C" int OrcaConfig(const char* portName, int maxBuffers,
return (asynSuccess);
}
//============================================================================
static const iocshArg OrcaConfigArg0 = {"Port name", iocshArgString};
static const iocshArg OrcaConfigArg1 = {"maxBuffers", iocshArgInt};
static const iocshArg OrcaConfigArg2 = {"maxMemory", iocshArgInt};
ADOrcaApp/src/orca.h
-15
View File
@@ -54,8 +54,6 @@
#define hSubarrayVPosString "H_SUBARRAY_VPOS" /* asynInt32 rw */
#define hSubarrayVSizeString "H_SUBARRAY_VSIZE" /* asynInt32 rw */
#define hSubarrayModeString "H_SUBARRAY_MODE" /* asynInt32 rw */
// #define hFrameBundleMode (usb3 only not implemented)
// #define hFrameBundleNumber (usb3 only not implemented)
// ALU
#define hDefectCorrectModeString "H_DEFECTCORRECT_MODE" /* asynInt32 rw */
@@ -142,10 +140,6 @@
// System information
#define hColorTypeString "H_COLOR_TYPE" /* asynInt32 ro */
#define hBitPerChannelString "H_BIT_PER_CHANNEL" /* asynInt32 rw */
//#define hImageWidthString "H_IMAGE_WIDTH"
///* asynInt32 ro */
//#define hImageHeightString "H_IMAGE_HEIGHT"
///* asynInt32 ro */
#define hImageRowBytesString "H_IMAGE_ROWBYTES" /* asynInt32 ro */
#define hImageFrameBytesString "H_IMAGE_FRAMEBYTES" /* asynInt32 ro */
#define hImageTopOffsetBytesString \
@@ -169,14 +163,6 @@
#define hConversionFactorOffsetString \
"H_CONVERSIONFACTOR_OFFSET" /* asynFloat64 ro */
#define hNumberOfViewString "H_NUMBER_OF_VIEW" /* asynInt32 ro */
#define hImageDetectorPixelWidthString \
"H_IMAGE_DETECTOR_PIXEL_WIDTH" /* asynFloat64 ro */
#define hImageDetectorPixelHeightString \
"H_IMAGE_DETECTOR_PIXEL_HEIGHT" /* asynFloat64 ro */
#define hImageDetectorPixelNumHorzString \
"H_IMAGE_DETECTOR_PIXEL_NUM_HORZ" /* asynInt32 ro */
#define hImageDetectorPixelNumVertString \
"H_IMAGE_DETECTOR_PIXEL_NUM_VERT" /* asynInt32 ro */
#define hTimeStampProducerString "H_TIMESTAMP_PRODUCER" /* asynInt32 ro */
#define hFrameStampProducerString "H_FRAMESTAMP_PRODUCER" /* asynInt32 ro */
#define evrTimeStampString "EVR_TIMESTAMP"
@@ -332,7 +318,6 @@ class epicsShareClass Orca : public ADDriver {
DCAMAPI_INIT m_apiInit;
DCAMDEV_OPEN m_devOpen;
DCAMERR m_err;
// handle used to wait for events sent from the device
HDCAMWAIT hwait;
int stopThread;