summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2012-07-09 10:21:06 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@gmail.com>2012-07-09 11:28:23 +0200
commit5daac7ae1ad205ac434ae67ee8e23a09b2328356 (patch)
tree08e5ba62022390b4017ef3fd397be53d4061456f
parent2d96b916ff3b90356663615c59ebe1ab0992f091 (diff)
downloaduca-5daac7ae1ad205ac434ae67ee8e23a09b2328356.tar.gz
uca-5daac7ae1ad205ac434ae67ee8e23a09b2328356.tar.bz2
uca-5daac7ae1ad205ac434ae67ee8e23a09b2328356.tar.xz
uca-5daac7ae1ad205ac434ae67ee8e23a09b2328356.zip
Implement some mandatory properties
-rw-r--r--src/cameras/uca-ufo-camera.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/cameras/uca-ufo-camera.c b/src/cameras/uca-ufo-camera.c
index e61bbc5..ec7dae1 100644
--- a/src/cameras/uca-ufo-camera.c
+++ b/src/cameras/uca-ufo-camera.c
@@ -27,7 +27,7 @@
if (err != 0) { \
g_set_error(error, UCA_UFO_CAMERA_ERROR, \
err_type, \
- "Errno: %s", strerror(err)); \
+ "pcilib: %s", strerror(err)); \
return; \
}
@@ -61,6 +61,9 @@ enum {
static gint base_overrideables[] = {
PROP_SENSOR_WIDTH,
PROP_SENSOR_HEIGHT,
+ PROP_SENSOR_HORIZONTAL_BINNING,
+ PROP_SENSOR_VERTICAL_BINNING,
+ PROP_SENSOR_MAX_FRAME_RATE,
PROP_SENSOR_BITDEPTH,
PROP_EXPOSURE_TIME,
PROP_ROI_X,
@@ -238,6 +241,15 @@ static void uca_ufo_camera_get_property(GObject *object, guint property_id, GVal
case PROP_SENSOR_BITDEPTH:
g_value_set_uint(value, 10);
break;
+ case PROP_SENSOR_HORIZONTAL_BINNING:
+ g_value_set_uint(value, 1);
+ break;
+ case PROP_SENSOR_VERTICAL_BINNING:
+ g_value_set_uint(value, 1);
+ break;
+ case PROP_SENSOR_MAX_FRAME_RATE:
+ g_value_set_float(value, 340.0);
+ break;
case PROP_EXPOSURE_TIME:
{
const gdouble factor = 2.67e-6;