Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
5e7802c
added cmd "experimental.ecomode.start.auto" "experimental.ecomode.sto…
masterwishx May 14, 2025
327e51e
rename to `experimental.bypass.ecomode.start[stop]` from `experimenta…
masterwishx May 16, 2025
06d1032
Merge branch 'master' into ECOmode-auto-addon2-todo
masterwishx May 19, 2025
5dbd082
upsdebugx in bypass and ecomode functions updated with %s: and __fun…
masterwishx May 22, 2025
bd082f6
Merge branch 'master' into ECOmode-auto-addon2-todo
jimklimov May 23, 2025
c36c095
Merge branch 'master' into ECOmode-auto-addon2-todo
masterwishx Jun 1, 2025
d470ea6
Merge branch 'master' into ECOmode-auto-addon2-todo
masterwishx Jun 9, 2025
c67cee3
added dummy and Conversion back of `eaton_input_eco_mode_auto_off[on]…
masterwishx Jun 11, 2025
838f210
small fixes
masterwishx Jun 11, 2025
da97bd5
double fix
masterwishx Jun 11, 2025
e28e23a
Merge branch 'master' into ECOmode-auto-addon2-todo
jimklimov Jun 12, 2025
7892457
return double (0.0 and 0.1) instead of named double
masterwishx Jun 12, 2025
7b27c5e
Merge branch 'ECOmode-auto-addon2-todo' of https://github.com/masterw…
masterwishx Jun 12, 2025
9c6199a
convert from two functions to one `eaton_input_eco_mode_auto_on_off_f…
masterwishx Jun 12, 2025
c823ffe
double, small fixes
masterwishx Jun 12, 2025
02843e7
Merge branch 'master' into ECOmode-auto-addon2-todo
masterwishx Jun 12, 2025
46f9042
another typo
masterwishx Jun 12, 2025
4c3c23e
return on/off
masterwishx Jun 12, 2025
d179251
separate on / off as only fisrt command is used in this case
masterwishx Jun 15, 2025
10b0019
for test value after compile
masterwishx Jun 16, 2025
d6e2c84
Fix value ("1") in nuf
masterwishx Jun 16, 2025
4350160
try again in one func eaton_input_eco_mode_auto_on_off_info()
masterwishx Jun 16, 2025
4958eef
rename enable/diasble to start/stop
masterwishx Jun 24, 2025
722fd7c
add some more debug
masterwishx Jun 25, 2025
959eae7
try return int instead double to check compiler issue
masterwishx Jun 25, 2025
c5b5b76
Merge branch 'master' into ECOmode-auto-addon2-todo
masterwishx Jun 25, 2025
21c69e6
Merge remote-tracking branch 'upstream/master' into ECOmode-auto-addo…
jimklimov Jul 4, 2025
ebe5054
NEWS.adoc: note further ECO mode updates in mge-hid [#2956]
jimklimov Jul 4, 2025
0a89b46
drivers/mge-hid.c: comment which info_lkp_t[] tables are in fact wron…
jimklimov Jul 7, 2025
6ab7c2a
drivers/mge-hid.c: refactor old (pegasus) and new (ECO/ESS) mapping t…
jimklimov Jul 7, 2025
ebc798e
Merge branch 'master' into ECOmode-auto-addon2-todo
jimklimov Jul 9, 2025
6cc0b83
Merge branch 'master' into ECOmode-auto-addon2-todo
masterwishx Jul 11, 2025
cb542ac
drivers/mge-hid.c: fix indentations (TAB vs space) to be consistent […
jimklimov Jul 14, 2025
d3671c9
drivers/usbhid-ups.c, NEWS.adoc: add a way for fun/nuf methods to rep…
jimklimov Jul 14, 2025
ddbc035
drivers/mge-hid.c: introduce eaton_input_buzzwordmode_setvar_nuf() [#…
jimklimov Jul 14, 2025
cdd4094
drivers/usbhid-ups.c, NEWS.adoc: hid_ups_walk(HU_WALKMODE_INIT): repo…
jimklimov Jul 14, 2025
bc306fb
docs/nut.dict: add "nuf" to dict [#3017, #2956]
jimklimov Jul 14, 2025
a3184bd
drivers/mge-hid.c: fix back eaton_input_bypass_mode_on_info[]; update…
jimklimov Jul 14, 2025
da213ad
drivers/mge-hid.c: move "input.eco.switchable" definition to end of m…
jimklimov Jul 17, 2025
8de7e57
drivers/mge-hid.c: convert "input.eco.switchable" definition from HU_…
jimklimov Jul 17, 2025
6133d08
Merge remote-tracking branch 'upstream/master' into ECOmode-auto-addo…
jimklimov Jul 17, 2025
603a74f
drivers/mge-hid.c: make "input.eco.switchable" a HU_FLAG_QUICK_POLL v…
jimklimov Jul 17, 2025
5598657
drivers/mge-hid.c: eaton_input_eco_mode_check_range(): sanity-check t…
jimklimov Jul 17, 2025
e27b6b0
drivers/mge-hid.c: eaton_input_eco_mode_check_range(): refine log out…
jimklimov Jul 17, 2025
25db6a6
drivers/usbhid-ups.c: ups_alarm_set(): ignore ECOMODE, we handle it i…
jimklimov Jul 17, 2025
66914e0
drivers/mge-hid.c: eaton_input_bypass_check_range(): fix typo checkin…
jimklimov Jul 17, 2025
f339783
input.bypass.switch.on/off set flag quick update instead semi static
masterwishx Jul 18, 2025
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
5 changes: 5 additions & 0 deletions NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,15 @@ https://github.com/networkupstools/nut/milestone/9
report back to the driver that an argument value was not supported,
so `setvar()` or `instcmd()` can not proceed safely and should return
`STAT_SET_CONVERSION_FAILED` or `STAT_INSTCMD_CONVERSION_FAILED`. [#3017]
* `hid_ups_walk(HU_WALKMODE_INIT)`: report if exactly one of "fun" or "nuf"
dynamic value mapping methods is defined in a one-line table, and this
may preclude reads/writes of that variable. [#2956]
* The `cps-hid` subdriver's existing mechanism for fixing broken report
descriptors was extended to cover a newly reported case of nominal UPS
power being incorrectly reported due to an unrealistically low maximum
threshold, as seen with a EC850LCD device. [issue #2917, PR #2919]
* Further revision of "ECO mode" related code in `mge-hid` subdriver,
following up from work started for NUT v2.8.3 release. [PR #2956]
* Added APC BVKxxxM2 and BKxxxM2-CH to list of devices where
`lbrb_log_delay_sec=N` may be necessary to address spurious LOWBATT
and REPLACEBATT events. [PR #2942, PR #3007, issue #2347, issue #3006]
Expand Down
10 changes: 6 additions & 4 deletions data/cmdvartab
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,12 @@ CMDDESC calibrate.start "Start run time calibration"
CMDDESC calibrate.stop "Stop run time calibration"
CMDDESC bypass.start "Put the UPS in Bypass mode"
CMDDESC bypass.stop "Take the UPS out of Bypass mode"
CMDDESC experimental.ecomode.enable "Put UPS in High Efficiency (aka ECO) mode"
CMDDESC experimental.ecomode.disable "Take the UPS out of High Efficiency (aka ECO) mode"
CMDDESC experimental.essmode.enable "Put UPS in Energy Saver System (aka ESS) mode"
CMDDESC experimental.essmode.disable "Take the UPS out of Energy Saver System (aka ESS) mode"
CMDDESC experimental.ecomode.start "Put UPS in High Efficiency (aka ECO) mode"
CMDDESC experimental.ecomode.stop "Take the UPS out of High Efficiency (aka ECO) mode"
CMDDESC experimental.bypass.ecomode.start "Put UPS in Bypass mode then High Efficiency (aka ECO) mode"
CMDDESC experimental.bypass.ecomode.stop "Take the UPS out of High Efficiency (aka ECO) mode after exiting Bypass mode"
CMDDESC experimental.essmode.start "Put UPS in Energy Saver System (aka ESS) mode"
CMDDESC experimental.essmode.stop "Take the UPS out of Energy Saver System (aka ESS) mode"
CMDDESC experimental.test.beeper.start "Start testing the UPS beeper"
CMDDESC experimental.test.beeper.stop "Stop a UPS beeper test"
CMDDESC reset.input.minmax "Reset minimum and maximum input voltage status"
Expand Down
12 changes: 8 additions & 4 deletions docs/nut-names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1055,13 +1055,17 @@ to last as part of NUT standard protocol in the long run.
[options="header"]
|========================================================================
| Name | Driver/Devices | Description
| experimental.ecomode.enable | usbhid-ups => mge-hid (Eaton/MGE)
| experimental.ecomode.start | usbhid-ups => mge-hid (Eaton/MGE)
| Put UPS in High Efficiency (aka ECO) mode
| experimental.ecomode.disable | usbhid-ups => mge-hid (Eaton/MGE)
| experimental.ecomode.stop | usbhid-ups => mge-hid (Eaton/MGE)
| Take the UPS out of High Efficiency (aka ECO) mode
| experimental.essmode.enable | usbhid-ups => mge-hid (Eaton/MGE)
| experimental.bypass.ecomode.start | usbhid-ups => mge-hid (Eaton/MGE)
| Put UPS in Bypass mode then High Efficiency (aka ECO) mode
| experimental.bypass.ecomode.stop | usbhid-ups => mge-hid (Eaton/MGE)
| Take the UPS out of High Efficiency (aka ECO) mode after exiting Bypass mode
| experimental.essmode.start | usbhid-ups => mge-hid (Eaton/MGE)
| Put UPS in Energy Saver System (aka ESS) mode
| experimental.essmode.disable | usbhid-ups => mge-hid (Eaton/MGE)
| experimental.essmode.stop | usbhid-ups => mge-hid (Eaton/MGE)
| Take the UPS out of Energy Saver System (aka ESS) mode
|========================================================================

Expand Down
Loading