From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- spectro/dtp22.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 spectro/dtp22.c (limited to 'spectro/dtp22.c') diff --git a/spectro/dtp22.c b/spectro/dtp22.c old mode 100644 new mode 100755 index a80f887..d332ffc --- 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 */ -- cgit v1.2.3