summaryrefslogtreecommitdiff
path: root/spectro/specbos.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-02 19:25:17 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-10-02 19:25:17 +0200
commitc2ca7be5a751879159f3cb591a64bb9568b79762 (patch)
tree04e38d4f4a2aad4d789bda0a65b7abb80a3439a2 /spectro/specbos.h
parent45c152c326d87478fbf41714b4b8e2f7b57a282b (diff)
parent3db384424bd7398ffbb7a355cab8f15f3add009f (diff)
Updated version 1.9.1+repack from 'upstream/1.9.1+repack'
with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80
Diffstat (limited to 'spectro/specbos.h')
-rw-r--r--spectro/specbos.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/spectro/specbos.h b/spectro/specbos.h
index e926c42..5c89fd5 100644
--- a/spectro/specbos.h
+++ b/spectro/specbos.h
@@ -37,6 +37,10 @@
#include "inst.h"
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
/* Fake Error codes */
#define SPECBOS_INTERNAL_ERROR 0xff01 /* Internal software error */
#define SPECBOS_TIMEOUT 0xff02 /* Communication timeout */
@@ -122,11 +126,15 @@
struct _specbos {
INST_OBJ_BASE
+ int bt; /* Bluetooth coms rather than USB/serial flag */
+
amutex lock; /* Command lock */
- int model; /* JETI specbos model number */
+ int model; /* JETI specbos/spectraval model number */
/* 1201 */
/* 1211 */
+ /* 1501 */
+ /* 1511 - has display */
int noXYZ; /* nz if firmware doesn't support fetch*XYZ */
int badCal; /* nz if its been calibrated with a reduced WL range by 3rd party */
@@ -147,6 +155,10 @@ struct _specbos {
double wl_short;
double wl_long;
+ xspect trans_white; /* Synthetic transmission mode white reference */
+ xsp2cie *conv; /* transmission spectral to XYZ conversion */
+ int doing_cal; /* Flag - doing internal calibration measure */
+
/* Other state */
athread *th; /* Diffuser position monitoring thread */
volatile int th_term; /* nz to terminate thread */
@@ -159,6 +171,9 @@ struct _specbos {
/* Constructor */
extern specbos *new_specbos(icoms *icom, instType itype);
+#ifdef __cplusplus
+ }
+#endif
#define SPECBOS_H
#endif /* SPECBOS_H */