nutconf-related C++ sources: add new UPSMON-style notification keywords to vocabulary

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

common/nutconf.cpp

@@ -3,6 +3,7 @@
 
     Copyright (C)
         2012	Emilien Kia <emilien.kia@gmail.com>
+        2024	Jim Klimov <jimklimov+nut@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -1075,6 +1076,18 @@ UpsmonConfiguration::NotifyType UpsmonConfiguration::NotifyTypeFromString(const
 		return NOTIFY_NOCOMM;
 	else if(str=="NOPARENT")
 		return NOTIFY_NOPARENT;
+	else if(str=="CAL")
+		return NOTIFY_CAL;
+	else if(str=="NOTCAL")
+		return NOTIFY_NOTCAL;
+	else if(str=="OFF")
+		return NOTIFY_OFF;
+	else if(str=="NOTOFF")
+		return NOTIFY_NOTOFF;
+	else if(str=="BYPASS")
+		return NOTIFY_BYPASS;
+	else if(str=="NOTBYPASS")
+		return NOTIFY_NOTBYPASS;
 	else
 		return NOTIFY_TYPE_MAX;
 }

common/nutwriter.cpp

@@ -3,6 +3,7 @@
 
     Copyright (C)
         2012	Vaclav Krpec  <VaclavKrpec@Eaton.com>
+        2024	Jim Klimov <jimklimov+nut@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -240,6 +241,12 @@ const NotifyFlagsStrings::TypeStrings NotifyFlagsStrings::type_str = {
 	"REPLBATT",	// NOTIFY_REPLBATT
 	"NOCOMM",	// NOTIFY_NOCOMM
 	"NOPARENT",	// NOTIFY_NOPARENT
+	"CAL\t",	// NOTIFY_CAL (including padding)
+	"NOTCAL",	// NOTIFY_NOTCAL
+	"OFF\t",	// NOTIFY_OFF (including padding)
+	"NOTOFF",	// NOTIFY_NOTOFF
+	"BYPASS",	// NOTIFY_BYPASS
+	"NOTBYPASS",	// NOTIFY_NOTBYPASS
 };
 
 

include/nutconf.hpp

@@ -3,6 +3,7 @@
 
     Copyright (C)
 	2012	Emilien Kia <emilien.kia@gmail.com>
+	2024	Jim Klimov <jimklimov+nut@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -658,6 +659,12 @@ class UpsmonConfiguration : public Serialisable
 		NOTIFY_REPLBATT,
 		NOTIFY_NOCOMM,
 		NOTIFY_NOPARENT,
+		NOTIFY_CAL,
+		NOTIFY_NOTCAL,
+		NOTIFY_OFF,
+		NOTIFY_NOTOFF,
+		NOTIFY_BYPASS,
+		NOTIFY_NOTBYPASS,
 		NOTIFY_TYPE_MAX
 	};
 

tools/nutconf/nutconf-cli.cpp

@@ -1,5 +1,7 @@
 /*
- *  Copyright (C) 2013 - EATON
+ *  Copyright (C)
+ *      2013 - EATON
+ *      2024 - Jim Klimov <jimklimov+nut@gmail.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -130,7 +132,8 @@ const char * Usage::s_text[] = {
 	"UPS device is specified by the following sequence:",
 	"    <ups_ID> <driver> <port> [<key>=<value>]*",
 	"Notification types:",
-	"    ONLINE, ONBATT, LOWBATT, FSD, COMMOK, COMMBAD, SHUTDOWN, REPLBATT, NOCOMM, NOPARENT",
+	"    ONLINE, ONBATT, LOWBATT, FSD, COMMOK, COMMBAD, SHUTDOWN, REPLBATT, NOCOMM, NOPARENT,",
+	"    CAL, NOTCAL, OFF, NOTOFF, BYPASS, NOTBYPASS",
 	"Notification flags:",
 	"    SYSLOG, WALL, EXEC, IGNORE",
 	"User specification:",