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

Add support for Hunnox HNX-850 #638

Merged
merged 24 commits into from Apr 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
88ad313
Add support for Hunnox HNX-850
Dec 1, 2018
b6a1559
Merge branch 'master' into hunnox-hnx850
jimklimov Oct 9, 2020
a1988c0
Merge branch 'master' into hunnox-hnx850
jimklimov Oct 9, 2020
182e4b4
Merge branch 'master' into hunnox-hnx850
jimklimov Nov 7, 2020
7856291
Update nutdrv_qx.c
jimklimov Nov 7, 2020
8b5ae7a
Merge branch 'master' into hunnox-hnx850
jimklimov Nov 29, 2020
8d7d108
Merge branch 'master' into hunnox-hnx850
jimklimov Jan 6, 2021
33d7623
Update nutdrv_qx_hunnox.h
jimklimov Apr 19, 2021
0742857
Update nutdrv_qx_hunnox.c
jimklimov Apr 19, 2021
3a5a758
Update nutdrv_qx.c
jimklimov Apr 19, 2021
364025d
Update nutdrv_qx.txt
jimklimov Apr 19, 2021
09ebc5d
Update nut.dict
jimklimov Apr 19, 2021
65514ef
Merge branch 'master' into hunnox-hnx850
jimklimov Apr 19, 2021
fc91bd4
Update nut.dict
jimklimov Apr 20, 2021
672cfdb
docs/nut.dict: typo fix
jimklimov Apr 20, 2021
c78fd72
drivers/nutdrv_qx.c: separate fabula_command_hunnox() from fabula_com…
jimklimov Apr 20, 2021
414e5ef
drivers/nutdrv_qx.c: fabula_command_hunnox(): restore originally PRed…
jimklimov Apr 20, 2021
d20de6c
drivers/nutdrv_qx.c: comment that fabula_hunnox_subdriver was reporte…
jimklimov Apr 20, 2021
cbbfd2d
drivers/nutdrv_qx.c: fabula_command_hunnox(): comment away scoping fo…
jimklimov Apr 20, 2021
cab025b
drivers/nutdrv_qx.c: fabula_command_hunnox(): comment about truncatin…
jimklimov Apr 20, 2021
342113c
drivers/nutdrv_qx.c: restore indentation with TABs
jimklimov Apr 20, 2021
88c77de
drivers/nutdrv_qx.c: simplify new subdriver/command naming from "fabu…
jimklimov Apr 20, 2021
ec09431
drivers/nutdrv_qx.c: bump core DRIVER_VERSION to reflect changes from…
jimklimov Apr 20, 2021
9872276
drivers/nutdrv_qx.c: fix back the name for "fabula_hunnox_subdriver" …
jimklimov Apr 20, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 9 additions & 3 deletions docs/man/nutdrv_qx.txt
Expand Up @@ -17,7 +17,7 @@ For information about the core driver, see linkman:nutupsdrv[8].
SUPPORTED HARDWARE
------------------

The *nutdrv_qx* driver is known to work with various UPSes from 'Blazer', 'Energy Sistem', 'Fenton Technologies', 'General Electric', 'Mustek', 'Voltronic Power' (rebranded by many, many - have I said many? - others.. Long story short: if your UPS came with a software called 'Viewpower', chances are high that it works with this driver with one of the <<_extra_arguments,'voltronic*' protocols or with the 'mecer' one>>) and many others.
The *nutdrv_qx* driver is known to work with various UPSes from 'Blazer', 'Energy Sistem', 'Fenton Technologies', 'General Electric', 'Hunnox', 'Mustek', 'Powercool', 'Voltronic Power' (rebranded by many, many - have I said many? - others.. Long story short: if your UPS came with a software called 'Viewpower', chances are high that it works with this driver with one of the <<_extra_arguments,'voltronic*' protocols or with the 'mecer' one>>) and many others.

The <<_internet_resources,NUT compatibility table>> lists all the known supported models.
Keep in mind, however, that other models not listed there may also be supported, but haven't been tested.
Expand Down Expand Up @@ -52,7 +52,7 @@ If you set stayoff in linkman:ups.conf[5] when FSD arises the UPS will call a *s

*protocol =* 'string'::
Skip autodetection of the protocol to use and only use the one specified.
Supported values: 'bestups', 'mecer', 'megatec', 'megatec/old', 'mustek', 'q1', 'voltronic', 'voltronic-qs', 'voltronic-qs-hex' and 'zinto'.
Supported values: 'bestups', 'hunnox', 'mecer', 'megatec', 'megatec/old', 'mustek', 'q1', 'voltronic', 'voltronic-qs', 'voltronic-qs-hex' and 'zinto'.
+
Note that if you end up using the 'q1' protocol, you may want to give a try to the 'mecer', 'megatec' and 'zinto' ones setting the <<old-blazer-protocols-options,*novendor*/*norating* flags>> (only one, or both).

Expand Down Expand Up @@ -324,14 +324,17 @@ The argument is a regular expression that must match the bus name where the UPS

*subdriver =* 'string'::
Select a serial-over-USB subdriver to use.
You have a choice between *cypress*, *fabula*, *fuji*, *ippon*, *krauler*, *phoenix* and *sgs*.
You have a choice between *cypress*, *fabula*, *fuji*, *hunnox*, *ippon*, *krauler*, *phoenix* and *sgs*.
When using this option, it is mandatory to also specify the *vendorid* and *productid*.

*langid_fix =* 'value'::
Apply the language ID workaround to the *krauler* subdriver.
This is mandatory for some devices to work (LDLC, Dynamix and others).
You must provide *value* (+0x409+ or +0x4095+), according to your device entry in NUT hardware compatibility list (HCL).

*noscanlangid*::
If this flag is set, don't autoscan valid range for langid.


IMPLEMENTATION NOTES
^^^^^^^^^^^^^^^^^^^^
Expand All @@ -340,6 +343,9 @@ IMPLEMENTATION NOTES
This subdriver, meant to be used with the 'megatec' protocol, does *not* support the various *test.battery* commands.
Plus, the *shutdown.return* command ignores the values set in 'ups.delay.start'/*ondelay* and makes the UPS turn on the load as soon as power is back.

*'hunnox' subdriver*::
This protocol subdriver is closely related to 'fabula' one, with a few tweaks for devices not directly supported by that driver.

*'fuji' subdriver*::
This subdriver, meant to be used with the 'megatec' protocol, does *not* support the *shutdown.stayoff* and *load.off* commands.
Plus, the *shutdown.return* command ignores the values set in 'ups.delay.start'/*ondelay* and makes the UPS turn on the load as soon as power is back.
Expand Down
7 changes: 6 additions & 1 deletion docs/nut.dict
@@ -1,4 +1,4 @@
personal_ws-1.1 en 2537 utf-8
personal_ws-1.1 en 2542 utf-8
AAS
ACFAIL
ACFREQ
Expand Down Expand Up @@ -401,6 +401,7 @@ Hlavinka
Holger
Hoogervorst
Hough
Hunnox
Hurd
Håvard
IANA
Expand Down Expand Up @@ -802,6 +803,7 @@ PowerVault
PowerWalker
PowerWare
Powerchute
Powercool
Powervar
Powerwell
Prachi
Expand Down Expand Up @@ -1269,6 +1271,7 @@ automessage
autoreconf
autorestart
autosaving
autoscan
autostart
autowidth
auxdata
Expand Down Expand Up @@ -1661,6 +1664,7 @@ http
httpd
https
huawei
hunnox
iBox
iDowell
iManufacturer
Expand Down Expand Up @@ -1948,6 +1952,7 @@ nomdcvolts
nomfrequency
noout
norating
noscanlangid
notAfter
notifyme
notifytype
Expand Down
5 changes: 3 additions & 2 deletions drivers/Makefile.am
Expand Up @@ -263,7 +263,8 @@ endif
NUTDRV_QX_SUBDRIVERS = nutdrv_qx_bestups.c nutdrv_qx_blazer-common.c \
nutdrv_qx_mecer.c nutdrv_qx_megatec.c nutdrv_qx_megatec-old.c \
nutdrv_qx_mustek.c nutdrv_qx_q1.c nutdrv_qx_voltronic.c \
nutdrv_qx_voltronic-qs.c nutdrv_qx_voltronic-qs-hex.c nutdrv_qx_zinto.c
nutdrv_qx_voltronic-qs.c nutdrv_qx_voltronic-qs-hex.c nutdrv_qx_zinto.c \
nutdrv_qx_hunnox.c
nutdrv_qx_SOURCES += $(NUTDRV_QX_SUBDRIVERS)

# ----------------------------------------------------------------------
Expand All @@ -282,7 +283,7 @@ dist_noinst_HEADERS = apc-mib.h apc-hid.h baytech-mib.h bcmxcp.h bcmxcp_ser.h \
upshandler.h usb-common.h usbhid-ups.h powercom-hid.h compaq-mib.h idowell-hid.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 nutdrv_qx_mecer.h \
nutdrv_qx_megatec.h nutdrv_qx_megatec-old.h nutdrv_qx_mustek.h nutdrv_qx_q1.h \
nutdrv_qx_megatec.h nutdrv_qx_megatec-old.h nutdrv_qx_mustek.h nutdrv_qx_q1.h nutdrv_qx_hunnox.h \
nutdrv_qx_voltronic.h nutdrv_qx_voltronic-qs.h nutdrv_qx_voltronic-qs-hex.h nutdrv_qx_zinto.h \
xppc-mib.h huawei-mib.h eaton-ats16-nmc-mib.h eaton-ats16-nm2-mib.h apc-ats-mib.h raritan-px2-mib.h eaton-ats30-mib.h \
apc-pdu-mib.h eaton-pdu-genesis2-mib.h eaton-pdu-marlin-mib.h \
Expand Down