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/dtp22.c | |
| parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
| parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) | |
Merge new upstream release
Diffstat (limited to 'spectro/dtp22.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/dtp22.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spectro/dtp22.c b/spectro/dtp22.c index a80f887..d332ffc 100644..100755 --- a/spectro/dtp22.c +++ b/spectro/dtp22.c @@ -684,7 +684,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ if (*calt & inst_calt_ref_white) { /* White calibration */ sprintf(id, "Serial no. %d",p->plaqueno); - if (*calc != inst_calc_man_ref_whitek) { + if ((*calc & inst_calc_cond_mask) != inst_calc_man_ref_whitek) { *calc = inst_calc_man_ref_whitek; ev = inst_cal_setup; goto do_exit; @@ -744,7 +744,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ } if (*calt & inst_calt_ref_dark) { /* Black calibration */ - if (*calc != inst_calc_man_ref_dark) { + if ((*calc & inst_calc_cond_mask) != inst_calc_man_ref_dark) { *calc = inst_calc_man_ref_dark; ev = inst_cal_setup; goto do_exit; @@ -1079,7 +1079,7 @@ extern dtp22 *new_dtp22(icoms *icom, instType itype) { p->del = dtp22_del; p->icom = icom; - p->itype = icom->itype; + p->itype = itype; p->mode = inst_mode_none; p->need_cal = 1; /* Do a white calibration each time we open the device */ |