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/dtp20.c | |
| parent | 509016be676f7915d635fa57144d2a441e3090ca (diff) | |
| parent | c0b89ac5bfb90835ef01573267020e42d4fe070c (diff) | |
Merge new upstream release
Diffstat (limited to 'spectro/dtp20.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/dtp20.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spectro/dtp20.c b/spectro/dtp20.c index a460bb8..a504803 100644..100755 --- 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 */ |