summaryrefslogtreecommitdiff
path: root/spectro/ex1.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:16:00 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-11-25 10:16:00 +0100
commitf6b8e0eae4374f339487a33e3e4fe5462d5816e1 (patch)
tree5f5f764fd6cda404b2ad6e85762c03fce3a335db /spectro/ex1.c
parent615ab5513e79c4abc5bbe5c993587785b6a1738b (diff)
New upstream version 2.0.0upstream/2.0.0
Diffstat (limited to 'spectro/ex1.c')
-rwxr-xr-x[-rw-r--r--]spectro/ex1.c7
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 */