summaryrefslogtreecommitdiff
path: root/spectro/i1pro_imp.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-01 16:24:15 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-05-01 16:24:15 +0200
commita30ba67504ffd12c4db499adbb5ce47a7d1f6036 (patch)
tree9ae1a7e3849dda6bbb5c578232f6f2fa5b2e7e7e /spectro/i1pro_imp.h
parent89e99e8a827859729729dfc92d74be4a8f96f1a4 (diff)
parent094535c010320967639e8e86f974d878e80baa72 (diff)
New release 1.7.0
Diffstat (limited to 'spectro/i1pro_imp.h')
-rw-r--r--spectro/i1pro_imp.h17
1 files changed, 10 insertions, 7 deletions
diff --git a/spectro/i1pro_imp.h b/spectro/i1pro_imp.h
index c0d0708..6bf8de4 100644
--- a/spectro/i1pro_imp.h
+++ b/spectro/i1pro_imp.h
@@ -319,6 +319,9 @@ struct _i1proimp {
int trig_se; /* Delayed trigger icoms error */
i1pro_code trig_rv; /* Delayed trigger result */
+ volatile double whitestamp; /* meas_delay() white timestamp */
+ volatile double trigstamp; /* meas_delay() trigger timestamp */
+
}; typedef struct _i1proimp i1proimp;
/* Add an implementation structure */
@@ -344,6 +347,7 @@ void del_i1proimp(i1pro *p);
#define I1PRO_UNSUPPORTED 0x79 /* Unsupported function */
#define I1PRO_CAL_SETUP 0x7A /* Cal. retry with correct setup is needed */
+#define I1PRO_RD_TRANSWHITEWARN 0x7B /* Transmission white ref wl are low */
/* Real error code */
#define I1PRO_OK 0x00
@@ -395,10 +399,6 @@ void del_i1proimp(i1pro *p);
#define I1PRO_RD_NOREFR_FOUND 0x40 /* Unable to measure refresh rate */
#define I1PRO_RD_NOTRANS_FOUND 0x41 /* Unable to measure delay transition */
-#define I1PRO_CAL_SETUP 0x7A /* Cal. retry with correct setup is needed */
-#define I1PRO_RD_TRANSWHITEWARN 0x7B /* Transmission white ref wl are low */
-
-
/* Internal errors */
#define I1PRO_INT_NO_COMS 0x50
#define I1PRO_INT_EETOOBIG 0x51 /* EEProm read size is too big */
@@ -480,8 +480,11 @@ i1pro_code i1pro_imp_meas_refrate(
/* Measure the display update delay */
i1pro_code i1pro_imp_meas_delay(
i1pro *p,
- int *msecdelay
-);
+ int *pdispmsec,
+ int *pinstmsec);
+
+/* Timestamp the white patch change during meas_delay() */
+inst_code i1pro_imp_white_change(i1pro *p, int init);
/* Given a raw measurement of the wavelength LED, */
/* Compute the base offset that best fits it to the reference */
@@ -979,7 +982,7 @@ i1pro_triggermeasure(i1pro *p, int delay);
/* Read a measurements results */
-i1pro_code
+static i1pro_code
i1pro_readmeasurement(
i1pro *p,
int inummeas, /* Initial number of measurements to expect */