summaryrefslogtreecommitdiffstats
path: root/src/uca.h
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-25 17:44:23 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-25 17:44:23 +0100
commita10b4d2abbb2aafbcb398f659975d673b0181e8c (patch)
treefa03f1413b43cddbd408a9e01c949525f6886453 /src/uca.h
parente99970e82e665cb5668584827af320bc49e27300 (diff)
downloaduca-a10b4d2abbb2aafbcb398f659975d673b0181e8c.tar.gz
uca-a10b4d2abbb2aafbcb398f659975d673b0181e8c.tar.bz2
uca-a10b4d2abbb2aafbcb398f659975d673b0181e8c.tar.xz
uca-a10b4d2abbb2aafbcb398f659975d673b0181e8c.zip
Make the properties complete and build even better test app
Diffstat (limited to 'src/uca.h')
-rw-r--r--src/uca.h27
1 files changed, 26 insertions, 1 deletions
diff --git a/src/uca.h b/src/uca.h
index 52cc7b8..bf0cc21 100644
--- a/src/uca.h
+++ b/src/uca.h
@@ -14,6 +14,7 @@
#include <stdint.h>
struct uca_t;
+struct uca_property_t;
/**
* \brief Camera probing and initialization
@@ -73,6 +74,7 @@ int32_t uca_get_property_id(const char *property_name);
*/
const char* uca_get_property_name(int32_t property_id);
+struct uca_property_t *uca_get_full_property(int32_t property_id);
#define UCA_NO_ERROR 0
#define UCA_ERR_INIT_NOT_FOUND 1 /**< camera probing or initialization failed */
@@ -115,7 +117,9 @@ const char* uca_get_property_name(int32_t property_id);
#define UCA_PROP_INTERLACE_ROW_THRESH 24
/* Photon Focus specific */
-#define UCA_PROP_CORRECTION_MODE 21
+#define UCA_PROP_CORRECTION_MODE 25
+
+#define UCA_PROP_LAST 26
/* Possible timestamp modes for UCA_PROP_TIMESTAMP_MODE */
#define UCA_TIMESTAMP_ASCII 0x01
@@ -131,6 +135,27 @@ const char* uca_get_property_name(int32_t property_id);
#define UCA_CORRECT_HOTPIXEL 0x02
#define UCA_CORRECT_GAIN 0x04
+struct uca_property_t {
+ const char *name;
+
+ enum uca_unit {
+ uca_pixel,
+ uca_bits,
+ uca_ns,
+ uca_us,
+ uca_ms,
+ uca_s,
+ uca_rows,
+ uca_na
+ } unit;
+
+ enum uca_types {
+ uca_uint32t,
+ uca_uint8t,
+ uca_string
+ } type;
+};
+
struct uca_t {
/* Function pointers to camera-specific methods */
uca_cam_set_property cam_set_property;