Merge 0e0db5c into 2cbdaea

Author: atanas-vladimirov

NEWS.adoc

@@ -111,6 +111,11 @@ https://github.com/networkupstools/nut/milestone/12
      return the correct command length, resolving a bug for all commands using
      the `,XX` slave address placeholder. This also enables support for the
      `test.battery.start.deep` (`TUD`) command. [#3141]
+   * `nutdrv_qx_masterguard` sub-driver adds a `clear.fault.record` instant
+     command to clear the fault record. Also adds two experimental variables:
+     `battery.ageing.factor` (Battery ageing factor in promille) and
+     `battery.calibration.factor` (Battery calibration factor in percent).
+     Tested on A1000 and A2000 units. [#3181]
 
  - `powerp-bin` and `powerp-txt` driver updates:
    * Their `upsdrv_initinfo()` methods did not explicitly reference the

data/cmdvartab

@@ -257,6 +257,7 @@ 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 clear.fault.record "Clear fault/error record"
 CMDDESC bypass.start "Put the UPS in Bypass mode"
 CMDDESC bypass.stop "Take the UPS out of Bypass mode"
 CMDDESC experimental.ecomode.start "Put UPS in High Efficiency (aka ECO) mode"

docs/man/nutdrv_qx.txt

@@ -525,6 +525,9 @@ Perform a battery test for the duration of 'value' seconds (truncated to 60 seco
 MASTERGUARD PROTOCOL
 ~~~~~~~~~~~~~~~~~~~~
 
+*clear.fault.record*::
+Clear fault/error record
+
 *beeper.enable*::
 Enable the UPS beeper.
 

docs/nut-names.txt

@@ -1080,6 +1080,8 @@ to last as part of NUT standard protocol in the long run.
 [options="header"]
 |========================================================================
 | Name                              | Driver/Devices        | Description
+| clear.fault.record                | nutdrv_qx_masterguard => Masterguard
+    | Clear fault/error record
 | experimental.test.beeper.start    | nutdrv_hashx => Atlantis Land
     | Start testing the UPS beeper
 | experimental.test.beeper.stop     | nutdrv_hashx => Atlantis Land

docs/nut.dict

@@ -2889,6 +2889,7 @@ prog
 progname
 prognames
 progs
+promille
 proxied
 prtconf
 ps

drivers/nutdrv_qx_masterguard.c

@@ -767,6 +767,8 @@ static item_t masterguard_qx2nut[] = {
 	 */
 	/* type			flags	rw	command		answer	len	leading	value	from	to	dfl	qxflags	precmd				preans	preproc */
 	{ "battery.charge",	0,	NULL,	"GBS,XX\r",	"",	43,	'(',	"",	4,	6,	"%.0f",	0,	masterguard_add_slaveaddr,	NULL,	NULL },
+	{ "experimental.battery.ageing.factor",	0,	NULL,	"GBS,XX\r",	"",	43,	'(',	"",	18,	21,	"%.0f",	QX_FLAG_NONUT,	masterguard_add_slaveaddr,	NULL,	NULL },
+	{ "experimental.battery.calibration.factor",	0,	NULL,	"GBS,XX\r",	"",	43,	'(',	"",	33,	35,	"%.0f",	QX_FLAG_NONUT,	masterguard_add_slaveaddr,	NULL,	NULL },
 	/* 
 	 * hhhh: hold time (minutes)
 	 * HHHH: recharge time to 90% (minutes)
@@ -864,6 +866,7 @@ static item_t masterguard_qx2nut[] = {
 	/* test.system.start */
 	/* calibrate.start */
 	/* calibrate.stop */
+	{ "clear.fault.record",		0,	NULL,	"FCLR,XX\r",	"",	0,	'\0',	"",	0,	0,	NULL,	QX_FLAG_CMD,	masterguard_add_slaveaddr,	NULL,	NULL },
 	{ "bypass.start",		0,	NULL,	"FOFF\r",	"",	0,	'\0',	"",	0,	0,	NULL,	QX_FLAG_CMD,	NULL,				NULL,	NULL },
 	{ "bypass.stop",		0,	NULL,	"FON\r",	"",	0,	'\0',	"",	0,	0,	NULL,	QX_FLAG_CMD,	NULL,				NULL,	NULL },
 	/* reset.input.minmax */
@@ -1061,6 +1064,8 @@ static void masterguard_makevartable(void) {
 	addvar(VAR_VALUE, "fault_3", "Fault record 3");
 	addvar(VAR_VALUE, "fault_4", "Fault record 4");
 	addvar(VAR_VALUE, "fault_5", "Fault record 5 (oldest)");
+	addvar(VAR_VALUE, "experimental.battery.ageing.factor", "Battery ageing factor (promille, 1000=new)");
+	addvar(VAR_VALUE, "experimental.battery.calibration.factor", "Battery calibration factor (percent)");
 }