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/dtp20.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 spectro/dtp20.c (limited to 'spectro/dtp20.c') diff --git a/spectro/dtp20.c b/spectro/dtp20.c old mode 100644 new mode 100755 index a460bb8..a504803 --- a/spectro/dtp20.c +++ b/spectro/dtp20.c @@ -1128,7 +1128,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ if (*calt & inst_calt_ref_white) { int i; - if (*calc != inst_calc_man_ref_white) { + if ((*calc & inst_calc_cond_mask) != inst_calc_man_ref_white) { char *cp; if ((ev = dtp20_command(p, "04SN\r", buf, MAX_MES_SIZE, 4.5)) != inst_ok) return ev; @@ -1725,7 +1725,7 @@ extern dtp20 *new_dtp20(icoms *icom, instType itype) { p->del = dtp20_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 */ -- cgit v1.2.3