diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-05-01 16:13:57 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-05-01 16:13:57 +0200 |
| commit | 094535c010320967639e8e86f974d878e80baa72 (patch) | |
| tree | efc3094b20355dcbeebb2c4ece4fcfc69bffedb5 /spectro/colorhug.h | |
| parent | c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 (diff) | |
Imported Upstream version 1.7.0upstream/1.7.0
Diffstat (limited to 'spectro/colorhug.h')
| -rw-r--r-- | spectro/colorhug.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/spectro/colorhug.h b/spectro/colorhug.h index a591608..90fff6f 100644 --- a/spectro/colorhug.h +++ b/spectro/colorhug.h @@ -57,7 +57,13 @@ #define COLORHUG_BAD_RD_LENGTH 0x26 #define COLORHUG_BAD_RET_CMD 0x27 #define COLORHUG_BAD_RET_STAT 0x28 +#define COLORHUG_WRONG_MODEL 0x29 +/* Sub-type of instrument */ +typedef enum { + ch_one = 0, /* Original ColorHug */ + ch_two = 1 /* ColorHug2 */ +} colorhug_model; /* COLORHUG communication object */ struct _colorhug { @@ -67,13 +73,16 @@ struct _colorhug { inst_opt_type trig; /* Reading trigger mode */ + colorhug_model stype; /* Instrument sub-model */ int maj, min, uro; /* Version number */ int ser_no; /* Serial number */ inst_disptypesel *dtlist; /* Display Type list */ int ndtlist; /* Number of valid dtlist entries */ int icx; /* Internal calibration matrix index, 11 = Raw */ - int cbid; /* calibration base ID, 0 if not a base */ + disptech dtech; /* Display technology enum */ + int cbid; /* current calibration base ID, 0 if not a base */ + int ucbid; /* Underlying base ID if being used for matrix, 0 othewise */ int refrmode; /* Refresh mode (always 0) */ double postscale; /* Post scale factor (for Raw) */ double ccmat[3][3]; /* Colorimeter correction matrix */ |