From e0d1031692bba3269d893892a0d8f01df4c96bec Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Mon, 6 Feb 2012 21:50:07 +0000
Subject: [PATCH] Added SDK version and Device driver version to report()
 function

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@14433 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 ADApp/andorSrc/andorCCD.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ADApp/andorSrc/andorCCD.cpp b/ADApp/andorSrc/andorCCD.cpp
index 84b6e9f..04c1c5f 100755
--- a/ADApp/andorSrc/andorCCD.cpp
+++ b/ADApp/andorSrc/andorCCD.cpp
@@ -247,6 +247,7 @@ void AndorCCD::report(FILE *fp, int details)
   float fParam1;
   int xsize, ysize;
   int i;
+  char sParam[256];
   unsigned int uIntParam1;
   unsigned int uIntParam2;
   unsigned int uIntParam3;
@@ -258,18 +259,24 @@ void AndorCCD::report(FILE *fp, int details)
   fprintf(fp, "Andor CCD port=%s\n", this->portName);
   if (details > 0) {
     try {
+      checkStatus(GetHeadModel(sParam));
+      fprintf(fp, "  Model: %s\n", sParam);
       checkStatus(GetCameraSerialNumber(&param1));
-      fprintf(fp, "  serial number: %d\n", param1); 
+      fprintf(fp, "  Serial number: %d\n", param1); 
       checkStatus(GetHardwareVersion(&uIntParam1, &uIntParam2, &uIntParam3, 
                                      &uIntParam4, &uIntParam5, &uIntParam6));
-      fprintf(fp, "  PCB Version: %d\n", uIntParam1);
-      fprintf(fp, "  Flex File Version: %d\n", uIntParam2);
-      fprintf(fp, "  Firmware Version: %d\n", uIntParam5);
-      fprintf(fp, "  Firmware Build: %d\n", uIntParam6);
+      fprintf(fp, "  PCB version: %d\n", uIntParam1);
+      fprintf(fp, "  Flex file version: %d\n", uIntParam2);
+      fprintf(fp, "  Firmware version: %d\n", uIntParam5);
+      fprintf(fp, "  Firmware build: %d\n", uIntParam6);
+      checkStatus(GetVersionInfo(AT_SDKVersion, sParam, sizeof(sParam)));
+      fprintf(fp, "  SDK version: %s\n", sParam);
+      checkStatus(GetVersionInfo(AT_DeviceDriverVersion, sParam, sizeof(sParam)));
+      fprintf(fp, "  Device driver version: %s\n", sParam);
       getIntegerParam(ADMaxSizeX, &xsize);
       getIntegerParam(ADMaxSizeY, &ysize);
-      fprintf(fp, "  xpixels: %d\n", xsize);
-      fprintf(fp, "  ypixels: %d\n", ysize);
+      fprintf(fp, "  X pixels: %d\n", xsize);
+      fprintf(fp, "  Y pixels: %d\n", ysize);
       checkStatus(GetNumberAmp(&param1));
       fprintf(fp, "  Number of amplifier channels: %d\n", param1);
       checkStatus(GetNumberADChannels(&param1));