summaryrefslogtreecommitdiff
path: root/spectro/specbos.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:22:51 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:22:51 +0200
commitbc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch)
treee796661f371a94a50edfdc693388bb911b253dfd /spectro/specbos.c
parent509016be676f7915d635fa57144d2a441e3090ca (diff)
parentc0b89ac5bfb90835ef01573267020e42d4fe070c (diff)
Merge new upstream release
Diffstat (limited to 'spectro/specbos.c')
-rwxr-xr-x[-rw-r--r--]spectro/specbos.c45
1 files changed, 39 insertions, 6 deletions
diff --git a/spectro/specbos.c b/spectro/specbos.c
index 0d5bc5b..e819c06 100644..100755
--- a/spectro/specbos.c
+++ b/spectro/specbos.c
@@ -484,7 +484,7 @@ specbos_init_inst(inst *pp) {
return ev;
}
if (p->wl_long > 830.0) /* Could go to 1000 with 1211 */
- p->wl_long = 830.0;
+ p->wl_long = 830.0; /* Limit it to useful visual range */
a1logd(p->log, 1, " Long wl range %f\n",p->wl_long);
@@ -695,13 +695,46 @@ instClamping clamp) { /* NZ if clamp XYZ/Lab to be +ve */
/* Trigger a measurement */
/* (Note that ESC will abort it) */
- if ((ec = specbos_fcommand(p, "*init\r", buf, MAX_MES_SIZE, 5.0 * p->measto + 10.0 , 1, 1, 0)) != SPECBOS_OK) {
+ ec = specbos_fcommand(p, "*init\r", buf, MAX_MES_SIZE, 5.0 * p->measto + 10.0 , 1, 1, 0);
+
+ // Test out bug workaround
+ // if (!p->badCal) ec = SPECBOS_EXCEED_CAL_WL;
+
+ /* If the specbos has been calibrated by a 3rd party, its calibrated range */
+ /* may be out of sync with its claimed range. Reduce the range and retry. */
+ if (ec == SPECBOS_EXCEED_CAL_WL && !p->badCal) {
+ char mes[100];
+ inst_code ev = inst_ok;
+
+ a1logd(p->log, 1, " Got SPECBOS_EXCEED_CAL_WL error (Faulty 3rd party Calibration ?)\n");
+ a1logd(p->log, 1, " Trying workaround by restricting range to 380-780nm\n");
+
+ if (p->wl_short < 380.0)
+ p->wl_short = 380.0;
+ if (p->wl_long > 780.0)
+ p->wl_long = 780.0;
+
+ p->nbands = (int)((p->wl_long - p->wl_short + 1.0)/1.0 + 0.5);
+
+ /* Re-set the wavelength range and resolution */
+ sprintf(mes, "*conf:wran %d %d 1\r", (int)(p->wl_short+0.5), (int)(p->wl_long+0.5));
+ if ((ev = specbos_command(p, mes, buf, MAX_MES_SIZE, 1.0)) != inst_ok) {
+ amutex_unlock(p->lock);
+ return ev;
+ }
+ p->badCal = 1;
+
+ /* Try command again */
+ ec = specbos_fcommand(p, "*init\r", buf, MAX_MES_SIZE, 5.0 * p->measto + 10.0 , 1, 1, 0);
+ }
+
+ if (ec != SPECBOS_OK) {
amutex_unlock(p->lock);
return specbos_interp_code((inst *)p, ec);
}
- if (p->noXYZ) { /* Will fail, so assume it failed */
+ if (p->noXYZ) { /* "*fetch:XYZ" will fail, so assume it failed rather than trying it */
ec = SPECBOS_COMMAND;
} else { /* Read the XYZ */
@@ -894,7 +927,7 @@ double *ref_rate
if ((cp = strchr(buf, 'c')) == NULL)
cp = buf;
if (sscanf(cp, "cyctim[ms]: %lf ", &refperiod) != 1) {
- a1logd(p->log, 1, "specbos_read_refrate rate: failed to parse string '%s'\n",icoms_fix(buf));
+ a1logd(p->log, 1, "specbos_imp_measure_refresh rate: failed to parse string '%s'\n",icoms_fix(buf));
*ref_rate = 0.0;
return inst_misread;
}
@@ -1056,7 +1089,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */
inst_code ev = inst_ok;
- if (*calc != inst_calc_emis_80pc) {
+ if ((*calc & inst_calc_cond_mask) != inst_calc_emis_80pc) {
*calc = inst_calc_emis_80pc;
return inst_cal_setup;
}
@@ -1788,7 +1821,7 @@ extern specbos *new_specbos(icoms *icom, instType itype) {
p->del = specbos_del;
p->icom = icom;
- p->itype = icom->itype;
+ p->itype = itype;
if (p->itype == instSpecbos1201)
p->model = 1201;