From 3db384424bd7398ffbb7a355cab8f15f3add009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2016 19:24:58 +0200 Subject: New upstream version 1.9.1+repack --- spectro/i1pro_imp.h | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'spectro/i1pro_imp.h') diff --git a/spectro/i1pro_imp.h b/spectro/i1pro_imp.h index 5a2cef2..582cc98 100644 --- a/spectro/i1pro_imp.h +++ b/spectro/i1pro_imp.h @@ -4,7 +4,9 @@ * Argyll Color Correction System * * Gretag i1Pro implementation defines - * + */ + +/* * Author: Graeme W. Gill * Date: 20/12/2006 * @@ -15,6 +17,10 @@ * see the License2.txt file for licencing details. */ +#ifdef __cplusplus + extern "C" { +#endif + /* If you make use of the instrument driver code here, please note that it is the author(s) of the code who take responsibility @@ -182,6 +188,9 @@ struct _i1proimp { int uv_en; /* NZ to do UV reflective measurement */ /* ~~ change this to uv_mode of none, uv, strip1, 2pass */ + xcalstd native_calstd; /* Instrument native calibration standard */ + xcalstd target_calstd; /* Returned calibration standard */ + double intclkp; /* Integration clock period (typically 68 usec) */ int subclkdiv; /* Sub clock divider ratio */ int subtmode; /* Reading 127 subtract mode (version 301 or greater) */ @@ -363,10 +372,11 @@ void del_i1proimp(i1pro *p); #define I1PRO_DATA_KEYNOTFOUND 0x05 /* a key value wasn't found */ #define I1PRO_DATA_WRONGTYPE 0x06 /* a key is the wrong type */ #define I1PRO_DATA_KEY_CORRUPT 0x07 /* key table seems to be corrupted */ -#define I1PRO_DATA_KEY_COUNT 0x08 /* key table count is too big or small */ -#define I1PRO_DATA_KEY_UNKNOWN 0x09 /* unknown key type */ -#define I1PRO_DATA_KEY_MEMRANGE 0x0a /* key data is out of range of EEProm */ -#define I1PRO_DATA_KEY_ENDMARK 0x0b /* And end section marker was missing */ +#define I1PRO_DATA_KEY_COUNT_SMALL 0x08 /* key table count is too small */ +#define I1PRO_DATA_KEY_COUNT_LARGE 0x09 /* key table count is too big */ +#define I1PRO_DATA_KEY_UNKNOWN 0x0a /* unknown key type */ +#define I1PRO_DATA_KEY_MEMRANGE 0x0b /* key data is out of range of EEProm */ +#define I1PRO_DATA_KEY_ENDMARK 0x0c /* And end section marker was missing */ /* HW errors */ #define I1PRO_HW_HIGHPOWERFAIL 0x10 /* Switch to high power mode failed */ @@ -464,6 +474,7 @@ i1pro_code i1pro_imp_calibrate( i1pro *p, inst_cal_type *calt, /* Calibration type to do/remaining */ inst_cal_cond *calc, /* Current condition/desired condition */ + inst_calc_id_type *idtype, /* Condition identifier type */ char id[100] /* Condition identifier (ie. white reference ID) */ ); @@ -475,6 +486,12 @@ i1pro_code i1pro_imp_measure( instClamping clamp /* Clamp XYZ/Lab to be +ve */ ); +/* Do a dummy reflective read, to fix Lamp Drift. */ +i1pro_code i1pro_imp_lamp_fix( + i1pro *p, + double seconds /* Number of seconds to turn lamp on for */ +); + /* Measure the emissive refresh rate */ i1pro_code i1pro_imp_meas_refrate( i1pro *p, @@ -1052,6 +1069,7 @@ i1pro2_getmeaschar( #define I1PRO2_MMF_LAMP 0x0100 /* Use the Incandescent Lamp as the illuminant */ #define I1PRO2_MMF_UV_LED 0x0200 /* Use the Ultra Violet LED as the illuminant */ #define I1PRO2_MMF_WL_LED 0x0300 /* Use the Wavelength Reference LED as the illuminant */ + //#define I1PRO2_MMF_HIGHGAIN 0x0000 /* Rev E mode has no high gain mode ? */ #define I1PRO2_MMF_SCAN 0x0001 /* Scan mode bit, else spot mode */ #define I1PRO2_MMF_RULER_START 0x0004 /* Start ruler tracking in scan mode */ @@ -1404,5 +1422,9 @@ struct _i1data { /* Constructor. Construct from the EEprom contents */ extern i1data *new_i1data(i1proimp *m); +#ifdef __cplusplus + } +#endif + #define I1PRO_IMP #endif /* I1PRO_IMP */ -- cgit v1.2.3