summaryrefslogtreecommitdiffstats
path: root/src/uca.c
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-08 16:49:16 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-03-08 16:49:16 +0100
commit12ebb0471719b2993c6dd49c58a5965018737320 (patch)
tree1b0b636519cf38366ea3443bcc46c5b26b609845 /src/uca.c
parentc7b0d014b3a568ceb2db5d582a57cb7002face5e (diff)
downloaduca-12ebb0471719b2993c6dd49c58a5965018737320.tar.gz
uca-12ebb0471719b2993c6dd49c58a5965018737320.tar.bz2
uca-12ebb0471719b2993c6dd49c58a5965018737320.tar.xz
uca-12ebb0471719b2993c6dd49c58a5965018737320.zip
Add temperature and some bug fixes
Diffstat (limited to 'src/uca.c')
-rw-r--r--src/uca.c62
1 files changed, 33 insertions, 29 deletions
diff --git a/src/uca.c b/src/uca.c
index 24c8461..8b33d08 100644
--- a/src/uca.c
+++ b/src/uca.c
@@ -33,39 +33,43 @@ const char *uca_unit_map[] = {
"ms",
"s",
"rows",
- "fps"
+ "fps",
+ "°C",
""
};
static struct uca_property_t property_map[UCA_PROP_LAST+1] = {
- { "general.name", uca_na, uca_string, uca_read },
- { "image.width", uca_pixel, uca_uint32t, uca_readwrite },
- { "image.width.min", uca_pixel, uca_uint32t, uca_read },
- { "image.width.max", uca_pixel, uca_uint32t, uca_read },
- { "image.height", uca_pixel, uca_uint32t, uca_readwrite },
- { "image.height.min", uca_pixel, uca_uint32t, uca_read },
- { "image.height.max", uca_pixel, uca_uint32t, uca_read },
- { "image.offset.x", uca_pixel, uca_uint32t, uca_readwrite },
- { "image.offset.x.min", uca_pixel, uca_uint32t, uca_read },
- { "image.offset.x.max", uca_pixel, uca_uint32t, uca_read },
- { "image.offset.y", uca_pixel, uca_uint32t, uca_readwrite },
- { "image.offset.y.min", uca_pixel, uca_uint32t, uca_read },
- { "image.offset.y.max", uca_pixel, uca_uint32t, uca_read },
- { "image.bitdepth", uca_bits, uca_uint8t, uca_read},
- { "time.exposure", uca_us, uca_uint32t, uca_readwrite },
- { "time.exposure.min", uca_ns, uca_uint32t, uca_read },
- { "time.exposure.max", uca_ms, uca_uint32t, uca_read },
- { "time.delay", uca_us, uca_uint32t, uca_readwrite },
- { "time.delay.min", uca_ns, uca_uint32t, uca_read },
- { "time.delay.max", uca_ms, uca_uint32t, uca_read },
- { "time.framerate", uca_fps, uca_uint32t, uca_read },
- { "mode.trigger", uca_na, uca_uint32t, uca_readwrite },
- { "mode.timestamp", uca_na, uca_uint32t, uca_readwrite },
- { "mode.scan", uca_na, uca_uint32t, uca_readwrite },
- { "ipe.interlace.samplerate", uca_na, uca_uint32t, uca_readwrite },
- { "ipe.interlace.threshold.pixel", uca_na, uca_uint32t, uca_readwrite },
- { "ipe.interlace.threshold.row", uca_na, uca_uint32t, uca_readwrite },
- { "mode.correction", uca_na, uca_uint32t, uca_readwrite },
+ { "General.Name", uca_na, uca_string, uca_read },
+ { "Image.Width", uca_pixel, uca_uint32t, uca_readwrite },
+ { "Image.Width.Min", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Width.Max", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Height", uca_pixel, uca_uint32t, uca_readwrite },
+ { "Image.Height.Min", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Height.Max", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Offset.x", uca_pixel, uca_uint32t, uca_readwrite },
+ { "Image.Offset.x.Min", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Offset.x.Max", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Offset.y", uca_pixel, uca_uint32t, uca_readwrite },
+ { "Image.Offset.y.Min", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Offset.y.Max", uca_pixel, uca_uint32t, uca_read },
+ { "Image.Bitdepth", uca_bits, uca_uint32t, uca_read},
+ { "Time.Exposure", uca_us, uca_uint32t, uca_readwrite },
+ { "Time.Exposure.Min", uca_ns, uca_uint32t, uca_read },
+ { "Time.Exposure.Max", uca_ms, uca_uint32t, uca_read },
+ { "Time.Delay", uca_us, uca_uint32t, uca_readwrite },
+ { "Time.Delay.Min", uca_ns, uca_uint32t, uca_read },
+ { "Time.Delay.Max", uca_ms, uca_uint32t, uca_read },
+ { "Time.Framerate", uca_fps, uca_uint32t, uca_read },
+ { "Temperature.Sensor", uca_dc, uca_uint32t, uca_read },
+ { "Temperature.Camera", uca_dc, uca_uint32t, uca_read },
+ { "Trigger.Mode", uca_na, uca_uint32t, uca_readwrite },
+ { "Trigger.Exposure", uca_na, uca_uint32t, uca_readwrite },
+ { "Mode.Timestamp", uca_na, uca_uint32t, uca_readwrite },
+ { "Mode.Scan", uca_na, uca_uint32t, uca_readwrite },
+ { "Interlace.Samplerate", uca_na, uca_uint32t, uca_readwrite },
+ { "Interlace.Threshold.Pixel", uca_na, uca_uint32t, uca_readwrite },
+ { "Interlace.Threshold.Row", uca_na, uca_uint32t, uca_readwrite },
+ { "Mode.correction", uca_na, uca_uint32t, uca_readwrite },
{ NULL, 0, 0, 0 }
};