Merge remote-tracking branch 'upstream/master' into innova_rt_31

Signed-off-by: Jim Klimov <[email protected]>

data/cmdvartab

@@ -42,6 +42,7 @@ VARDESC ups.type "UPS type"
 VARDESC ups.start.auto "UPS starts when mains is (re)applied"
 VARDESC ups.start.battery "Allow to start UPS from battery"
 VARDESC ups.start.reboot "UPS reboots when power returns during shutdown delay"
+VARDESC ups.shutdown "Enable or disable UPS shutdown ability (poweroff)"
 
 VARDESC input.voltage "Input voltage (V)"
 VARDESC input.voltage.extended "Extended input voltage range"
@@ -74,6 +75,8 @@ VARDESC input.transfer.bypass.outlimits "Rule for auto transfer on Bypass when o
 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.bypass.voltage "Input bypass voltage (V)"
+VARDESC input.bypass.frequency "Input bypass frequency (Hz)"
 VARDESC input.sensitivity "Input power sensitivity"
 VARDESC input.quality "Input power quality"
 VARDESC input.current "Input current (A)"
@@ -131,6 +134,7 @@ VARDESC battery.energysave.load "Switch off UPS if on battery and load level low
 VARDESC battery.energysave.delay "Delay before switch off UPS if on battery and load level low (min)"
 VARDESC battery.energysave.realpower "Switch off UPS if on battery and load level lower (Watts)"
 VARDESC battery.charger.status "Battery charger status"
+VARDESC battery.charger.type "Type of battery charger"
 
 VARDESC ambient.temperature "Ambient temperature (degrees C)"
 VARDESC ambient.temperature.alarm "Ambient temperature alarm is active"
@@ -183,6 +187,7 @@ VARDESC outlet.1.ecocontrol "Master Outlet used to automatically power off the s
 VARDESC outlet.1.autoswitch.charge.low "Remaining battery level to power off this outlet (percent)"
 VARDESC outlet.1.delay.shutdown "Interval to wait before shutting down this outlet (seconds)"
 VARDESC outlet.1.delay.start "Interval to wait before restarting this outlet (seconds)"
+VARDESC outlet.1.designator "Outlet designator"
 VARDESC outlet.2.id "Outlet system identifier"
 VARDESC outlet.2.desc "Outlet description"
 VARDESC outlet.2.switch "Outlet switch control"
@@ -194,7 +199,18 @@ VARDESC outlet.2.autoswitch.charge.low "Remaining battery level to power off thi
 VARDESC outlet.2.delay.shutdown "Interval to wait before shutting down this outlet (seconds)"
 VARDESC outlet.2.delay.start "Interval to wait before restarting this outlet (seconds)"
 
-VARDESC device.part "Device Part Number"
+VARDESC device.part "Device part number"
+VARDESC device.mfr "Device manufacturer"
+VARDESC device.model "Device model"
+VARDESC device.serial "Device serial number"
+VARDESC device.type "Device type"
+VARDESC device.description "Device description"
+VARDESC device.contact "Device administrator name"
+VARDESC device.location "Device physical location"
+VARDESC device.macaddr "Physical network address of the device"
+VARDESC device.uptime "Device uptime in seconds"
+VARDESC device.count "Total number of daisychained devices"
+VARDESC device.usb.version "Device USB version"
 
 VARDESC server.info "Server information"
 VARDESC server.version "Server version"
@@ -207,6 +223,8 @@ VARDESC driver.flag.allow_killpower "Safety flip-switch to allow the driver daem
 VARDESC driver.version "Driver version - NUT release"
 VARDESC driver.version.internal "Internal driver version"
 VARDESC driver.version.usb "USB library version"
+VARDESC driver.version.data "Version of the internal data mapping, for generic drivers"
+VARDESC driver.state "Current state in driver's lifecycle"
 
 # FIXME: driver.parameter and driver.flag can have many possible members
 #

docs/new-drivers.txt

@@ -124,7 +124,9 @@ and it doesn't appear to be connected, display an error and exit. This
 is the last time your driver is allowed to bail out.
 
 This is usually a good place to create variables like `ups.mfr`,
-`ups.model`, `ups.serial`, and other "one time only" items.
+`ups.model`, `ups.serial`, determine and declare supported instant
+commands (maybe model-dependent, typically for all devices supported
+by the driver), and other "one time only" items.
 
 upsdrv_updateinfo
 ~~~~~~~~~~~~~~~~~
@@ -740,6 +742,12 @@ If your hardware and driver can support a command, register it.
 
 	dstate_addcmd("load.on");
 
+Don't forget to define the implementation for such commands in a common
+method, and register that your driver has an instant command handler at
+all -- with a line in `upsdrv_initinfo()` like:
+
+	upsh.instcmd = blazer_instcmd;
+
 Delays and ser_* functions
 --------------------------
 

docs/nut-names.txt

@@ -134,6 +134,7 @@ during a transition period. The ups.* data will then be removed.
 | device.macaddr      | Physical network address of the device     | 68:b5:99:f5:89:27
 | device.uptime       | Device uptime in seconds                   | 1782
 | device.count        | Total number of daisychained devices       | 1
+| device.usb.version  | Device USB version                         | 01.29
 |====================================================================================
 
 [NOTE]
@@ -320,6 +321,8 @@ input: Incoming line/power information
 								                                  | 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.bypass.voltage        | Input bypass voltage (V)          | 233
+| input.bypass.frequency      | Input bypass frequency (Hz)       | 50
 | input.load                  | Load on (ePDU) input (percent
                                 of full)                          | 25
 | input.realpower             | Current sum value of all (ePDU)
@@ -443,7 +446,8 @@ Valid SPECs
 
 NOTE: For cursory readers -- the following couple of tables lists just the
 short `SPEC` component of the larger `DOMAIN.CONTEXT.SPEC` naming scheme
-for phase-aware values, as discussed in other sections of this chapter.
+for phase-aware values, as discussed in other sections of this chapter just
+above. These are NOT to be used verbatim as complete data-point names!
 
 Valid with/without context (i.e. per phase or aggregated/averaged)
 
@@ -534,6 +538,7 @@ battery: Any battery details
                                  to "Warning" state (percent)        | 50
 | battery.charger.status       | Status of the battery charger
                                  (see the note below)                | charging
+| battery.charger.type         | Type of battery charger             | ABM
 | battery.voltage              | Battery voltage (V)                 | 24.84
 | battery.voltage.cell.max     | Maximum battery voltage seen of the
                                  Li-ion cell (V)                     | 3.44
@@ -718,6 +723,7 @@ of the user manual.
 | outlet.n.ecocontrol            | Master Outlet used to
                                    automatically power off the
                                    slave outlets               | The outlet is not ECO controlled
+| outlet.n.designator            | Outlet designator           | AC OUTPUT
 | outlet.n.autoswitch.charge.low | Remaining battery level to
                                    power off this outlet
                                    (percent)                   | 80

docs/nut.dict

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3268 utf-8
+personal_ws-1.1 en 3269 utf-8
 AAC
 AAS
 ABI
@@ -1786,6 +1786,7 @@ desc
 deschis
 descr
 desde
+designator
 dev
 devctl
 devd