Merge 0c8c032 into 8916ac8

Author: jimklimov

NEWS.adoc

@@ -168,6 +168,10 @@ https://github.com/networkupstools/nut/milestone/9
    * Added APC BVKxxxM2 to list of devices where `lbrb_log_delay_sec=N` may be
      necessary to address spurious LOWBATT and REPLACEBATT events. [#2942]
 
+ - `pijuice` driver updates:
+   * Converted to NUT standard use of `status_set()` with single-token values.
+     [issue #2708]
+
  - `apc_modbus` driver updates:
    * The time stamp and inter-frame delay accounting was fixed, alleviating
      one of the problems reported in issue #2609. [PR #2982]

docs/packager-guide.txt

@@ -168,6 +168,7 @@ Overview of the package tree
 FIXME: make a dependency graph
 
 - <<pkg-nut,nut>>
+- <<pkg-nut-common,nut-common>>
 - <<pkg-libupsclient1,libupsclient1>>
 - <<pkg-libupsclient1-dev,libupsclient1-dev>>
 - <<pkg-nut-cgi,nut-cgi>>
@@ -212,6 +213,16 @@ name may vary across the various systems.
 discussion.
 ========================================================================
 
+[[pkg-nut-common]]
+nut
+^^^
+- Desc:
+- Files: install scripts to register user/group accounts in the OS;
+  shared data and configuration files (e.g. systemd-tmpfiles, maybe
+  systemd-presets, in case of Linux packaging)
+- Size:
+- Deps:
+
 [[pkg-nut]]
 nut
 ^^^

drivers/pijuice.c

@@ -23,7 +23,7 @@
 #include "nut_stdint.h"
 
 #define DRIVER_NAME                         "PiJuice UPS driver"
-#define DRIVER_VERSION                      "0.14"
+#define DRIVER_VERSION                      "0.15"
 
 /*
  * Linux I2C userland is a bit of a mess until distros refresh to
@@ -340,12 +340,9 @@ static void get_charge_level_hi_res(void)
 static void get_status(void)
 {
 	uint8_t	cmd = STATUS_CMD, data, batteryStatus, powerInput, powerInput5vIo;
-	char	status_buf[ST_MAX_VALUE_LEN];
 
 	upsdebugx( 3, __func__ );
 
-	memset( status_buf, 0, ST_MAX_VALUE_LEN );
-
 	I2C_READ_BYTE( upsfd, cmd, __func__ )
 
 	batteryStatus = data >> 2 & 0x03;
@@ -422,17 +419,17 @@ static void get_status(void)
 		if ( battery_charge_level <= LOW_BATTERY_THRESHOLD )
 		{
 			upsdebugx( 1, "Battery Charge Status: LOW" );
-			snprintfcat( status_buf, ST_MAX_VALUE_LEN, "LB " );
+			status_set("LB");
 		}
 		else if ( battery_charge_level > HIGH_BATTERY_THRESHOLD )
 		{
 			upsdebugx( 1, "Battery Charge Status: HIGH" );
-			snprintfcat( status_buf, ST_MAX_VALUE_LEN, "HB " );
+			status_set("HB");
 		}
 	}
 	else if ( batteryStatus == BATT_NOT_PRESENT )
 	{
-		snprintfcat( status_buf, ST_MAX_VALUE_LEN, "RB " );
+		status_set("RB");
 	}
 
 	if ( batteryStatus  <= BATT_NOT_PRESENT &&
@@ -451,10 +448,10 @@ static void get_status(void)
 			battery_power = 0;
 			upsdebugx( 1, "On USB power [%d:%d:%d]", usb_power, gpio_power, battery_power );
 
-			snprintfcat( status_buf, sizeof(status_buf), "OL" );
+			status_set("OL");
 			if ( batteryStatus == BATT_CHARGING_FROM_5V )
 			{
-				snprintfcat( status_buf, sizeof( status_buf ), " CHRG" );
+				status_set("CHRG");
 				upsdebugx( 1, "Battery Charger Status: charging" );
 				dstate_setinfo( "battery.charger.status", "%s", "charging" );
 			}
@@ -463,7 +460,6 @@ static void get_status(void)
 				upsdebugx( 1, "Battery Charger Status: resting" );
 				dstate_setinfo( "battery.charger.status", "%s", "resting" );
 			}
-			status_set( status_buf );
 		}
 		else if ( powerInput5vIo == POWER_NOT_PRESENT &&
 		      ( powerInput   != POWER_NOT_PRESENT &&
@@ -478,17 +474,15 @@ static void get_status(void)
 			battery_power = 0;
 			upsdebugx( 1, "On 5V_GPIO power [%d:%d:%d]", usb_power, gpio_power, battery_power );
 
-			snprintfcat( status_buf, sizeof(status_buf), "OL" );
+			status_set("OL");
 			if ( batteryStatus == BATT_CHARGING_FROM_IN )
 			{
-				snprintfcat( status_buf, sizeof(status_buf), " CHRG" );
-				status_set( status_buf );
+				status_set("CHRG");
 				upsdebugx( 1, "Battery Charger Status: charging" );
 				dstate_setinfo( "battery.charger.status", "%s", "charging" );
 			}
 			else if ( batteryStatus == BATT_NORMAL )
 			{
-				status_set( status_buf );
 				upsdebugx( 1, "Battery Charger Status: resting" );
 				dstate_setinfo( "battery.charger.status", "%s", "resting" );
 			}
@@ -505,17 +499,15 @@ static void get_status(void)
 			battery_power = 0;
 			upsdebugx( 1, "On USB and 5V_GPIO power [%d:%d:%d]", usb_power, gpio_power, battery_power );
 
-			snprintfcat( status_buf, sizeof( status_buf ), "OL" );
+			status_set("OL");
 			if ( batteryStatus == BATT_CHARGING_FROM_IN )
 			{
-				snprintfcat( status_buf, sizeof(status_buf), " CHRG");
-				status_set( status_buf );
+				status_set("CHRG");
 				upsdebugx( 1, "Battery Charger Status: charging" );
 				dstate_setinfo("battery.charger.status", "%s", "charging");
 			}
 			else if ( batteryStatus == BATT_NORMAL )
 			{
-				status_set( status_buf );
 				upsdebugx( 1, "Battery Charger Status: resting" );
 				dstate_setinfo( "battery.charger.status", "%s", "resting" );
 			}
@@ -531,8 +523,8 @@ static void get_status(void)
 			battery_power = 1;
 			upsdebugx( 1, "On Battery power [%d:%d:%d]", usb_power, gpio_power, battery_power );
 
-			snprintfcat( status_buf, sizeof(status_buf), "OB DISCHRG" );
-			status_set( status_buf );
+			status_set("OB");
+			status_set("DISCHRG");
 		}
 	}
 }

drivers/powervar_cx.c

@@ -975,7 +975,7 @@ void PvarCommon_Updateinfo (void)
 		{
 			if ((byOnBat) && (SubString[0] == '3'))
 			{
-				status_set ("LB");
+				status_set("LB");
 			}
 		}
 
@@ -1062,7 +1062,7 @@ void PvarCommon_Updateinfo (void)
 		{
 			if (SubString[0] == '1')
 			{
-				status_set ("RB");
+				status_set("RB");
 			}
 		}
 
@@ -1071,7 +1071,7 @@ void PvarCommon_Updateinfo (void)
 		{
 			if (SubString[0] == '1')
 			{
-				status_set ("OVER");
+				status_set("OVER");
 			}
 		}
 
@@ -1082,7 +1082,7 @@ void PvarCommon_Updateinfo (void)
 			if (SubString[0] == '1')
 			{
 				dstate_setinfo("ups.test.result", "Change Battery");
-				status_set ("RB");
+				status_set("RB");
 			}
 			else
 			{