Merge 25db6a6 into 9f76f3f

Author: masterwishx

NEWS.adoc

@@ -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]

data/cmdvartab

@@ -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"

docs/nut-names.txt

@@ -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
 |========================================================================