diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-03 20:38:41 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-03 20:38:41 +0100 |
| commit | ba627dd9ecb578e9852c7b9cce67ec63199d1acf (patch) | |
| tree | 27c4258311ca8c8ed7ff67a8a0bc7280e8fcae79 /spectro/kleink10.c | |
| parent | 69aec3b712232e93600ecd741269fed1f90b412a (diff) | |
| parent | 3abb40d43649adb3807180692d8579c405524675 (diff) | |
Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1
Diffstat (limited to 'spectro/kleink10.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/kleink10.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/spectro/kleink10.c b/spectro/kleink10.c index 3d67b6c..d169156 100644..100755 --- a/spectro/kleink10.c +++ b/spectro/kleink10.c @@ -54,6 +54,7 @@ #include "sa_config.h" #include "numsup.h" #endif /* !SALONEINSTLIB */ +#include "cgats.h" #include "xspect.h" #include "insttypes.h" #include "conv.h" @@ -354,7 +355,7 @@ k10_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { baud_rate brt[] = { baud_9600, baud_nc }; unsigned int etime; unsigned int i; - instType itype = pp->itype; + instType dtype = pp->dtype; int se; char *cp; @@ -1486,8 +1487,8 @@ static inst_code k10_imp_measure_refresh( /* Locate the smallest values and maximum time */ maxt = -1e6; - minv = minv = minv = 1e20; - maxv = maxv = maxv = -11e20; + minv = 1e20; + maxv = -11e20; for (i = nfsamps-1; i >= 0; i--) { if (samp[i] < minv) minv = samp[i]; @@ -2842,7 +2843,7 @@ k10_get_set_opt(inst *pp, inst_opt_type m, ...) { } /* Constructor */ -extern kleink10 *new_kleink10(icoms *icom, instType itype) { +extern kleink10 *new_kleink10(icoms *icom, instType dtype) { kleink10 *p; if ((p = (kleink10 *)calloc(sizeof(kleink10),1)) == NULL) { a1loge(icom->log, 1, "new_kleink10: malloc failed!\n"); @@ -2871,7 +2872,7 @@ extern kleink10 *new_kleink10(icoms *icom, instType itype) { p->del = k10_del; p->icom = icom; - p->itype = itype; + p->dtype = dtype; p->dtech = disptech_unknown; amutex_init(p->lock); |