diff options
author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-08 16:49:16 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-08 16:49:16 +0100 |
commit | 12ebb0471719b2993c6dd49c58a5965018737320 (patch) | |
tree | 1b0b636519cf38366ea3443bcc46c5b26b609845 /src/cameras/pf.c | |
parent | c7b0d014b3a568ceb2db5d582a57cb7002face5e (diff) | |
download | uca-12ebb0471719b2993c6dd49c58a5965018737320.tar.gz uca-12ebb0471719b2993c6dd49c58a5965018737320.tar.bz2 uca-12ebb0471719b2993c6dd49c58a5965018737320.tar.xz uca-12ebb0471719b2993c6dd49c58a5965018737320.zip |
Add temperature and some bug fixes
Diffstat (limited to 'src/cameras/pf.c')
-rw-r--r-- | src/cameras/pf.c | 21 |
1 files changed, 13 insertions, 8 deletions
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); |