diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-03-24 15:35:18 +0100 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@kit.edu> | 2011-03-24 15:35:18 +0100 |
| commit | 1954f916e989b70b1b2ef516faab3ffae084563d (patch) | |
| tree | 3a45b27b24d7e72697fa5da935199cac05791215 /src/cameras | |
| parent | 922c36f1b6e7fc08abd5fc073c16cc9bad114880 (diff) | |
| download | uca-1954f916e989b70b1b2ef516faab3ffae084563d.tar.gz uca-1954f916e989b70b1b2ef516faab3ffae084563d.tar.bz2 uca-1954f916e989b70b1b2ef516faab3ffae084563d.tar.xz uca-1954f916e989b70b1b2ef516faab3ffae084563d.zip | |
Return somewhat more reliable numbers for min/max delay and exposure
Diffstat (limited to 'src/cameras')
| -rw-r--r-- | src/cameras/pco.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/cameras/pco.c b/src/cameras/pco.c index 29fb70e..b3ff872 100644 --- a/src/cameras/pco.c +++ b/src/cameras/pco.c @@ -165,31 +165,43 @@ static uint32_t uca_pco_get_property(struct uca_camera *cam, enum uca_property_i case UCA_PROP_DELAY: { uint32_t exposure; - return pco_get_delay_exposure(pco, (uint32_t *) data, &exposure); + pco_get_delay_exposure(pco, (uint32_t *) data, &exposure); } break; case UCA_PROP_DELAY_MIN: - uca_set_void(data, uint32_t, pco->description.dwMinDelayDESC); + { + uint32_t delay = pco->description.dwMinDelayDESC / 1000; + uca_set_void(data, uint32_t, delay); + } break; case UCA_PROP_DELAY_MAX: - uca_set_void(data, uint32_t, pco->description.dwMaxDelayDESC); + { + uint32_t delay = pco->description.dwMaxDelayDESC * 1000; + uca_set_void(data, uint32_t, delay); + } break; case UCA_PROP_EXPOSURE: { uint32_t delay; - return pco_get_delay_exposure(pco, &delay, (uint32_t *) data); + pco_get_delay_exposure(pco, &delay, (uint32_t *) data); } break; case UCA_PROP_EXPOSURE_MIN: - uca_set_void(data, uint32_t, pco->description.dwMinExposureDESC); + { + uint32_t exposure = pco->description.dwMinExposureDESC / 1000; + uca_set_void(data, uint32_t, exposure); + } break; case UCA_PROP_EXPOSURE_MAX: - uca_set_void(data, uint32_t, pco->description.dwMaxExposureDESC); + { + uint32_t exposure = pco->description.dwMaxExposureDESC * 1000; + uca_set_void(data, uint32_t, exposure); + } break; case UCA_PROP_BITDEPTH: |