Merge pull request #2448 from ntd/bicker

WIP: Bicker serial driver

NEWS.adoc

@@ -146,6 +146,10 @@ https://github.com/networkupstools/nut/milestone/11
  respective warnings issued by the new generations of analysis tools.
  [#823, #2437, link:https://github.com/networkupstools/nut-website/issues/52[nut-website issue #52]]
 
+ - bicker_ser: added new driver for Bicker 12/24Vdc UPS via RS-232 serial
+ communication protocol, which supports any UPS shipped with the PSZ-1053
+ extension module. [PR #2448]
+
 
 Release notes for NUT 2.8.2 - what's new since 2.8.1
 ----------------------------------------------------

data/driver.list.in

@@ -196,6 +196,11 @@
 "Best Power" "ups" "1" "Micro-Ferrups" "" "bestuferrups"
 "Best Power" "ups" "1" "Fortress/Ferrups" "f-command support" "bestfcom"
 
+"Bicker" "ups" "3" "UPSIC-1205" "" "bicker_ser"
+"Bicker" "ups" "3" "UPSIC-2403" "" "bicker_ser"
+"Bicker" "ups" "3" "DC2412-UPS" "" "bicker_ser"
+"Bicker" "ups" "3" "DC2412-UPS-LD" "" "bicker_ser"
+
 "Borri" "ups" "2" "B400-010-B/B400-020-B/B400-030-B/B400-010-C/B400-020-C/B400-030-C" "USB" "blazer_usb"
 "Borri" "ups" "2" "B400-R010-B/B400-R020-B/B400-R030-B/B400-R010-C/B400-R020-C/B400-R030-C" "USB" "blazer_usb"
 "Borri" "ups" "2" "B500-060-B/B500-100-B/B500-060-C/B500-100-C" "USB" "blazer_usb"

docs/man/Makefile.am

@@ -430,6 +430,7 @@ SRC_SERIAL_PAGES = \
  bestuferrups.txt \
  bestups.txt \
  bestfcom.txt \
+ bicker_ser.txt \
  blazer-common.txt \
  blazer_ser.txt \
  clone.txt \
@@ -477,6 +478,7 @@ MAN_SERIAL_PAGES = \
  bestuferrups.8 \
  bestups.8 \
  bestfcom.8 \
+ bicker_ser.8 \
  blazer_ser.8 \
  clone.8 \
  dummy-ups.8 \
@@ -526,6 +528,7 @@ HTML_SERIAL_MANS = \
  bestuferrups.html \
  bestups.html \
  bestfcom.html \
+ bicker_ser.html \
  blazer_ser.html \
  clone.html \
  dummy-ups.html \

docs/man/bicker_ser.txt

@@ -0,0 +1,66 @@
+BICKER_SER(8)
+=============
+
+NAME
+----
+
+bicker_ser - Driver for Bicker DC UPS via serial port connections
+
+SYNOPSIS
+--------
+
+*bicker_ser* -h
+
+*bicker_ser* -a 'UPS_NAME' ['OPTIONS']
+
+NOTE: This man page only documents the hardware-specific features of the
+*bicker_ser* driver. For information about the core driver, see
+linkman:nutupsdrv[8].
+
+SUPPORTED HARDWARE
+------------------
+
+*bicker_ser* supports all Bicker UPSes shipped with the PSZ-1053 extension
+module such as UPSIC-1205, UPSIC-2403, DC2412-UPS and DC2412-UPS-LD.
+
+CABLING
+-------
+
+The needed cable is a standard pin-to-pin serial cable with pins 2, 3 and 5
+(on DB9 connector) connected.
+
+EXTRA ARGUMENTS
+---------------
+
+This driver supports no extra arguments from linkman:ups.conf[5].
+
+INSTANT COMMANDS
+----------------
+
+*shutdown.return*::
+Turn off the load and return when power is back.
+
+KNOWN ISSUES AND BUGS
+---------------------
+
+*ups.delay.shutdown is not honored*::
+Although that delay is properly set when sending the shutdown command, it seems
+some UPS ignore it and use a fixed 2 seconds delay instead.
+
+AUTHOR
+------
+
+Nicola Fontana <[email protected]>
+
+SEE ALSO
+--------
+
+The core driver:
+~~~~~~~~~~~~~~~~
+
+linkman:nutupsdrv[8]
+
+Internet resources:
+~~~~~~~~~~~~~~~~~~~
+
+The NUT (Network UPS Tools) home page: https://www.networkupstools.org/

docs/nut.dict

@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3149 utf-8
+personal_ws-1.1 en 3151 utf-8
 AAC
 AAS
 ABI
@@ -373,6 +373,7 @@ Fideltronik
 Filipozzi
 Fiskars
 FlossMetrics
+Fontana
 Forza
 Fosshost
 Frama
@@ -858,6 +859,7 @@ PSSENTR
 PSUs
 PSW
 PSX
+PSZ
 PThreads
 PULS
 PV
@@ -1245,6 +1247,7 @@ UPS's
 UPSCONN
 UPSDESC
 UPSHOST
+UPSIC
 UPSIMAGEPATH
 UPSLC
 UPSNOTIFY

drivers/Makefile.am

@@ -57,7 +57,7 @@ SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom \
  gamatronic genericups isbmex liebert liebert-esp2 masterguard metasys \
  mge-utalk microdowell microsol-apc mge-shut oneac optiups powercom rhino \
  safenet nutdrv_siemens-sitop solis tripplite tripplitesu upscode2 victronups powerpanel \
- blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser
+ blazer_ser ivtscd apcsmart apcsmart-old riello_ser sms_ser bicker_ser
 SNMP_DRIVERLIST = snmp-ups
 USB_LIBUSB_DRIVERLIST = usbhid-ups bcmxcp_usb tripplite_usb \
  blazer_usb richcomm_usb riello_usb \
@@ -186,6 +186,8 @@ riello_ser_SOURCES = riello.c riello_ser.c
 riello_ser_LDADD = $(LDADD) -lm
 sms_ser_SOURCES = sms_ser.c
 sms_ser_LDADD = $(LDADD) -lm
+bicker_ser_SOURCES = bicker_ser.c
+bicker_ser_LDADD = $(LDADD) -lm
 
 # non-serial drivers: these use custom LDADD and/or CFLAGS