DeviceKit-power: USB/HID UPS rules update

[Arnaud Quette]

Hi Richard and the list,

you'll find attached a small patch for DeviceKit-power that update, complete
and sanitize the USB/HID UPS rules file.

note that I can automatically generate this file in the NUT tree, so that
you can easilly keep track of update from NUT. just tell me if you are
interested.

btw, there is a typo error on "DKP_DEVICE_TECHNOLGY_*" defines.

cheers,
Arnaud
-- 
Linux / Unix Expert R&D - Eaton - http://www.eaton.com/mgeops
Network UPS Tools (NUT) Project Leader - http://www.networkupstools.org/
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.free.fr/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.freedesktop.org/archives/devkit-devel/attachments/20090724/26cf6deb/attachment.html 
-------------- next part --------------
diff --git a/src/95-devkit-power-hid.rules b/src/95-devkit-power-hid.rules
index 3e23b43..6957dea 100644
--- a/src/95-devkit-power-hid.rules
+++ b/src/95-devkit-power-hid.rules
@@ -1,42 +1,51 @@
 ##############################################################################################################
 # Uninterruptable Power Supplies with USBHID interface
 #
-ATTR{idVendor}=="0463", ENV{ID_VENDOR}="MGE Systems"
-ATTR{idVendor}=="051d", ENV{ID_VENDOR}="APC"
-ATTR{idVendor}=="0764", ENV{ID_VENDOR}="CyberPower"
-ATTR{idVendor}=="09ae", ENV{ID_VENDOR}="Tripp Lite"
+# to keep up to date, monitor: http://svn.debian.org/wsvn/nut/trunk/scripts/udev/nut-usbups.rules.in
+#
+ATTR{idVendor}=="03f0", ENV{ID_VENDOR}="Hewlett Packard"
+ATTR{idVendor}=="0463", ENV{ID_VENDOR}="Eaton"
 ATTR{idVendor}=="050d", ENV{ID_VENDOR}="Belkin"
+ATTR{idVendor}=="051d", ENV{ID_VENDOR}="APC"
 ATTR{idVendor}=="06da", ENV{ID_VENDOR}="Liebert"
+ATTR{idVendor}=="0764", ENV{ID_VENDOR}="CyberPower"
 ATTR{idVendor}=="0925", ENV{ID_VENDOR}="Kebo"
+ATTR{idVendor}=="09ae", ENV{ID_VENDOR}="Tripp Lite"
 
-# MGE UPS SYSTEMS
+# Eaton (prev. MGE Office Protection Systems, prev. MGE UPS SYSTEMS)
 ATTR{idVendor}=="0463", ATTR{idProduct}=="0001", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="0463", ATTR{idProduct}=="0xffff", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="0463", ATTR{idProduct}=="ffff", ENV{DKP_BATTERY_TYPE}="ups"
 
 # APC
 ATTR{idVendor}=="051d", ATTR{idProduct}=="0002", ENV{DKP_BATTERY_TYPE}="ups"
 
+# Hewlett Packard
+ATTR{idVendor}=="03f0", ATTR{idProduct}=="1f0a", ENV{DKP_BATTERY_TYPE}="ups"
+
 # CyberPower
 ATTR{idVendor}=="0764", ATTR{idProduct}=="0005", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="0764", ATTR{idProduct}=="0x0501", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="0764", ATTR{idProduct}=="0501", ENV{DKP_BATTERY_TYPE}="ups"
 
 # Tripp Lite
 ATTR{idVendor}=="09ae", ATTR{idProduct}=="1003", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="0x2005", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="0x2007", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="0x3012", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="0x4002", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="09ae", ATTR{idProduct}=="0x4003", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="1007", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2005", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="2007", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3012", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="3014", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4001", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4002", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="09ae", ATTR{idProduct}=="4003", ENV{DKP_BATTERY_TYPE}="ups"
 
 # Belkin
 ATTR{idVendor}=="050d", ATTR{idProduct}=="0375", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x0551", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x0751", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x0900", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x0910", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x0912", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x0980", ENV{DKP_BATTERY_TYPE}="ups"
-ATTR{idVendor}=="050d", ATTR{idProduct}=="0x1100", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0551", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0751", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0900", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0910", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0912", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="0980", ENV{DKP_BATTERY_TYPE}="ups"
+ATTR{idVendor}=="050d", ATTR{idProduct}=="1100", ENV{DKP_BATTERY_TYPE}="ups"
 
 # Liebert
 ATTR{idVendor}=="06da", ATTR{idProduct}=="ffff", ENV{DKP_BATTERY_TYPE}="ups"