From 094535c010320967639e8e86f974d878e80baa72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 1 May 2015 16:13:57 +0200 Subject: Imported Upstream version 1.7.0 --- usb/45-Argyll.rules | 47 +++++++++++++++------------ usb/55-Argyll.rules | 86 +++++++++++++++++++++++++++++++++----------------- usb/Argyll | 4 +-- usb/Argyll.usermap | 3 ++ usb/ArgyllCMS.cat | Bin 3299 -> 3551 bytes usb/ArgyllCMS.inf | 16 ++++++++++ usb/ArgyllCMS.inf.d | 5 +++ usb/ArgyllCMS.inf.t | 1 + usb/ArgyllCMS_x64.cat | Bin 3283 -> 3535 bytes 9 files changed, 111 insertions(+), 51 deletions(-) (limited to 'usb') diff --git a/usb/45-Argyll.rules b/usb/45-Argyll.rules index 3f89f69..538aa72 100644 --- a/usb/45-Argyll.rules +++ b/usb/45-Argyll.rules @@ -3,60 +3,67 @@ # Copy to /etc/udev/rules.d/45-Argyll.rules # Colorimtre HCFR -SYSFS{idVendor}=="04db", SYSFS{idProduct}=="005b", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="04db", SYSFS{idProduct}=="005b", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # MonacoOPTIX (Same as i1 Display 1) -SYSFS{idVendor}=="0670", SYSFS{idProduct}=="0001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0670", SYSFS{idProduct}=="0001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Huey (Lenovo W70DS Laptop ?) -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Huey (Lenovo W530 Laptop ?) -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5010", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5010", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # i1Display 3 -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5020", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="5020", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # ColorMunki Smile -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="6003", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="6003", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # DTP20 -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d020", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d020", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # DTP92Q - not tested -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d092", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d092", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # DTP94 -SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d094", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0765", SYSFS{idProduct}=="d094", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Spyder 1 -SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0100", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0100", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Spyder 2 -SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0200", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0200", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Spyder 3 -SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0300", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0300", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Spyder 4 -SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0400", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0400", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" + +# Spyder 5 +SYSFS{idVendor}=="085c", SYSFS{idProduct}=="0500", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # i1Pro -SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2000", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2000", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # i1Monitor -SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # i1Display -SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2003", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2003", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # Huey -SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2005", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2005", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # ColorMunki -SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2007", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="0971", SYSFS{idProduct}=="2007", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" # ColorHug -SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="f8da", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" -SYSFS{idVendor}=="273f", SYSFS{idProduct}=="1001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="plugdev" +SYSFS{idVendor}=="04d8", SYSFS{idProduct}=="f8da", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" +SYSFS{idVendor}=="273f", SYSFS{idProduct}=="1001", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" +SYSFS{idVendor}=="273f", SYSFS{idProduct}=="1004", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" + +# Image Engineering +SYSFS{idVendor}=="2457", SYSFS{idProduct}=="4000", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="660", GROUP="colord" diff --git a/usb/55-Argyll.rules b/usb/55-Argyll.rules index 5fef930..527014b 100644 --- a/usb/55-Argyll.rules +++ b/usb/55-Argyll.rules @@ -1,90 +1,118 @@ +# Version=1.7.0 # udev rule to recognize instruments and make them accessible to user applications. # Copy this to /etc/udev/rules.d/55-Argyll.rules +# or /usr/lib/udev/rules.d/55-Argyll.rules +# and remove /usr/lib/udev/rules.d/69-cd-sensors.rules +# as appropriate for your system # Skip all this to speed things up if it'a not a usb add. ACTION!="add", GOTO="argyll_rules_end" SUBSYSTEM!="usb", GOTO="argyll_rules_end" # Recognize the color measurement devices +# COLORD_SENSOR_KIND, COLORD_SENSOR_CAPS, COLORD_SENSOR_EMBEDDED, COLORD_IGNORE +# are for the benefit of Gnome Color Manager - ArgyllCMS doesn't use them. # Colorimtre HCFR -ATTRS{idVendor}=="04db", ATTRS{idProduct}=="005b", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="04db", ATTRS{idProduct}=="005b", ENV{COLORD_SENSOR_KIND}="colorimtre-hcfr", ENV{COLORD_SENSOR_CAPS}="projector" # MonacoOPTIX (Same as i1 Display 1) -ATTRS{idVendor}=="0670", ATTRS{idProduct}=="0001", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0670", ATTRS{idProduct}=="0001", ENV{COLORD_SENSOR_KIND}="i1-display1", ENV{COLORD_SENSOR_CAPS}="lcd crt" # HueyL (not tested) -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5001", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5001", ENV{COLORD_SENSOR_KIND}="huey", ENV{COLORD_SENSOR_CAPS}="lcd crt" ENV{COLORD_SENSOR_EMBEDDED}="1" # HueyL (not tested) -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5010", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5010", ENV{COLORD_SENSOR_KIND}="huey", ENV{COLORD_SENSOR_CAPS}="lcd crt" ENV{COLORD_SENSOR_EMBEDDED}="1" # i1Display 3 -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5020", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="5020", ENV{COLORD_SENSOR_KIND}="i1-display3", ENV{COLORD_SENSOR_CAPS}="lcd crt projector ambient" # ColorMunki Smile -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="6003", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="6003", ENV{COLORD_SENSOR_KIND}="color-munki-smile", ENV{COLORD_SENSOR_CAPS}="lcd-ccfl lcd-white-led" # DTP20 -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d020", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d020", ENV{COLORD_SENSOR_KIND}="dtp20" ENV{COLORD_SENSOR_CAPS}="printer spot" # DTP92Q (not tested) -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d092", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d092", ENV{COLORD_SENSOR_KIND}="dtp92" ENV{COLORD_SENSOR_CAPS}="crt" # DTP94 -ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d094", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0765", ATTRS{idProduct}=="d094", ENV{COLORD_SENSOR_KIND}="dtp94" ENV{COLORD_SENSOR_CAPS}="lcd crt" # i1Pro -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2000", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2000", ENV{COLORD_SENSOR_KIND}="i1-pro" ENV{COLORD_SENSOR_CAPS}="lcd crt projector printer ambient" # i1Monitor -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2001", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2001", ENV{COLORD_SENSOR_KIND}="i1-pro" ENV{COLORD_SENSOR_CAPS}="lcd crt" # i1Display -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2003", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2003", ENV{COLORD_SENSOR_KIND}="i1-display1" ENV{COLORD_SENSOR_CAPS}="lcd crt" # i1 io table (not tested) -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2004", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2004", ENV{COLORD_SENSOR_KIND}="i1-pro" ENV{COLORD_SENSOR_CAPS}="printer" # Huey -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLORD_SENSOR_KIND}="huey" ENV{COLORD_SENSOR_CAPS}="lcd crt ambient" # i1 iSis (not tested) -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2006", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2006", ENV{COLORD_SENSOR_KIND}="iSis" ENV{COLORD_SENSOR_CAPS}="printer" # ColorMunki -ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2007", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2007", ENV{COLORD_SENSOR_KIND}="color-munki-photo" ENV{COLORD_SENSOR_CAPS}="lcd crt projector printer spot ambient" # Spyder 1 -ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0100", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0100", ENV{COLORD_SENSOR_KIND}="spyder1" ENV{COLORD_SENSOR_CAPS}="lcd crt" # Spyder 2 -ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0200", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0200", ENV{COLORD_SENSOR_KIND}="spyder2" ENV{COLORD_SENSOR_CAPS}="lcd crt" # Spyder 3 -ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0300", ENV{COLOR_MEASUREMENT_DEVICE}="1" +ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0300", ENV{COLORD_SENSOR_KIND}="spyder3" ENV{COLORD_SENSOR_CAPS}="lcd crt ambient" # Spyder 4 -ATTRS{idVendor}=="085c", ATTRS{idProduct}=="0400", ENV{COLOR_MEASUREMENT_DEVICE}="1" +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" -# ColorHug, old and new -ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLOR_MEASUREMENT_DEVICE}="1" -ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLOR_MEASUREMENT_DEVICE}="1" +# JETI & KLEIN FTDI +#KERNEL=="ttyUSB[0-9]*", TAG+="udev-acl", TAG+="uaccess" +# ColorHug, old and new USB ID's, ColorHug 2 +ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLORD_SENSOR_KIND}="colorhug" ENV{COLORD_SENSOR_CAPS}="lcd" ENV{COLORD_IGNORE}="1" -# Let udev-acl manage these devices, if it's available -TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1" +ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1001", ENV{COLORD_SENSOR_KIND}="colorhug" ENV{COLORD_SENSOR_CAPS}="lcd" + +ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1004", ENV{COLORD_SENSOR_KIND}="colorhug" ENV{COLORD_SENSOR_CAPS}="lcd" + +# ColorHug Spectro +ATTRS{idVendor}=="273f", ATTRS{idProduct}=="1002", ENV{COLORD_SENSOR_KIND}="colorhug-spectro", ENV{COLORD_SENSOR_CAPS}="lcd" + +# Image Engineering +ATTRS{idVendor}=="2457", ATTRS{idProduct}=="4000", ENV{COLORD_SENSOR_KIND}="ex1", ENV{COLORD_SENSOR_CAPS}="lcd crt ambient" -# Otherwise, restrict access to members of the plugdev group, -# which the user may have to add to the system. -ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev" +######################################################### +# color calibration device +ENV{COLORD_SENSOR_KIND}=="*?", ENV{COLOR_MEASUREMENT_DEVICE}="1" # Set ID_VENDOR and ID_MODEL acording to VID and PID -TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" +#TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" +ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL}=="", IMPORT{program}="usb_id --export %p" +ENV{COLORD_SENSOR_KIND}=="*?", ENV{ID_MODEL_FROM_DATABASE}=="", IMPORT{program}="usb-db %p" + +# Debian has +# ...., TAG+="uaccess", TAG+="udev-acl" # Debian, but should be in 70-uaccess.rules + +# Let udev-acl manage these devices, if it's available +TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1" + +# Otherwise, restrict access to members of the colord group, +# which the user may have to add to the system and add themselves to. +ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="colord" LABEL="argyll_rules_end" diff --git a/usb/Argyll b/usb/Argyll index b16d929..b7eebc2 100644 --- a/usb/Argyll +++ b/usb/Argyll @@ -1,9 +1,9 @@ #!/bin/sh # Copy to /etc/hotplug/usb/Argyll # -# Argyll hotplug script. Adds the USB devices to the plugdev group. +# Argyll hotplug script. Adds the USB devices to the colord group. if [ "${ACTION}" = "add" ] && [ -f "${DEVICE}" ] then - chgrp plugdev "${DEVICE}" + chgrp colord "${DEVICE}" chmod 660 "${DEVICE}" fi diff --git a/usb/Argyll.usermap b/usb/Argyll.usermap index 00a350c..652728a 100644 --- a/usb/Argyll.usermap +++ b/usb/Argyll.usermap @@ -45,6 +45,9 @@ Argyll 0x0003 0x085C 0x0300 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x000000 # Spyder 4 Argyll 0x0003 0x085C 0x0400 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # +# Spyder 5 +Argyll 0x0003 0x085C 0x0500 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# # Huey Argyll 0x0003 0x0971 0x2005 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # diff --git a/usb/ArgyllCMS.cat b/usb/ArgyllCMS.cat index 4634140..3fb638a 100644 Binary files a/usb/ArgyllCMS.cat and b/usb/ArgyllCMS.cat differ diff --git a/usb/ArgyllCMS.inf b/usb/ArgyllCMS.inf index 115d981..4de9f51 100644 --- a/usb/ArgyllCMS.inf +++ b/usb/ArgyllCMS.inf @@ -107,6 +107,7 @@ ServiceBinary = %12%\libusb0.sys "ColorVision"=ColorVision_Devices,NTx86,NTamd64 "Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64 "Hughski Ltd"=Hughski_Devices,NTx86,NTamd64 +"Image Engineering"=ImageEngineering_Devices,NTx86,NTamd64 ; ==== Devices ==== @@ -131,6 +132,7 @@ ServiceBinary = %12%\libusb0.sys "Spyder2 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0200 "Spyder3 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0300 "Spyder4 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0400 +"Spyder5 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0500 [GM_X_Rite_Devices] "Eye-One Pro (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2000 @@ -140,9 +142,13 @@ ServiceBinary = %12%\libusb0.sys "ColorMunki (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2007 [Hughski_Devices] +"ColorHug 2 (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1004 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1001 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA +[ImageEngineering_Devices] +"EX1 (Argyll)" = LIBUSB0_DEV, USB\VID_2457&PID_4000 + [HCFR_Devices.NTx86] "Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B @@ -165,6 +171,7 @@ ServiceBinary = %12%\libusb0.sys "Spyder2 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0200 "Spyder3 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0300 "Spyder4 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0400 +"Spyder5 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0500 [GM_X_Rite_Devices.NTx86] "Eye-One Pro (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2000 @@ -174,9 +181,13 @@ ServiceBinary = %12%\libusb0.sys "ColorMunki (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2007 [Hughski_Devices.NTx86] +"ColorHug 2 (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1004 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1001 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA +[ImageEngineering_Devices.NTx86] +"EX1 (Argyll)" = LIBUSB0_DEV, USB\VID_2457&PID_4000 + [HCFR_Devices.NTamd64] "Colorimtre HCFR V3.1 (Argyll)" = LIBUSB0_DEV, USB\VID_04DB&PID_005B @@ -199,6 +210,7 @@ ServiceBinary = %12%\libusb0.sys "Spyder2 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0200 "Spyder3 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0300 "Spyder4 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0400 +"Spyder5 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0500 [GM_X_Rite_Devices.NTamd64] "Eye-One Pro (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2000 @@ -208,6 +220,10 @@ ServiceBinary = %12%\libusb0.sys "ColorMunki (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2007 [Hughski_Devices.NTamd64] +"ColorHug 2 (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1004 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1001 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA +[ImageEngineering_Devices.NTamd64] +"EX1 (Argyll)" = LIBUSB0_DEV, USB\VID_2457&PID_4000 + diff --git a/usb/ArgyllCMS.inf.d b/usb/ArgyllCMS.inf.d index 7836493..c130cee 100644 --- a/usb/ArgyllCMS.inf.d +++ b/usb/ArgyllCMS.inf.d @@ -20,6 +20,7 @@ "Spyder2 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0200 "Spyder3 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0300 "Spyder4 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0400 +"Spyder5 (Argyll)" = LIBUSB0_DEV, USB\VID_085C&PID_0500 [GM_X_Rite_Devices#PLAT#] "Eye-One Pro (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2000 @@ -29,6 +30,10 @@ "ColorMunki (Argyll)" = LIBUSB0_DEV, USB\VID_0971&PID_2007 [Hughski_Devices#PLAT#] +"ColorHug 2 (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1004 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_273F&PID_1001 "ColorHug (Argyll)" = LIBUSB0_DEV, USB\VID_04D8&PID_F8DA +[ImageEngineering_Devices#PLAT#] +"EX1 (Argyll)" = LIBUSB0_DEV, USB\VID_2457&PID_4000 + diff --git a/usb/ArgyllCMS.inf.t b/usb/ArgyllCMS.inf.t index 5721a3f..635d9ef 100644 --- a/usb/ArgyllCMS.inf.t +++ b/usb/ArgyllCMS.inf.t @@ -107,5 +107,6 @@ ServiceBinary = %12%\libusb0.sys "ColorVision"=ColorVision_Devices,NTx86,NTamd64 "Gretag Macbeth/X-Rite"=GM_X_Rite_Devices,NTx86,NTamd64 "Hughski Ltd"=Hughski_Devices,NTx86,NTamd64 +"Image Engineering"=ImageEngineering_Devices,NTx86,NTamd64 ; ==== Devices ==== diff --git a/usb/ArgyllCMS_x64.cat b/usb/ArgyllCMS_x64.cat index 11d6f5f..ea6999a 100644 Binary files a/usb/ArgyllCMS_x64.cat and b/usb/ArgyllCMS_x64.cat differ -- cgit v1.2.3