summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-24 15:36:09 +0100
committerMatthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de>2011-02-24 15:36:09 +0100
commit754c7d8ecc74513dc3e4765964dc9ff210e6f7af (patch)
tree67656bc8978db02d1f7a2f80db2db2fc9f834485
parent8679c0a542085c52a8d7458f5d4ecad13ed7ca99 (diff)
downloaduca-754c7d8ecc74513dc3e4765964dc9ff210e6f7af.tar.gz
uca-754c7d8ecc74513dc3e4765964dc9ff210e6f7af.tar.bz2
uca-754c7d8ecc74513dc3e4765964dc9ff210e6f7af.tar.xz
uca-754c7d8ecc74513dc3e4765964dc9ff210e6f7af.zip
Timestamp property
-rw-r--r--src/uca.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/uca.h b/src/uca.h
index 3c52c7a..8614cb7 100644
--- a/src/uca.h
+++ b/src/uca.h
@@ -89,11 +89,20 @@ const char* uca_get_property_name(int32_t property_id);
#define UCA_PROP_FRAMERATE 10
#define UCA_PROP_TRIGGER_MODE 11
-#define UCA_PROP_INTERLACE_SAMPLE_RATE 12
-#define UCA_PROP_INTERLACE_PIXEL_THRESH 13
-#define UCA_PROP_INTERLACE_ROW_THRESH 14
+/* pco.edge specific */
+#define UCA_PROP_TIMESTAMP_MODE 12
-#define UCA_PROP_CORRECTION_MODE 15
+/* IPE camera specific */
+#define UCA_PROP_INTERLACE_SAMPLE_RATE 13
+#define UCA_PROP_INTERLACE_PIXEL_THRESH 14
+#define UCA_PROP_INTERLACE_ROW_THRESH 15
+
+/* Photon Focus specific */
+#define UCA_PROP_CORRECTION_MODE 16
+
+/* Possible timestamp modes for UCA_PROP_TIMESTAMP_MODE */
+#define UCA_TIMESTAMP_ASCII 0x01
+#define UCA_TIMESTAMP_BINARY 0x02
/* Trigger mode for UCA_PROP_TRIGGERMODE */
#define UCA_TRIGGER_AUTO 1