Merge branch 'feature/upstream' into develop

1 files changed, 34 insertions, 3 deletions

diff --git a/spectro/i1pro_imp.h b/spectro/i1pro_imp.h
index 582cc98..00cf52d 100755
--- a/spectro/i1pro_imp.h
+++ b/spectro/i1pro_imp.h
@@ -248,7 +248,7 @@ struct _i1proimp {
 							/* 0x81 == emission only ?? */
 							/* 0x82 == UV filter */
 	int capabilities2;		/* Rev E capabilities - set #defines above */
-							/* Also set for RevA-D */
+							/* Also set for RevA-D to simplify capability testing */
 
 	/* Underlying calibration information */
 	int nsen;				/* Raw + extra sample bands read = 128 for i1pro, 136 for Rev E */
@@ -1290,14 +1290,45 @@ typedef enum {
 
 	key2_wlcal_max  = 0x2f46,	/* double, wavelength calibration error limit, ie. 5.0 */
  
-	key2_wlpoly_1   = 0x2f62,	/* double[4], CCD bin to wavelength polinomial #1 (normal) */
-	key2_wlpoly_2   = 0x2f63,	/* double[4], CCD bin to wavelength polinomial #2 ??? */
+	key2_wlpoly_1   = 0x2f62,	/* double[4], CCD bin to wavelength polinomial #1 (reflective ?) */
+	key2_wlpoly_2   = 0x2f63,	/* double[4], CCD bin to wavelength polinomial #2 (emissive ?) */
 
 	key2_straylight = 0x2f58,	/* int16[36][6] signed stray light values */
 	key2_straylight_scale = 0x2f59	/* double stray light scale factor */
 
 } i1key;
 
+/*
+
+Missing keys for Stripped down OEM i1pro2 (Capabilities2 flag = 0x30)
+i.e. missing Ambient, WL Led, UV Led, Zebra ruller,    
+     has indicator Leds, UV filter.
+
+Table entry 34 is Key 0x0bba, type 3 addr 0x1c4c, size 4	Unkn
+
+Table entry 5 is Key 0x2eea, type 3 addr 0x2218, size 4		Unkn
+Table entry 6 is Key 0x2eeb, type 3 addr 0x221c, size 4		key2_sens_target
+Table entry 9 is Key 0x2ef5, type 4 addr 0x2228, size 4		Unkn
+Table entry 10 is Key 0x2ef6, type 4 addr 0x222c, size 4	Unkn
+Table entry 11 is Key 0x2ef9, type 4 addr 0x2230, size 4	key2_uvcal_intt
+Table entry 12 is Key 0x2efa, type 4 addr 0x2234, size 4	key2_wlcal_intt
+Table entry 13 is Key 0x2efe, type 3 addr 0x2238, size 4	key2_wlcal_minlev
+Table entry 14 is Key 0x2eff, type 3 addr 0x223c, size 4	Unkn
+Table entry 21 is Key 0x2f44, type 4 addr 0x2258, size 200	key2_wlcal_spec
+Table entry 22 is Key 0x2f45, type 3 addr 0x2320, size 4	key2_wlcal_ooff
+Table entry 23 is Key 0x2f46, type 4 addr 0x2324, size 4	key2_wlcal_max
+Table entry 24 is Key 0x2f4e, type 4 addr 0x2328, size 4	key2_wlcal_fwhm
+Table entry 25 is Key 0x2f4f, type 4 addr 0x232c, size 4	key2_wlcal_fwhm_tol
+Table entry 26 is Key 0x2f50, type 4 addr 0x2330, size 4	Unkn
+Table entry 29 is Key 0x2f62, type 4 addr 0x2d58, size 16	key2_wlpoly_1
+Table entry 31 is Key 0x2f6c, type 4 addr 0x2d78, size 8	Unkn
+Table entry 32 is Key 0x2f6d, type 4 addr 0x2d80, size 4	Unkn
+Table entry 33 is Key 0x2f6e, type 4 addr 0x2d84, size 4	Unkn
+Table entry 34 is Key 0x2f76, type 4 addr 0x2d88, size 72	Unkn
+Table entry 35 is Key 0x2f77, type 4 addr 0x2dd0, size 72	Unkn
+
+*/
+
 
 /* Data type */
 typedef enum {