thr3ads.net - Nut upsdev - [Nut-upsdev] UPower: 95-upower-hid.rules update [May 2015]

If this information is useful, please help other people find it:
Share via:

Arnaud Quette

2015-May-29 11:59 UTC

[Nut-upsdev] UPower: 95-upower-hid.rules update

Hi Richard and the list,

you'll find attached a patch for 95-upower-hid.rules, which adds:
- the "usbmisc" filtering, as added in your repo,
- more comments, including one that points at your UPower repo,
- 3 new manufacturers (Minibox, iDowell and Powerware)
- a bunch of new devices (7 HP,  1 APC, 1 TrippLite, 2 PowerCOM and 2
Liebert)

cheers,
Arnaud
-- 
Eaton Data Center Automation - Opensource Leader
NUT (Network UPS Tools) Project Leader - http://www.networkupstools.org
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.fr
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.alioth.debian.org/pipermail/nut-upsdev/attachments/20150529/c6e8b324/attachment.html>
-------------- next part --------------
--- upower/rules/95-upower-hid.rules	2015-05-29 13:53:23.049748923 +0200
+++ GIThub-NUT/scripts/upower/95-upower-hid.rules	2015-05-29 13:45:58.097213385
+0200
@@ -1,10 +1,13 @@
 ##############################################################################################################
 # Uninterruptible Power Supplies with USB HID interfaces
 #
-# to keep up to date, monitor:
http://svn.debian.org/wsvn/nut/trunk/scripts/upower/95-upower-hid.rules
+# This file was automatically generated by NUT (nut/tools/nut-usbinfo.pl)
+# to keep up to date, monitor upstream NUT
https://github.com/networkupstools/nut/commits/master/scripts/upower/95-upower-hid.rules
+# and upstream UPower
http://cgit.freedesktop.org/upower/tree/rules/95-upower-hid.rules
 
-# only support USB, else ignore
+# newer hiddev are part of the usbmisc class
 SUBSYSTEM=="usbmisc", GOTO="up_hid_chkdev"
+# only support USB, else ignore
 SUBSYSTEM!="usb", GOTO="up_hid_end"
 
 # if usbraw device, ignore
@@ -17,21 +20,31 @@
 ATTRS{idVendor}=="03f0", ENV{UPOWER_VENDOR}="Hewlett
Packard"
 ATTRS{idVendor}=="0463", ENV{UPOWER_VENDOR}="Eaton"
 ATTRS{idVendor}=="047c", ENV{UPOWER_VENDOR}="Dell"
+ATTRS{idVendor}=="04d8", ENV{UPOWER_VENDOR}="Minibox"
 ATTRS{idVendor}=="050d", ENV{UPOWER_VENDOR}="Belkin"
 ATTRS{idVendor}=="051d", ENV{UPOWER_VENDOR}="APC"
-ATTRS{idVendor}=="06da", ENV{UPOWER_VENDOR}="Liebert"
+ATTRS{idVendor}=="0592", ENV{UPOWER_VENDOR}="Powerware"
+ATTRS{idVendor}=="06da", ENV{UPOWER_VENDOR}="Phoenixtec Power
Co., Ltd"
+ATTRS{idVendor}=="075d", ENV{UPOWER_VENDOR}="iDowell"
 ATTRS{idVendor}=="0764", ENV{UPOWER_VENDOR}="Cyber Power
Systems"
 ATTRS{idVendor}=="09ae", ENV{UPOWER_VENDOR}="TrippLite"
 ATTRS{idVendor}=="0d9f", ENV{UPOWER_VENDOR}="PowerCOM"
 ATTRS{idVendor}=="10af", ENV{UPOWER_VENDOR}="Liebert"
 
 # Hewlett Packard
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="0001",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f06",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f08",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f09",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1f0a",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe0",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe1",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe2",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe3",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe5",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe6",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe7",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="03f0", ATTRS{idProduct}=="1fe8",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
 # Eaton
 ATTRS{idVendor}=="0463", ATTRS{idProduct}=="0001",
ENV{UPOWER_BATTERY_TYPE}="ups"
@@ -40,6 +53,10 @@
 # Dell
 ATTRS{idVendor}=="047c", ATTRS{idProduct}=="ffff",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
+# Minibox
+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d004",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="d005",
ENV{UPOWER_BATTERY_TYPE}="ups"
+
 # Belkin
 ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0375",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0551",
ENV{UPOWER_BATTERY_TYPE}="ups"
@@ -49,15 +66,23 @@
 ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0910",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0912",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0980",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="050d", ATTRS{idProduct}=="0f51",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="050d", ATTRS{idProduct}=="1100",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
 # APC
+ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0000",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0002",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="051d", ATTRS{idProduct}=="0003",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
-# Liebert
+# Powerware
+ATTRS{idVendor}=="0592", ATTRS{idProduct}=="0004",
ENV{UPOWER_BATTERY_TYPE}="ups"
+
+# Phoenixtec Power Co., Ltd
 ATTRS{idVendor}=="06da", ATTRS{idProduct}=="ffff",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
+# iDowell
+ATTRS{idVendor}=="075d", ATTRS{idProduct}=="0300",
ENV{UPOWER_BATTERY_TYPE}="ups"
+
 # Cyber Power Systems
 ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0005",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="0764", ATTRS{idProduct}=="0501",
ENV{UPOWER_BATTERY_TYPE}="ups"
@@ -86,6 +111,7 @@
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3013",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3014",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3015",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="3016",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4001",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4002",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4003",
ENV{UPOWER_BATTERY_TYPE}="ups"
@@ -96,6 +122,8 @@
 ATTRS{idVendor}=="09ae", ATTRS{idProduct}=="4008",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
 # PowerCOM
+ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="0001",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="0004",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a2",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a3",
ENV{UPOWER_BATTERY_TYPE}="ups"
 ATTRS{idVendor}=="0d9f", ATTRS{idProduct}=="00a4",
ENV{UPOWER_BATTERY_TYPE}="ups"
@@ -104,5 +132,7 @@
 
 # Liebert
 ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0001",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0004",
ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="10af", ATTRS{idProduct}=="0008",
ENV{UPOWER_BATTERY_TYPE}="ups"
 
 LABEL="up_hid_end"

Bastien Nocera

2015-May-29 12:09 UTC

head link

[Nut-upsdev] UPower: 95-upower-hid.rules update

On Fri, 2015-05-29 at 13:59 +0200, Arnaud Quette wrote:> Hi Richard and the list,
> 
> you'll find attached a patch for 95-upower-hid.rules, which adds:
> - the "usbmisc" filtering, as added in your repo,
> - more comments, including one that points at your UPower repo,
> - 3 new manufacturers (Minibox, iDowell and Powerware)
> - a bunch of new devices (7 HP,  1 APC, 1 TrippLite, 2 PowerCOM and 2 
> Liebert)
Could you please split those changes into 3 separate patches?

It would also be useful to include a full URL to the NUT Perl script
(to a git repository perhaps), so people don't need to check out the
full repo to update it.

Cheers

Bastien Nocera

2015-May-29 12:10 UTC

head link

[Nut-upsdev] UPower: 95-upower-hid.rules update

On Fri, 2015-05-29 at 14:09 +0200, Bastien Nocera wrote:> On Fri, 2015-05-29 at 13:59 +0200, Arnaud Quette wrote:
> > Hi Richard and the list,
> > 
> > you'll find attached a patch for 95-upower-hid.rules, which adds:
> > - the "usbmisc" filtering, as added in your repo,
> > - more comments, including one that points at your UPower repo,
> > - 3 new manufacturers (Minibox, iDowell and Powerware)
> > - a bunch of new devices (7 HP,  1 APC, 1 TrippLite, 2 PowerCOM and 
> > 2 
> > Liebert)
> 
> Could you please split those changes into 3 separate patches?
> 
> It would also be useful to include a full URL to the NUT Perl script
> (to a git repository perhaps), so people don't need to check out the
> full repo to update it.
There's also a few UPS related bugs in:
https://bugzilla.freedesktop.org/buglist.cgi?component=general&list_id=545920&product=upower&resolution=---

It would be helpful if you could comment on those (I don't have a UPS
to test).

Cheers

Charles Lepple

2015-May-29 22:57 UTC

head link

[Nut-upsdev] UPower: 95-upower-hid.rules update

On May 29, 2015, at 8:09 AM, Bastien Nocera <hadess at hadess.net> wrote:
> It would also be useful to include a full URL to the NUT Perl script
> (to a git repository perhaps), so people don't need to check out the
> full repo to update it.
I'm not sure how useful the nut-usbinfo.pl script will be without the NUT
repository: it scans the NUT source files for certain macros containing USB VIDs
and PIDs.

The NUT URL listed in the file
<https://github.com/networkupstools/nut/commits/master/scripts/upower/95-upower-hid.rules>
refers to the history of a checked-in version of the output of nut-usbinfo.pl.
The file itself is two clicks away, but if it would help, we could include that
URL as well.

We're certainly open to suggestions as to how we can handle this better (the
concept of checking in an auto-generated file irks me), but for the benefit of
those of us who aren't as familiar with UPower, is there an introduction to
how this information is used outside of NUT?

-- 
Charles Lepple
clepple at gmail

Arnaud Quette

2015-May-30 16:51 UTC

head link

[Nut-upsdev] UPower: 95-upower-hid.rules update

2015-05-29 14:09 GMT+02:00 Bastien Nocera <hadess at hadess.net>:
> On Fri, 2015-05-29 at 13:59 +0200, Arnaud Quette wrote:
> > Hi Richard and the list,
> >
> > you'll find attached a patch for 95-upower-hid.rules, which adds:
> > - the "usbmisc" filtering, as added in your repo,
> > - more comments, including one that points at your UPower repo,
> > - 3 new manufacturers (Minibox, iDowell and Powerware)
> > - a bunch of new devices (7 HP,  1 APC, 1 TrippLite, 2 PowerCOM and 2
> > Liebert)
>
> Could you please split those changes into 3 separate patches?
>
since you already have the "usbmisc", I can possibly check to split in
2
commits (1 for the comments, and 1 for the content update).
would that suits you that way?

It would also be useful to include a full URL to the NUT Perl
script> (to a git repository perhaps), so people don't need to check out the
> full repo to update it.
>
as per Charles comments, beside from the perl script, you need all the
drivers/*hid.c files to extract the USB info.
the added comment was just to shed light on the fact that it's an automated
data extraction.
I can reword to make it more clear if you want.

cheers,
Arno
-- 
Eaton Data Center Automation - Opensource Leader
NUT (Network UPS Tools) Project Leader - http://www.networkupstools.org
Debian Developer - http://www.debian.org
Free Software Developer - http://arnaud.quette.fr
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
<http://lists.alioth.debian.org/pipermail/nut-upsdev/attachments/20150530/14d0711a/attachment.html>

Reasonably Related Threads

Search for more possibly parallel threads

Nut upsdev - May 2015 - UPower: 95-upower-hid.rules update

[Nut-upsdev] UPower: 95-upower-hid.rules update

[Nut-upsdev] UPower: 95-upower-hid.rules update

[Nut-upsdev] UPower: 95-upower-hid.rules update

[Nut-upsdev] UPower: 95-upower-hid.rules update

[Nut-upsdev] UPower: 95-upower-hid.rules update

Reasonably Related Threads