From 3db384424bd7398ffbb7a355cab8f15f3add009f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 2 Oct 2016 19:24:58 +0200 Subject: New upstream version 1.9.1+repack --- spectro/munki.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 75 insertions(+), 5 deletions(-) (limited to 'spectro/munki.c') diff --git a/spectro/munki.c b/spectro/munki.c index df54cd9..16cd863 100644 --- a/spectro/munki.c +++ b/spectro/munki.c @@ -71,8 +71,15 @@ static inst_code munki_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { munki *p = (munki *) pp; int se; +#if defined(UNIX_X11) + /* Some Linux drivers fail to start every second time the device is opened */ + /* if no clear halt is done on open, and some do the opposite. So */ + /* reset after close to avoid the problem in all cases. */ + icomuflags usbflags = icomuf_no_open_clear | icomuf_reset_before_close; +#else icomuflags usbflags = icomuf_none; -#ifdef __APPLE__ +#endif +#ifdef UNIX_APPLE /* If the ColorMunki software has been installed, then there will */ /* be a daemon process that has the device open. Kill that process off */ /* so that we can open it here, before it re-spawns. */ @@ -82,10 +89,10 @@ munki_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { NULL }; int retries = 20; -#else /* !__APPLE__ */ +#else /* !UNIX_APPLE */ char **pnames = NULL; int retries = 0; -#endif /* !__APPLE__ */ +#endif /* !UNIX_APPLE */ a1logd(p->log, 2, "munki_init_coms: called\n"); @@ -98,6 +105,8 @@ munki_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { /* Set config, interface, write end point, read end point, read quanta */ /* ("serial" end points aren't used - the Munki uses USB control messages) */ + /* (The ColorMunki on Linux only starts every second time if we use the */ + /* icomuf_no_open_clear flag.) */ if ((se = p->icom->set_usb_port(p->icom, 1, 0x00, 0x00, usbflags, retries, pnames)) != ICOM_OK) { a1logd(p->log, 1, "munki_init_coms: failed ICOM err 0x%x\n",se); @@ -368,6 +377,7 @@ static inst_code munki_calibrate( inst *pp, inst_cal_type *calt, /* Calibration type to do/remaining */ inst_cal_cond *calc, /* Current condition/desired condition */ +inst_calc_id_type *idtype, /* Condition identifier type */ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ ) { munki *p = (munki *)pp; @@ -378,7 +388,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */ if (!p->inited) return inst_no_init; - rv = munki_imp_calibrate(p, calt, calc, id); + rv = munki_imp_calibrate(p, calt, calc, idtype, id); return munki_interp_code(p, rv); } @@ -455,7 +465,7 @@ munki_interp_error(inst *pp, munki_code ec) { case MUNKI_RD_TOOMANYPATCHES: return "Too many patches"; case MUNKI_RD_NOTENOUGHSAMPLES: - return "Not enough samples per patch"; + return "Not enough samples per patch - Slow Down!"; case MUNKI_RD_NOFLASHES: return "No flashes recognized"; case MUNKI_RD_NOAMBB4FLASHES: @@ -797,6 +807,39 @@ munki_get_set_opt(inst *pp, inst_opt_type m, ...) { return munki_interp_code(p, munki_set_scan_toll(p, toll_ratio)); } + /* Set xcalstd */ + if (m == inst_opt_set_xcalstd) { + munkiimp *imp = (munkiimp *)p->m; + xcalstd standard; + va_list args; + + va_start(args, m); + standard = va_arg(args, xcalstd); + va_end(args); + + imp->target_calstd = standard; + + return inst_ok; + } + + /* Get the current effective xcalstd */ + if (m == inst_opt_get_xcalstd) { + munkiimp *imp = (munkiimp *)p->m; + xcalstd *standard; + va_list args; + + va_start(args, m); + standard = va_arg(args, xcalstd *); + va_end(args); + + if (imp->target_calstd == xcalstd_native) + *standard = imp->native_calstd; /* If not overridden */ + else + *standard = imp->target_calstd; /* Overidden std. */ + + return inst_ok; + } + if (!p->gotcoms) return inst_no_coms; if (!p->inited) @@ -915,6 +958,33 @@ munki_get_set_opt(inst *pp, inst_opt_type m, ...) { return inst_ok; } + /* Return the white calibration tile spectrum */ + /* (We always return the normal rez. reference values) */ + if (m == inst_opt_get_cal_tile_sp) { + munkiimp *imp = (munkiimp *)p->m; + xspect *sp; + inst_code rv; + va_list args; + int i; + + va_start(args, m); + sp = va_arg(args, xspect *); + va_end(args); + + if (imp->white_ref1 == NULL) + return inst_no_init; + + sp->spec_n = imp->nwav1; + sp->spec_wl_short = imp->wl_short1; + sp->spec_wl_long = imp->wl_long1; + sp->norm = 100.0; + + for (i = 0; i < sp->spec_n; i++) + sp->spec[i] = imp->white_ref1[i] * 100.0; + + return inst_ok; + } + /* Use default implementation of other inst_opt_type's */ { inst_code rv; -- cgit v1.2.3