Add defines and artwork for the Spyder5 devicecolord-1-0

6 files changed, 226 insertions, 1 deletions

diff --git a/data/figures/Makefile.am b/data/figures/Makefile.am
index d1d6323..588f61e 100644
--- a/data/figures/Makefile.am
+++ b/data/figures/Makefile.am
@@ -16,7 +16,8 @@ icons_DATA = 	 				\
 	color-munki-photo-screen.svg		\
 	spyder2-attach.svg			\
 	spyder3-attach.svg			\
-	spyder4-attach.svg
+	spyder4-attach.svg			\
+	spyder5-attach.svg
 
 EXTRA_DIST =				\
 	$(icons_DATA)
diff --git a/data/figures/spyder5-attach.svg b/data/figures/spyder5-attach.svg
new file mode 100644
index 0000000..783f8d4
--- /dev/null
+++ b/data/figures/spyder5-attach.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg7384"
+   sodipodi:docname="spyder5-attach.svg"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   height="300"
+   width="300">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:cy="167.99921"
+     pagecolor="#e5e6e4"
+     borderopacity="1"
+     showborder="false"
+     inkscape:bbox-paths="false"
+     guidetolerance="10"
+     inkscape:object-paths="true"
+     inkscape:window-width="1920"
+     showguides="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-bbox="true"
+     inkscape:pageshadow="2"
+     inkscape:guide-bbox="true"
+     inkscape:snap-nodes="true"
+     bordercolor="#666666"
+     objecttolerance="10"
+     id="namedview88"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     inkscape:window-x="0"
+     inkscape:snap-global="true"
+     inkscape:window-y="867"
+     gridtolerance="10"
+     inkscape:window-height="1016"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:current-layer="layer12"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:zoom="1"
+     inkscape:cx="-13.545207"
+     inkscape:snap-grids="true"
+     inkscape:pageopacity="1">
+    <inkscape:grid
+       spacingx="1px"
+       spacingy="1px"
+       id="grid4866"
+       empspacing="2"
+       enabled="true"
+       type="xygrid"
+       snapvisiblegridlinesonly="true"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:label="figures"
+     transform="translate(-241.00018,67)"
+     inkscape:groupmode="layer"
+     id="layer12"
+     style="display:inline">
+    <rect
+       inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
+       x="241.00018"
+       y="-67"
+       id="rect5985-4"
+       inkscape:export-ydpi="90"
+       height="300"
+       inkscape:export-xdpi="90"
+       width="300"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+    <rect
+       inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
+       x="261.00018"
+       y="-47"
+       id="rect5985-4-4"
+       rx="4"
+       inkscape:export-ydpi="90"
+       height="260"
+       ry="4"
+       inkscape:export-xdpi="90"
+       width="260"
+       style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+    <path
+       inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
+       inkscape:connector-curvature="0"
+       d="m 394.0002,232.00002 0,-48.78125 -6,-4 0,48.78125 z"
+       id="rect3883-1-8-5-1-8"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#eeeeec;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+    <path
+       inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
+       inkscape:connector-curvature="0"
+       d="m 394.0002,232.00002 0,-48.78125 -6,-4 0,48.78125 z"
+       id="rect3883-1-8-5-1"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+    <path
+       inkscape:export-filename="/home/lapo.fedora/colorimeters1.png"
+       inkscape:connector-curvature="0"
+       d="m 394.0002,236.00002 0,-1.78125 -6,-4 0,1.78125 z"
+       id="rect3883-1-8-5-0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       style="color:#000000;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 334.48502,-17.817865 c -29.69759,18.2821881 -50.73313,53.004609 -52.5,92.5 28.35906,28.631135 48.23283,61.858465 57.5,96.500005 36.93443,17.86456 72.45465,17.34434 105.5,-0.5 12.97616,-37.56179 31.20681,-69.33854 55.03033,-98.616122 -3.54475,-39.909604 -20.52453,-70.0964911 -52.53033,-90.383883 -36.95956,9.7126083 -75.33333,9.1721682 -113,0.5 z"
+       id="path4274"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="opacity:1;fill:#afb3aa;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4276"
+       sodipodi:type="arc"
+       sodipodi:cx="392.48502"
+       sodipodi:cy="78.432137"
+       sodipodi:rx="74.368927"
+       sodipodi:ry="74.368927"
+       sodipodi:start="2.700705"
+       sodipodi:end="2.69978"
+       sodipodi:open="true"
+       d="M 325.22775,110.16851 A 74.368927,74.368927 0 0 1 360.73309,11.182211 74.368927,74.368927 0 0 1 459.7276,46.664659 74.368927,74.368927 0 0 1 424.26804,145.66737 74.368927,74.368927 0 0 1 325.25713,110.23071" />
+    <path
+       d="m 327.80069,108.95443 a 71.523933,71.523933 0 0 1 34.14707,-95.199563 71.523933,71.523933 0 0 1 95.20746,34.125061 71.523933,71.523933 0 0 1 -34.10304,95.215352 71.523933,71.523933 0 0 1 -95.22323,-34.08103"
+       sodipodi:open="true"
+       sodipodi:end="2.69978"
+       sodipodi:start="2.700705"
+       sodipodi:ry="71.523933"
+       sodipodi:rx="71.523933"
+       sodipodi:cy="78.432137"
+       sodipodi:cx="392.48502"
+       sodipodi:type="arc"
+       id="path4293"
+       style="opacity:1;fill:#babdb6;fill-opacity:1;stroke:none;stroke-width:0.9617449;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.9617449;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4304"
+       sodipodi:type="arc"
+       sodipodi:cx="392.48502"
+       sodipodi:cy="78.432137"
+       sodipodi:rx="13.174217"
+       sodipodi:ry="13.174217"
+       sodipodi:start="2.700705"
+       sodipodi:end="2.69978"
+       sodipodi:open="true"
+       d="m 380.57061,84.054134 a 13.174217,13.174217 0 0 1 6.28965,-17.535106 13.174217,13.174217 0 0 1 17.53656,6.285602 13.174217,13.174217 0 0 1 -6.28154,17.538013 13.174217,13.174217 0 0 1 -17.53947,-6.277491" />
+    <text
+       transform="scale(1.0503841,0.95203268)"
+       x="373.61789"
+       y="56.287567"
+       id="text4078-2"
+       xml:space="preserve"
+       sodipodi:linespacing="125%"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:16.80065346px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell Bold';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#eeeeec;fill-opacity:1;stroke:none"><tspan
+         x="373.61789"
+         y="56.287567"
+         sodipodi:role="line"
+         id="tspan4080-2">HughSyer5</tspan></text>
+    <text
+       transform="scale(0.83613746,1.1959756)"
+       x="426.8038"
+       y="98.233635"
+       id="text4086-1"
+       xml:space="preserve"
+       sodipodi:linespacing="125%"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:6.4469943px;line-height:125%;font-family:Cantarell;-inkscape-font-specification:'Cantarell Bold';letter-spacing:0px;word-spacing:0px;display:inline;fill:#eeeeec;fill-opacity:1;stroke:none"><tspan
+         x="426.8038"
+         y="98.233635"
+         sodipodi:role="line"
+         id="tspan4088-9"> MINI ESPRESSO</tspan></text>
+    <path
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path4342"
+       d="m 334.90819,-15.319519 c -29.01198,17.860115 -49.06187,50.780915 -50.78796,89.364493 25.70435,24.720136 48.3693,63.180366 56.92253,95.772146 36.08174,17.45213 70.03192,16.94392 102.31436,-0.48845 12.67659,-36.69462 31.11136,-69.23775 54.38488,-97.839416 -3.46292,-38.988228 -19.55069,-67.7282042 -50.81759,-87.54723 -39.35629,9.4883776 -71.96915,9.2104144 -112.01622,0.738457 z"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#babdb6;stroke-width:1.9538269;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 382.16933,83.299753 a 11.40645,11.40645 0 0 1 5.44568,-15.182179 11.40645,11.40645 0 0 1 15.18344,5.442176 11.40645,11.40645 0 0 1 -5.43866,15.184695 11.40645,11.40645 0 0 1 -15.18596,-5.435153"
+       sodipodi:open="true"
+       sodipodi:end="2.69978"
+       sodipodi:start="2.700705"
+       sodipodi:ry="11.40645"
+       sodipodi:rx="11.40645"
+       sodipodi:cy="78.432137"
+       sodipodi:cx="392.48502"
+       sodipodi:type="arc"
+       id="path4368"
+       style="opacity:1;fill:#dbdcd9;fill-opacity:1;stroke:none;stroke-width:0.9617449;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/lib/colord/cd-enum.c b/lib/colord/cd-enum.c
index eba4664..752b10d 100644
--- a/lib/colord/cd-enum.c
+++ b/lib/colord/cd-enum.c
@@ -70,6 +70,7 @@ static const CdEnumMatch enum_sensor_kind[] = {
 	{CD_SENSOR_KIND_SPYDER2,			"spyder2"},
 	{CD_SENSOR_KIND_SPYDER3,			"spyder3"},
 	{CD_SENSOR_KIND_SPYDER4,			"spyder4"},
+	{CD_SENSOR_KIND_SPYDER5,			"spyder5"},
 	{CD_SENSOR_KIND_SPYDER,				"spyder"},
 	{0, NULL}
 };
diff --git a/lib/colord/cd-enum.h b/lib/colord/cd-enum.h
index a2078ca..59e0cc0 100644
--- a/lib/colord/cd-enum.h
+++ b/lib/colord/cd-enum.h
@@ -183,6 +183,7 @@ typedef enum {
 	CD_SENSOR_KIND_SPYDER4,			/* Since: 0.1.26 */
 	CD_SENSOR_KIND_COLOR_MUNKI_SMILE,	/* Since: 0.1.27 */
 	CD_SENSOR_KIND_COLORHUG2,		/* Since: 1.2.2 */
+	CD_SENSOR_KIND_SPYDER5,			/* Since: 1.2.11 */
 	/*< private >*/
 	CD_SENSOR_KIND_LAST
 } CdSensorKind;
diff --git a/rules/69-cd-sensors.rules.in b/rules/69-cd-sensors.rules.in
index 92b296b..d47eeee 100644
--- a/rules/69-cd-sensors.rules.in
+++ b/rules/69-cd-sensors.rules.in
@@ -66,6 +66,9 @@ ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0300", ENV{COLORD_SENSOR_KIND}="spyd
 # Spyder 4
 ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0400", ENV{COLORD_SENSOR_KIND}="spyder4", ENV{COLORD_SENSOR_CAPS}="lcd crt ambient"
 
+# Spyder 5
+ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0500", ENV{COLORD_SENSOR_KIND}="spyder5", ENV{COLORD_SENSOR_CAPS}="lcd crt ambient"
+
 # Huey
 ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLORD_SENSOR_KIND}="huey"
 
diff --git a/src/sensors/cd-sensor-argyll.c b/src/sensors/cd-sensor-argyll.c
index f8fc6e0..e9a7674 100644
--- a/src/sensors/cd-sensor-argyll.c
+++ b/src/sensors/cd-sensor-argyll.c
@@ -367,6 +367,8 @@ cd_sensor_to_argyll_name (CdSensor *sensor)
 		return "Datacolor Spyder3";
 	case CD_SENSOR_KIND_SPYDER:
 		return "Datacolor Spyder4";
+	case CD_SENSOR_KIND_SPYDER5:
+		return "Datacolor Spyder5";
 	case CD_SENSOR_KIND_HUEY:
 		return "GretagMacbeth Huey";
 	case CD_SENSOR_KIND_COLORHUG: