Skip to content

Commit 201eb03

Browse files
masterwishxmasterwishx
authored
Merge 000d03a into b624145 
2 parents b624145 + 000d03a commit 201eb03

File tree

5 files changed

+208
-166
lines changed

5 files changed

+208
-166
lines changed

‎data/cmdvartab‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,12 @@ VARDESC input.transfer.low.max "greatest settable low voltage transfer point (V)
6868
VARDESC input.transfer.high.min "smallest settable high voltage transfer point (V)"
6969
VARDESC input.transfer.high.max "greatest settable high voltage transfer point (V)"
7070
VARDESC input.eco.switchable "Input High Efficiency (aka ECO) mode switch"
71-
VARDESC input.transfer.forced "Input forced transfer modes enable/disable"
72-
VARDESC input.bypass.switch.on "Put the UPS in bypass mode"
73-
VARDESC input.bypass.switch.off "Take the UPS out of bypass mode"
71+
VARDESC input.transfer.bypass.forced "Rule for allow auto Bypass switch (on/off) transfer modes (enabled or disabled)"
72+
VARDESC input.transfer.bypass.overload "Rule for auto transfer on Bypass when overload (enabled or disabled)"
73+
VARDESC input.transfer.bypass.outlimits "Rule for auto transfer on Bypass when out of tolerance (enabled or disabled)"
74+
VARDESC input.bypass.switchable "Input auto transfer on Bypass when overload or out of tolerance (enabled or disabled)"
75+
VARDESC input.bypass.switch.on "Put the UPS in Bypass mode"
76+
VARDESC input.bypass.switch.off "Take the UPS out of Bypass mode"
7477
VARDESC input.sensitivity "Input power sensitivity"
7578
VARDESC input.quality "Input power quality"
7679
VARDESC input.current "Input current (A)"
@@ -234,8 +237,8 @@ CMDDESC test.battery.stop "Stop the battery test"
234237
CMDDESC test.system.start "Start a system test"
235238
CMDDESC calibrate.start "Start run time calibration"
236239
CMDDESC calibrate.stop "Stop run time calibration"
237-
CMDDESC bypass.start "Put the UPS in bypass mode"
238-
CMDDESC bypass.stop "Take the UPS out of bypass mode"
240+
CMDDESC bypass.start "Put the UPS in Bypass mode"
241+
CMDDESC bypass.stop "Take the UPS out of Bypass mode"
239242
CMDDESC ecomode.enable "Put UPS in High Efficiency (aka ECO) mode"
240243
CMDDESC ecomode.disable "Take the UPS out of High Efficiency (aka ECO) mode"
241244
CMDDESC essmode.enable "Put UPS in Energy Saver System (aka ESS) mode"

‎docs/nut-names.txt‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -303,14 +303,23 @@ input: Incoming line/power information
303303
transfer point (V) | 264
304304
| input.transfer.frequency.bypass.range | Frequency range Bypass transfer
305305
point (percent of nominal Hz) | 10
306-
| input.transfer.frequency.eco.range | Frequency range ECO transfer
306+
| input.transfer.frequency.eco.range | Frequency range ECO transfer
307307
point (percent of nominal Hz) | 5
308308
| input.transfer.hysteresis | Threshold of switching protection modes,
309309
voltage transfer point (V) | 10
310-
| input.transfer.forced | Input forced transfer modes
310+
| input.transfer.bypass.forced | Rule for allow auto Bypass switch
311+
(on/off) transfer modes
311312
(enabled or disabled) | enabled
312-
| input.bypass.switch.on | Put the UPS in bypass mode | on
313-
| input.bypass.switch.off | Take the UPS out of bypass mode | disabled
313+
| input.transfer.bypass.overload | Rule for auto transfer on Bypass when
314+
overload (enabled or disabled) | enabled
315+
| input.transfer.bypass.outlimits | Rule for auto transfer on Bypass when
316+
out of tolerance (enabled or disabled)
317+
| enabled
318+
| input.bypass.switchable | Input auto transfer on Bypass when overload
319+
or out of tolerance (enabled or disabled)
320+
| enabled
321+
| input.bypass.switch.on | Put the UPS in Bypass mode | on
322+
| input.bypass.switch.off | Take the UPS out of Bypass mode | disabled
314323
| input.load | Load on (ePDU) input (percent
315324
of full) | 25
316325
| input.realpower | Current sum value of all (ePDU)
@@ -871,8 +880,8 @@ Instant commands
871880
| test.system.start | Start a system test
872881
| calibrate.start | Start runtime calibration
873882
| calibrate.stop | Stop runtime calibration
874-
| bypass.start | Put the UPS in bypass mode
875-
| bypass.stop | Take the UPS out of bypass mode
883+
| bypass.start | Put the UPS in Bypass mode
884+
| bypass.stop | Take the UPS out of Bypass mode
876885
| ecomode.enable | Put UPS in High Efficiency (aka ECO) mode
877886
| ecomode.disable | Take the UPS out of High Efficiency (aka ECO) mode
878887
| essmode.enable | Put UPS in Energy Saver System (aka ESS) mode

0 commit comments

Comments
 (0)