Merge pull request #2684 from masterwishx/ecomode-addon-2

ecomode_addon-2
networkupstools · Dec 4, 2024 · 10ad271 · 10ad271
2 parents 8514451 + dcd7d1b
commit 10ad271
Show file tree

Hide file tree

Showing 5 changed files with 205 additions and 106 deletions.
diff --git a/data/cmdvartab b/data/cmdvartab
@@ -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)"
@@ -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"

diff --git a/docs/nut-names.txt b/docs/nut-names.txt
@@ -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)
@@ -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