Add temperature and some bug fixes

2 files changed, 56 insertions, 15 deletions

diff --git a/src/cameras/pco.c b/src/cameras/pco.c
index ff2daff..b84ee01 100644
--- a/src/cameras/pco.c
+++ b/src/cameras/pco.c
@@ -12,7 +12,7 @@
 
 #define GET_PCO(uca) ((struct pco_edge_t *)(uca->user))
 
-#define set_void(p, type, value) { *((type *) p) = value; }
+#define set_void(p, type, value) { *((type *) p) = (type) value; }
 
 
 static uint32_t uca_pco_set_bitdepth(struct uca_camera_t *cam, uint8_t *bitdepth)
@@ -105,8 +105,30 @@ static uint32_t uca_pco_get_property(struct uca_camera_t *cam, enum uca_property
             {
                 /* FIXME: how to ensure, that buffer is large enough? */
                 SC2_Camera_Name_Response name;
-                if (pco_read_property(pco, GET_CAMERA_NAME, &name, sizeof(name)) == PCO_NOERROR)
-                    strcpy((char *) data, name.szName);
+
+                /* FIXME: This is _not_ a mistake. For some reason (which I
+                 * still have to figure out), it is sometimes not possible to
+                 * read the camera name... unless the same call precedes that
+                 * one.*/
+                pco_read_property(pco, GET_CAMERA_NAME, &name, sizeof(name));
+                pco_read_property(pco, GET_CAMERA_NAME, &name, sizeof(name));
+                strcpy((char *) data, name.szName);
+            }
+            break;
+
+        case UCA_PROP_TEMPERATURE_SENSOR:
+            {
+                SC2_Temperature_Response temperature;
+                if (pco_read_property(pco, GET_TEMPERATURE, &temperature, sizeof(temperature)) == PCO_NOERROR)
+                    set_void(data, uint32_t, temperature.sCCDtemp / 10);
+            }
+            break;
+
+        case UCA_PROP_TEMPERATURE_CAMERA:
+            {
+                SC2_Temperature_Response temperature;
+                if (pco_read_property(pco, GET_TEMPERATURE, &temperature, sizeof(temperature)) == PCO_NOERROR)
+                    set_void(data, uint32_t, temperature.sCamtemp);
             }
             break;
 
@@ -144,6 +166,14 @@ static uint32_t uca_pco_get_property(struct uca_camera_t *cam, enum uca_property
                 return UCA_ERR_PROP_GENERAL;
             break;
 
+        case UCA_PROP_DELAY:
+            {
+                uint32_t exposure;
+                if (pco_get_delay_exposure(pco, (uint32_t *) data, &exposure) != PCO_NOERROR)
+                    return UCA_ERR_PROP_INVALID;
+            }
+            break;
+
         case UCA_PROP_DELAY_MIN:
             set_void(data, uint32_t, pco->description.dwMinDelayDESC);
             break;
@@ -152,6 +182,14 @@ static uint32_t uca_pco_get_property(struct uca_camera_t *cam, enum uca_property
             set_void(data, uint32_t, pco->description.dwMaxDelayDESC);
             break;
 
+        case UCA_PROP_EXPOSURE:
+            {
+                uint32_t delay;
+                if (pco_get_delay_exposure(pco, &delay, (uint32_t *) data) != PCO_NOERROR)
+                    return UCA_ERR_PROP_INVALID;
+            }
+            break;
+
         case UCA_PROP_EXPOSURE_MIN:
             set_void(data, uint32_t, pco->description.dwMinExposureDESC);
             break;
@@ -161,7 +199,7 @@ static uint32_t uca_pco_get_property(struct uca_camera_t *cam, enum uca_property
             break;
 
         case UCA_PROP_BITDEPTH:
-            set_void(data, uint8_t, 16);
+            set_void(data, uint32_t, 16);
             break;
 
         default:
@@ -224,14 +262,12 @@ uint32_t uca_pco_init(struct uca_camera_t **cam, struct uca_grabber_t *grabber)
     uca->grab = &uca_pco_grab;
 
     /* Prepare camera for recording */
+    pco_set_scan_mode(pco, PCO_SCANMODE_SLOW);
     pco_set_rec_state(pco, 0);
     pco_set_timestamp_mode(pco, 2);
     pco_set_timebase(pco, 1, 1); 
     pco_arm_camera(pco);
 
-    if (pco->transfer.DataFormat != (SCCMOS_FORMAT_TOP_CENTER_BOTTOM_CENTER | PCO_CL_DATAFORMAT_5x16))
-        pco->transfer.DataFormat = SCCMOS_FORMAT_TOP_CENTER_BOTTOM_CENTER | PCO_CL_DATAFORMAT_5x16;
-
     /* Prepare frame grabber for recording */
     int val = FG_CL_8BIT_FULL_10;
     grabber->set_property(grabber, FG_CAMERA_LINK_CAMTYP, &val);
diff --git a/src/cameras/pf.c b/src/cameras/pf.c
index 92ffa5d..bd9cd49 100644
--- a/src/cameras/pf.c
+++ b/src/cameras/pf.c
@@ -45,18 +45,16 @@ static struct uca_pf_map uca_to_pf[] = {
     { UCA_PROP_Y_OFFSET_MIN,"Window.Y.Min" },
     { UCA_PROP_Y_OFFSET_MAX,"Window.Y.Max" },
     { UCA_PROP_EXPOSURE,    "ExposureTime" },
-    { UCA_PROP_EXPOSURE_MIN, "ExposureTime.Min" },
-    { UCA_PROP_EXPOSURE_MAX, "ExposureTime.Max" },
+    { UCA_PROP_EXPOSURE_MIN,"ExposureTime.Min" },
+    { UCA_PROP_EXPOSURE_MAX,"ExposureTime.Max" },
+    { UCA_PROP_DELAY,       "Trigger.Delay" },
+    { UCA_PROP_DELAY_MIN,   "Trigger.Delay.Min" },
+    { UCA_PROP_DELAY_MAX,   "Trigger.Delay.Max" },
     { UCA_PROP_FRAMERATE,   "FrameRate" },
+    { UCA_PROP_TRIGGER_MODE,"Trigger.Source" },
     { -1, NULL }
 };
 
-static uint32_t uca_pf_set_bitdepth(struct uca_camera_t *cam, uint8_t *bitdepth)
-{
-    /* TODO: it's not possible via CameraLink so do it via frame grabber */
-    return 0;
-}
-
 static uint32_t uca_pf_acquire_image(struct uca_camera_t *cam, void *buffer)
 {
     return UCA_NO_ERROR;
@@ -67,6 +65,8 @@ static uint32_t uca_pf_set_property(struct uca_camera_t *cam, enum uca_property_
     struct uca_grabber_t *grabber = cam->grabber;
     TOKEN t = INVALID_TOKEN;
     int i = 0;
+
+    /* Find a valid pf token for the property */
     while (uca_to_pf[i].uca_prop != -1) {
         if (uca_to_pf[i].uca_prop == property)
             t = pfProperty_ParseName(0, uca_to_pf[i].pf_prop);
@@ -156,12 +156,17 @@ static uint32_t uca_pf_get_property(struct uca_camera_t *cam, enum uca_property_
                         strcpy((char *) data, value.value.p);
                     }
                     break;
+
+                case PF_MODE:
+                    set_void(data, uint32_t, (uint32_t) value.value.i);
+                    break;
             }
             return UCA_NO_ERROR;
         }
         i++;
     }
 
+    /* Handle all special cases */
     switch (property) {
         case UCA_PROP_BITDEPTH:
             set_void(data, uint8_t, 8);