Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,22 @@ https://github.com/networkupstools/nut/milestone/13
128 bytes per poll (about 14 MB per day at `pollinterval=1`). It now
uses a static buffer like the other conversion functions. [issue #3787,
PR #3788]
* Added the `ugreen-hid` subdriver for the Ugreen US2000 (72 W DC UPS, USB
ID `2b89:ffff`). The device was previously unsupported by any subdriver
and no `hid2nut` mapping could reach it: its live telemetry arrives
unprompted as 64-byte HID Input reports with report ID `0x71`, which no
object in its report descriptor describes. The subdriver keeps the
standard PDC feature-report mappings and decodes that frame for
`output.current`, `ups.load`, `input.voltage`, `output.voltage`,
`battery.current`, `battery.charger.status` and `battery.temperature`.
Three feature reports of this firmware are hardcoded dummies (`ups.load`
and `input.voltage` always report `1`; `output.voltage` is a coarse
integer that reads high) and its `PresentStatus` flags are never set, so
`LB` can never be raised from the device; with `battery.charge` live, the
core `ignorelb` option plus `battery.charge.low` provides it instead.
The frame is decoded only for the product strings the subdriver lists;
sibling models on the same USB ID still claim the subdriver to get the
standard mappings, but publish no vendor values. [issue #3779]

- `snmp-ups` driver updates:
* Corrected the IETF fallback warning so it is emitted for automatic
Expand Down
2 changes: 2 additions & 0 deletions data/driver.list.in
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,8 @@

"TS Shara" "ups" "4" "(various)" "" "nutdrv_qx"

"UGREEN" "ups" "1" "US2000" "(USB ID 2b89:ffff)" "usbhid-ups"

"UltraMax" "ups" "2" "1000SC" "USB" "nutdrv_qx" # https://github.com/networkupstools/nut/issues/1634

"UNITEK" "ups" "2" "ALPHA 500 IC" "" "blazer_ser"
Expand Down
1 change: 1 addition & 0 deletions docs/man/usbhid-ups.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ At the present time, usbhid-ups supports:
- some Powercom models,
- some PowerWalker models,
- some TrippLite models,
- some UGREEN models (US2000),
- some Vertiv models (Liebert GXT5).

For a more complete list, refer to the NUT hardware compatibility list,
Expand Down
1 change: 1 addition & 0 deletions docs/nut.dict
Original file line number Diff line number Diff line change
Expand Up @@ -3650,6 +3650,7 @@ udevadm
udq
ufw
ugen
ugreen
ui
uid
uint
Expand Down
4 changes: 2 additions & 2 deletions drivers/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ if HAVE_WINDOWS
WINHID_IMPL = libwinhid.c
endif HAVE_WINDOWS
USBHID_UPS_SUBDRIVERS = apc-hid.c arduino-hid.c belkin-hid.c cps-hid.c explore-hid.c \
liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c idowell-hid.c microdowell-hid.c \
liebert-hid.c mge-hid.c powercom-hid.c tripplite-hid.c ugreen-hid.c idowell-hid.c microdowell-hid.c \
openups-hid.c powervar-hid.c delta_ups-hid.c ecoflow-hid.c ever-hid.c \
legrand-hid.c salicru-hid.c vertiv-hid.c
usbhid_ups_SOURCES = usbhid-ups.c libhid.c hidparser.c $(USBHID_UPS_SUBDRIVERS)
Expand Down Expand Up @@ -558,7 +558,7 @@ dist_noinst_HEADERS = \
main.h mge-hid.h mge-mib.h mge-utalk.h \
mge-xml.h microdowell.h microsol-apc.h microsol-common.h netvision-mib.h netxml-ups.h nut-ipmi.h oneac.h \
powercom.h powerpanel.h powerp-bin.h powerp-txt.h powervar_cx.h raritan-pdu-mib.h \
safenet.h serial.h sms_ser.h snmp-ups.h solis.h tripplite.h tripplite-hid.h \
safenet.h serial.h sms_ser.h snmp-ups.h solis.h tripplite.h tripplite-hid.h ugreen-hid.h \
upshandler.h usb-common.h usbhid-ups.h powercom-hid.h compaq-mib.h idowell-hid.h microdowell-hid.h \
apc_common.h apcmicrolink-maps.h apcmicrolink.h apcmicrolink-usb.h apcsmart.h apcsmart_tabs.h apcsmart-old.h apcupsd-ups.h cyberpower-mib.h riello.h openups-hid.h \
delta_ups-mib.h nutdrv_qx.h nutdrv_qx_bestups.h nutdrv_qx_blazer-common.h \
Expand Down
Loading