diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-23 12:22:51 +0200 |
| commit | bc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch) | |
| tree | e796661f371a94a50edfdc693388bb911b253dfd /spectro/dtp41.c | |
| parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
| parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) | |
Merge new upstream release
Diffstat (limited to 'spectro/dtp41.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/dtp41.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/spectro/dtp41.c b/spectro/dtp41.c index a2f7e83..5c3361c 100644..100755 --- a/spectro/dtp41.c +++ b/spectro/dtp41.c @@ -923,8 +923,9 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ if ((p->mode & inst_mode_illum_mask) == inst_mode_transmission) { if (*calt & inst_calt_trans_white) { - if (*calc != inst_calc_uop_trans_white) - *calc = inst_calc_uop_trans_white; /* Ask user to do calibration */ + if ((*calc & inst_calc_cond_mask) != inst_calc_uop_trans_white) + /* Ask user to do calibration */ + *calc = inst_calc_uop_trans_white; return inst_cal_setup; } @@ -934,8 +935,9 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ } else { if (*calt & inst_calt_ref_white) { - if (*calc != inst_calc_uop_ref_white) { - *calc = inst_calc_uop_ref_white; /* Ask user to do calibration */ + if ((*calc & inst_calc_cond_mask) != inst_calc_uop_ref_white) { + /* Ask user to do calibration */ + *calc = inst_calc_uop_ref_white; return inst_cal_setup; } @@ -1283,7 +1285,7 @@ extern dtp41 *new_dtp41(icoms *icom, instType itype) { p->del = dtp41_del; p->icom = icom; - p->itype = icom->itype; + p->itype = itype; p->cap = inst_mode_none; /* Unknown until set */ p->mode = inst_mode_none; /* Not in a known mode yet */ p->nstaticr = 5; /* Number of static readings */ |