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

ecomode_addon-2 #2684

Merged
merged 40 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
05a8344
rename eco function
masterwishx Nov 18, 2024
5a8abbd
comment added
masterwishx Nov 18, 2024
80df4a0
add debug log in case out of limits for bypass/eco
masterwishx Nov 18, 2024
c818bab
change double to %.1f of voltage and frequency
masterwishx Nov 18, 2024
1ada6b0
added input.bypass.switchable
masterwishx Nov 19, 2024
c1ce63a
added input.transfer.bypass.overload and input.transfer.bypass.outlimits
masterwishx Nov 19, 2024
ba44bc7
added to cmdvartab and nut-names.txt
masterwishx Nov 19, 2024
0cd125f
bypass to Bypass in nut-names.txt
masterwishx Nov 19, 2024
546fdce
change rest bypass to Bypass
masterwishx Nov 19, 2024
937a953
rename input.transfer.forced to input.transfer.bypass.forced
masterwishx Nov 20, 2024
234cc37
small comments change
masterwishx Nov 20, 2024
2da9012
add ess mode
masterwishx Nov 20, 2024
4346970
small comment added
masterwishx Nov 20, 2024
9087d5f
small comments change
masterwishx Nov 20, 2024
24be33d
small comments added
masterwishx Nov 20, 2024
e35c2a0
fix nut-names.txt
masterwishx Nov 20, 2024
f1d6b6b
fix again
masterwishx Nov 21, 2024
3bd957e
more small comments changes
masterwishx Nov 21, 2024
22a9d85
comments changes
masterwishx Nov 21, 2024
dc2a23e
change enable/disable to (enabled or disabled) in cmdvartab
masterwishx Nov 27, 2024
995da6a
more clear description for input.transfer.bypass.forced
masterwishx Nov 27, 2024
0f04a56
much clear description for input.transfer.bypass.forced
masterwishx Nov 29, 2024
c736ae8
change vars in eaton_input_bypass_check_range()
masterwishx Nov 29, 2024
4d7f955
change vars in eaton_input_eco_mode_check_range()
masterwishx Nov 29, 2024
39c17ca
change the state for debug when no eco transfer limits avalible to us…
masterwishx Nov 29, 2024
000d03a
move NUT_UNUSED_VARIABLE(value); back down
masterwishx Nov 29, 2024
9d1048e
change voltage limit setting same as frequency
masterwishx Nov 29, 2024
239123f
change voltage limit setting same as frequency in eco function also
masterwishx Nov 29, 2024
e29675b
Fix for bypass limit In case we dont have Bypass transfer limit varia…
masterwishx Nov 30, 2024
cd7077e
fix eco vars in debug meassage
masterwishx Nov 30, 2024
2b26621
Merge branch 'master' into ecomode-addon-2
masterwishx Nov 30, 2024
9f68ab5
add debug log when enter to eco/bypass modes
masterwishx Nov 30, 2024
3adc4c0
Fix for bypass/eco when no values or outside of limits
masterwishx Dec 1, 2024
87d5c17
add debug message for bypass/eco outside limits
masterwishx Dec 1, 2024
3f093fa
Merge branch 'master' into ecomode-addon-2
jimklimov Dec 1, 2024
f4c1ef2
drivers/mge-hid.c: restore white-space (TAB indentation and between d…
jimklimov Dec 1, 2024
5ce9e77
Merge branch 'master' into ecomode-addon-2
jimklimov Dec 1, 2024
e698d58
typo space removed
masterwishx Dec 2, 2024
077c08c
drivers/mge-hid.c: simplify debug printouts with NUT_STRARG() [#2684,…
jimklimov Dec 2, 2024
dcd7d1b
Merge branch 'master' into ecomode-addon-2
jimklimov Dec 4, 2024
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
13 changes: 8 additions & 5 deletions data/cmdvartab
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@ VARDESC input.transfer.low.max "greatest settable low voltage transfer point (V)
VARDESC input.transfer.high.min "smallest settable high voltage transfer point (V)"
VARDESC input.transfer.high.max "greatest settable high voltage transfer point (V)"
VARDESC input.eco.switchable "Input High Efficiency (aka ECO) mode switch"
VARDESC input.transfer.forced "Input forced transfer modes enable/disable"
VARDESC input.bypass.switch.on "Put the UPS in bypass mode"
VARDESC input.bypass.switch.off "Take the UPS out of bypass mode"
VARDESC input.transfer.bypass.forced "Rule for allow auto Bypass switch (on/off) transfer modes (enabled or disabled)"
VARDESC input.transfer.bypass.overload "Rule for auto transfer on Bypass when overload (enabled or disabled)"
VARDESC input.transfer.bypass.outlimits "Rule for auto transfer on Bypass when out of tolerance (enabled or disabled)"
VARDESC input.bypass.switchable "Input auto transfer on Bypass when overload or out of tolerance (enabled or disabled)"
VARDESC input.bypass.switch.on "Put the UPS in Bypass mode"
VARDESC input.bypass.switch.off "Take the UPS out of Bypass mode"
VARDESC input.sensitivity "Input power sensitivity"
VARDESC input.quality "Input power quality"
VARDESC input.current "Input current (A)"
Expand Down Expand Up @@ -234,8 +237,8 @@ CMDDESC test.battery.stop "Stop the battery test"
CMDDESC test.system.start "Start a system test"
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 bypass.start "Put the UPS in Bypass mode"
CMDDESC bypass.stop "Take the UPS out of Bypass mode"
CMDDESC ecomode.enable "Put UPS in High Efficiency (aka ECO) mode"
CMDDESC ecomode.disable "Take the UPS out of High Efficiency (aka ECO) mode"
CMDDESC essmode.enable "Put UPS in Energy Saver System (aka ESS) mode"
Expand Down
21 changes: 15 additions & 6 deletions docs/nut-names.txt
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,23 @@ input: Incoming line/power information
transfer point (V) | 264
| input.transfer.frequency.bypass.range | Frequency range Bypass transfer
point (percent of nominal Hz) | 10
| input.transfer.frequency.eco.range | Frequency range ECO transfer
| input.transfer.frequency.eco.range | Frequency range ECO transfer
point (percent of nominal Hz) | 5
| input.transfer.hysteresis | Threshold of switching protection modes,
voltage transfer point (V) | 10
| input.transfer.forced | Input forced transfer modes
| input.transfer.bypass.forced | Rule for allow auto Bypass switch
(on/off) transfer modes
(enabled or disabled) | enabled
| input.bypass.switch.on | Put the UPS in bypass mode | on
| input.bypass.switch.off | Take the UPS out of bypass mode | disabled
| input.transfer.bypass.overload | Rule for auto transfer on Bypass when
overload (enabled or disabled) | enabled
| input.transfer.bypass.outlimits | Rule for auto transfer on Bypass when
out of tolerance (enabled or disabled)
| enabled
| input.bypass.switchable | Input auto transfer on Bypass when overload
or out of tolerance (enabled or disabled)
| enabled
| input.bypass.switch.on | Put the UPS in Bypass mode | on
| input.bypass.switch.off | Take the UPS out of Bypass mode | disabled
| input.load | Load on (ePDU) input (percent
of full) | 25
| input.realpower | Current sum value of all (ePDU)
Expand Down Expand Up @@ -871,8 +880,8 @@ Instant commands
| test.system.start | Start a system test
| calibrate.start | Start runtime calibration
| calibrate.stop | Stop runtime calibration
| bypass.start | Put the UPS in bypass mode
| bypass.stop | Take the UPS out of bypass mode
| bypass.start | Put the UPS in Bypass mode
| bypass.stop | Take the UPS out of Bypass mode
| ecomode.enable | Put UPS in High Efficiency (aka ECO) mode
| ecomode.disable | Take the UPS out of High Efficiency (aka ECO) mode
| essmode.enable | Put UPS in Energy Saver System (aka ESS) mode
Expand Down
Loading
Loading