lin-epics-modules/ADAndor
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed problems with asynPrint formats

Browse Source 
git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@15799 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
This commit is contained in:
rivers
2012-12-21 23:09:03 +00:00
parent fca2cbffd8
commit 3186daf754
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADApp/andorSrc/andorCCD.cpp
+5 -5
View File
@@ -1226,8 +1226,8 @@ void AndorCCD::dataTask(void)
status = GetNumberNewImages(&firstImage, &lastImage);
if (status != DRV_SUCCESS) continue;
asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW,
"%s:%s:, firstImage=%d, lastImage=%d\n",
driverName, functionName, firstImage, lastImage);
"%s:%s:, firstImage=%ld, lastImage=%ld\n",
driverName, functionName, (long)firstImage, (long)lastImage);
for (i=firstImage; i<=lastImage; i++) {
// Update counters
getIntegerParam(NDArrayCounter, &imageCounter);
@@ -1247,8 +1247,8 @@ void AndorCCD::dataTask(void)
// Is there still an image available?
status = GetNumberNewImages(&firstImage, &lastImage);
asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW,
"%s:%s:, GetNumberNewImages, status=%d, firstImage=%d, lastImage=%d\n",
driverName, functionName, status, firstImage, lastImage);
"%s:%s:, GetNumberNewImages, status=%d, firstImage=%ld, lastImage=%ld\n",
driverName, functionName, status, (long)firstImage, (long)lastImage);
if (dataType == NDUInt32) {
asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW,
"%s:%s:, GetImages(%d, %d, %p, %d, %p, %p)\n",
@@ -1259,7 +1259,7 @@ void AndorCCD::dataTask(void)
}
else if (dataType == NDUInt16) {
asynPrint(this->pasynUserSelf, ASYN_TRACE_FLOW,
"%s:%s:, GetImages16(%d, %d, %p, %d, &p, &p)\n",
"%s:%s:, GetImages16(%d, %d, %p, %d, %p, %p)\n",
driverName, functionName, i, i, pArray->pData, sizeX*sizeY, &validFirst, &validLast);
checkStatus(GetImages16(i, i, (epicsUInt16*)pArray->pData,
sizeX*sizeY, &validFirst, &validLast));