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/ex1.c | |
| parent | 69aec3b712232e93600ecd741269fed1f90b412a (diff) | |
| parent | 3abb40d43649adb3807180692d8579c405524675 (diff) | |
Merge branch 'release/2.0.0+repack-1'2.0.0+repack-1
Diffstat (limited to 'spectro/ex1.c')
| -rwxr-xr-x[-rw-r--r--] | spectro/ex1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/spectro/ex1.c b/spectro/ex1.c index 5f4eae2..929af3d 100644..100755 --- a/spectro/ex1.c +++ b/spectro/ex1.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" @@ -158,7 +159,7 @@ static int ex1_touch_calibration(ex1 *p); static inst_code ex1_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { ex1 *p = (ex1 *) pp; - instType itype = pp->itype; + instType dtype = pp->dtype; int se; inst_code ev = inst_ok; @@ -1210,7 +1211,7 @@ ex1_get_set_opt(inst *pp, inst_opt_type m, ...) { } /* Constructor */ -extern ex1 *new_ex1(icoms *icom, instType itype) { +extern ex1 *new_ex1(icoms *icom, instType dtype) { ex1 *p; if ((p = (ex1 *)calloc(sizeof(ex1),1)) == NULL) { a1loge(icom->log, 1, "new_ex1: malloc failed!\n"); @@ -1241,7 +1242,7 @@ extern ex1 *new_ex1(icoms *icom, instType itype) { p->del = ex1_del; p->icom = icom; - p->itype = itype; + p->dtype = dtype; p->want_dcalib = 1; /* Always do an initial dark calibration */ |