diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
tree | d5c2a62c4db97de94f92150340612c64d3997669 /spectro/i1d3.h | |
parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'spectro/i1d3.h')
-rwxr-xr-x[-rw-r--r--] | spectro/i1d3.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spectro/i1d3.h b/spectro/i1d3.h index a7c3b24..6152a00 100644..100755 --- a/spectro/i1d3.h +++ b/spectro/i1d3.h @@ -87,7 +87,8 @@ typedef enum { i1d3_nec_ssp = 3, /* NEC SpectraSensor Pro */ i1d3_quato_sh3 = 4, /* Quato Silver Haze 3 */ i1d3_hp_dreamc = 5, /* HP DreameColor */ - i1d3_sc_c6 = 6 /* SpectraCal C6 */ + i1d3_sc_c6 = 6, /* SpectraCal C6 */ + i1d3_wacom_dc = 7 /* Wacom DC */ } i1d3_dtype; /* Measurement mode */ @@ -108,7 +109,7 @@ struct _i1d3 { inst_opt_type trig; /* Reading trigger mode */ /* Information and EEPROM values */ - i1d3_dtype dtype; /* Base type of instrument, ie i1d3_disppro or i1d3_munkdisp */ + i1d3_dtype btype; /* Base type of instrument, ie i1d3_disppro or i1d3_munkdisp */ i1d3_dtype stype; /* Sub type of instrument, ie. any of i1d3_dtype. */ /* (Only accurate if it needed unlocking). */ int status; /* 0 if status is ok (not sure what this is) */ |