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/dtp51.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 spectro/dtp51.c (limited to 'spectro/dtp51.c') diff --git a/spectro/dtp51.c b/spectro/dtp51.c old mode 100644 new mode 100755 index 062ad7f..cfd1265 --- a/spectro/dtp51.c +++ b/spectro/dtp51.c @@ -635,8 +635,9 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ 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; } p->need_cal = 0; @@ -892,7 +893,7 @@ extern dtp51 *new_dtp51(icoms *icom, instType itype) { p->del = dtp51_del; p->icom = icom; - p->itype = icom->itype; + p->itype = itype; return p; } -- cgit v1.2.3