summaryrefslogtreecommitdiff
path: root/spectro/kleink10.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:16:54 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:16:54 +0100
commit1b1126bd023a2bb92699773a1867358067dabcb8 (patch)
tree6fd56d034e5a154c7992e7855d61691cecd043c4 /spectro/kleink10.c
parentcb5c7cec4aa1946f75dc3d408eb7f1051f3fb3d4 (diff)
parentf6b8e0eae4374f339487a33e3e4fe5462d5816e1 (diff)
Update upstream source from tag 'upstream/2.0.0'
Update to upstream version '2.0.0' with Debian dir e866e6e75661017faaa5331becda76021407390b
Diffstat (limited to 'spectro/kleink10.c')
-rwxr-xr-x[-rw-r--r--]spectro/kleink10.c11
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);