Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use novendor param as flag for don't read vendro name, need for dexp ups #2839

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
2 changes: 2 additions & 0 deletions NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ Overall, NUT CI farm build times got 25%+ shorter (which is important as
on Innova devices, but other models than RT 3/1. [#2798]
* introduced a `gtec` subdriver and protocol, tested over USB with a
Gtec ZP120N device. [#2818]
* fixed `hunnox_protocol()` to honour the optional `novendor` setting for
devices that are confused by such query, e.g. DEXP LCD EURO 1200VA. [#2839]
* extended Voltronic protocol to support longer numbers as remaining
`battery.runtime` value. [#2765]

Expand Down
5 changes: 5 additions & 0 deletions UPGRADING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@ Changes from 2.8.2 to 2.8.3
other devices using that MIB (negatively, if the older mappings were
indeed correct for any practical cases, and were not a typo). [#2803]

- `nutdrv_qx` fixed `hunnox_protocol()` to honour the optional `novendor`
setting for devices that are confused by such query (e.g. DEXP LCD EURO
1200VA); it may be remotely possible that some other devices could begin
to misbehave due to this fix -- please let us know then. [#2839]

- mge-utalk driver will no longer set non-standard status values `COMMFAULT`
and `ALARM` (for a specific status bit); instead, it will set modern
`ups.alarm` with values `COMMFAULT` and/or `DEVICEALARM` (and raise
Expand Down
1 change: 1 addition & 0 deletions data/driver.list.in
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@
"Deltec" "ups" "4" "PRM 450/700/1000/1500" "" "upscode2"

"DEXP" "ups" "2" "MIX 850VA" "USB" "blazer_usb langid_fix=0x0409 runtimecal=240,100,720,50 default.battery.voltage.high=2.27 default.battery.voltage.low=1.72" # https://github.com/networkupstools/nut/issues/721
"DEXP" "ups" "2" "LCD EURO 1200VA" "USB" "driver=nutdrv_qx port=auto vendorid=0001 productid=0000 product=MEC0003 langid_fix=0x0409 protocol=hunnox subdriver=hunnox novendor norating noscanlangid default.battery.voltage.high=28.6 default.battery.voltage.low=21.4" # https://github.com/networkupstools/nut/pull/2839

"Digital Loggers" "pdu" "1" "LPC, EPCR2, DIN" "8 outlets" "powerman-pdu (experimental)"

Expand Down
3 changes: 2 additions & 1 deletion docs/nut.dict
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 3323 utf-8
personal_ws-1.1 en 3324 utf-8
AAC
AAS
ABI
Expand Down Expand Up @@ -245,6 +245,7 @@ DES
DESTDIR
DEVICEALARM
DEVNAME
DEXP
DF
DHEA
DIGYS
Expand Down
2 changes: 1 addition & 1 deletion drivers/nutdrv_qx.c
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ static int hunnox_protocol(int asking_for)
}
break;
case 3:
if (asking_for != 0x0c) {
if (asking_for != 0x0c && !testvar("novendor")) {
upsdebugx(3, "asking for: %02X", (unsigned int)0x0c);
usb_get_string(udev, 0x0c,
langid_fix_local, (usb_ctrl_charbuf)buf, 102);
Expand Down