make "ifdef CALC" also consider SYNAPPS variable

change the ifdefs to the same expression used in CONFIG_STREAM
make "stream" in DBD and other file names explicit
2021-11-05 11:42:48 +01:00 · 2021-11-05 11:42:48 +01:00 · 2021-11-05 11:21:21 +01:00 · 2021-11-05 10:14:21 +01:00 · 2021-11-05 10:13:58 +01:00 · 2021-09-21 13:01:32 +01:00
42 changed files with 1085 additions and 373 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,3 +7,4 @@ include
 *.pdf
 *.*log
 StreamVersion.h
+*.local
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,303 @@
+# Changelog
+
+## Changes in release 2.8.20
+
+Fix missing initialization of `inTerminator` and `outTerminator`.
+Thanks to Krisztián Löki.
+
+New checksums `%<lrc>` and `%<hexlrc>`.
+Thanks to Marcio Paduan Donadio.
+
+Make timestamp output in error and debug messages optional with new
+iocsh variable `streamMsgTimeStamped`. Default is 1.
+
+Reduce number of duplicate error messages. Dead time for repeated messages
+is configurable with new iocsh variable `streamErrorDeadTime`.
+Thanks to Dominic Oram.
+
+Shifted some noisy debug messages to `streamDebug` level 2.
+
+In `STREAM_PROTOCOL_PATH`, allow both `:` and `;` separators on all
+operating systems to make startup scripts OS independent.
+On Windows however, an initial single letter followed by a `:` is detected
+as a drive letter. Thus single letter directories must be separated with
+`;` or followed by `\` or `/` on Windows.
+
+Allow absolute path protocol files. Those will not use
+`STREAM_PROTOCOL_PATH`. 
+Changed the default search path from `"."` to `NULL`.
+
+Only poll for `I/O Intr` records while `interruptAccept` is true,
+in particular not between `iocPause` and `iocRun`.
+
+Added this change log and a document about contributing to StreamDevice.
+
+## Changes in release 2.8.19
+
+Make colorization of error and debug messages optional with new
+iocsh variable `streamDebugColored`. Defaults to 1 when output is a tty
+and 0 otherwise.
+
+## Changes in release 2.8.18
+
+Another format string fix for VxWorks in checksum converter.
+
+## Changes in release 2.8.17
+
+Fix format strings for VxWorks 6.9 in checksum converter.
+
+Fix some compiler warnings on Windows.
+
+Fix some missing header files installations.
+
+## Changes in release 2.8.16
+
+Drop support of upper level `configure/` directory for improved
+compatibility with SynApps.
+
+Fix problem with extra spaces after protocol name in record links.
+
+Make version string generation more robust.
+
+## Changes in release 2.8.15
+
+Do not overwrite `HOST_OPT` flag. 
+
+Fix version string generation for zip downloads.
+
+On Windows use `;` and `\` in `STREAM_PROTOCOL_PATH`.
+(Was not the case before due to typo in macro name.)
+
+Link streamApp with `seq` and `pv` libraries when `SNCSEQ` is defined in
+RELEASE file.
+
+## Changes in release 2.8.14
+
+Fix version string generation from git tags.
+
+## Changes in release 2.8.13
+
+Fix bug with integer datatype handling in redirectons.
+
+## Changes in release 2.8.12
+
+Apply GPL-3.0.
+
+## Changes in release 2.8.11
+
+Fix buffer overrun.
+Thanks to Garth Brown and Bruce Hill.
+
+Fix bug in 64 bit data type handling in array records (`aai`, `aao`,
+`waveform`).
+Thanks to Andrew Johnson.
+
+Fix Windows linker problem.
+Thanks to Freddie Akeroyd.
+
+Allow `(,)` inside protocol parameters. Limitation: Parenthesis must be in
+matching pairs. Commas within inner parenthesis are consideres part of the
+argument. Example: `protocol(arg1, (arg2, still arg 2), arg3)`.
+
+New checksums `%<brksCryo>`, `%<xor8ff>`, `%<nsum8>`, `%<nsum16>`,
+`%<nsum32>`, `%<notsum>`.
+Thanks to Mark Davis.
+
+Some error message cleanup.
+
+## Changes in release 2.8.10
+
+Fixes for Windows / Visual Studio 2010.
+Thanks to Freddie Akeroyd.
+
+Fix infinite loop in `I/O Intr` scanned records.
+
+Enable error messages by default and always show error messages too when
+debug messages are enabled.
+
+Make sure any console output from StreamDevice can be redirected.
+
+Fix some problems when building for old EPICS R3.13.
+
+## Changes in release 2.8.9
+
+Leave `asynTraceMask` alone. Before, streamDevice had set `setTraceMask`
+to 0 initially.
+
+Link with `sscan` module if `SSCAN` is defined in RELEASE file because the
+`calc` module may need it.
+
+Fix in regsub converter: Avoid infinite loop if an empty string is matched.
+Add support for toupper/tolower to regsub converter.
+
+Fix build problem observed on MacOS related to clash between `wait()`
+system function and the StreamDevice `wait` command.
+
+Allow `%%` in addition to `\%` to escape `%` in protocols (compatibility
+with `printf`/`scanf`).
+
+Have separate dbd file for applications without scalcout support built in.
+
+Improved compatibility with SynApps. (fix of the attempt in 2.8.6)
+
+## Changes in release 2.8.8
+
+Fix problem with `in` command hanging forever if it is the the first
+command of the protocol and the device is offline.
+
+## Changes in release 2.8.7
+
+Enable colored error/debug output on Windows.
+
+Changed error/debug hex output highlight from fat to inverse.
+
+Fix build problem on Windows.
+
+## Changes in release 2.8.6
+
+Improved compatibility with SynApps.
+
+Fix redirection to records with names not starting with a letter or
+underscore.
+
+### Fixes/improvements for `mbbo` device support:
+
+Use `.MASK` and `.SHFT` fields even if no `xxVL` field is defined
+(and thus `.VAL` is used instead of `.RVAL`).
+
+Bugfix: Set `mbbo` to unknown state `0xffff` if in readback no state
+matches.
+
+Bugfix: Use defined state alarms when `mbbo` is updated by `@init` handler.
+
+## Changes in release 2.8.5
+
+A `"\?"` at the end of an input format now matches an empty string.
+Used to do so unintendedly in earlier versions but had been changed.
+
+## Changes in release 2.8.4
+
+Bugfix: After `@init` had been triggered with "magic value" 2 in `.PROC`
+field, reset the field to 0.
+
+## Changes in release 2.8.3
+
+Increase limits on filename, protocolname, busname in record links.
+
+Bugfix: Fix typo calcout device support that prevented compiling it.
+
+## Changes in release 2.8.2
+
+Bugfix: Fix string termination reading into char array records (`waveform`,
+`aai`, `aao`, `lsi`, `lso`).
+
+## Changes in release 2.8.1
+
+Allow empty parameter list `()` in record links.
+
+## Changes between 2.7 and 2.8.0
+
+### Build system
+
+Drop support for (buggy) cygnus-2.7.2 gcc (as used in some old cygwin
+version).
+
+Add standard EPICS App build system (`configure/`).
+
+Some re-ordering of directories.
+When upgrading from 2.7 or earlier to 2.8, better start with a fresh
+source directory to avoid problems with files that have moved.
+
+### New Features
+
+Support for 64 bit integers. This affects some conversions (e.g. in `ai`
+and `ao` records).
+
+Device support for new record types `int64in`, `int64out`, `lsi` and `lso`
+added.
+
+Support for new `INT64` and `UINT64` types in `aai`, `aao` and `waveform`
+records.
+
+Allow spaces in protocol parameter list in record link.
+One space after the opening `(`, before and after the separating `,` and
+before the closing `)` ignored. More spaces are part of the parameter.
+
+String format `%s` can now pad with 0-bytes instead of spaces using the
+`0` flag.
+
+New checksums `%<cpi>` and `%<leybold>`.
+
+Properly distinguish beween signed and unsigned integers, e.g. when
+converting to double.
+Allow signed enums to do this: `%#{backwards=-1|stop=0|forwards=1}`.
+
+#### New connection handling
+
+Run `@init` handler each time the device (re-)connects
+(as long as asynDriver detects connection changes), also at each `iocRun`
+(after being paused with `iocPause`), and after each `streamReload`.
+
+Also run `@init` of a record when the "magic value" 2 is written to the
+`.PROC` field or when new `streamReinitRecord` shell function is called.
+
+Trigger monitors when `@init` updates output records (after the intial run
+in `iocInit`).
+
+Use `"COMM"` error code in `.STAT` when device is disconnected.
+
+If write fails because device has disconnected, try to re-connect and re-do
+write once.
+
+### Bug fixes 
+
+Fix parser bug when command reference was followed by `}` without `;`.
+
+Fix potential buffer overrun during `streamReload`.
+After `streamReload`, properly delete handlers and variables that do not
+exist any longer.
+
+Fix for waveforms of unsigned integers.
+
+Several Windows related fixes and support building shared libraries on
+Windows.
+
+Fix C++11 warnings.
+
+Check formatting of `exec` command for errors.
+
+Fix bug in `dbior` output.
+
+Fix BCD `%D` format and allow negative values.
+
+Fix signed hex and octal formats.
+
+Fix in regsub: Do not run regsub again on substituted string.
+
+### Shell functions
+
+New functions `streamReportRecord` and `streamSetLogfile`.
+
+Support output redirection to file of stream shell functions
+and protocol dump via `dbior`.
+
+### Error and debug output
+
+Cleanup some debug and error messages.
+
+Hex bytes in debug/error output are now highlighted.
+
+`StreamError` can now be set before `iocInit`.
+
+Avoid repeating error messages.
+Thanks to Ben Franksen.
+
+### Documentation
+
+HTML files converted to HTML 5. 
+
+Update and improve several chapters.
+
+## Changes in releases up to 2.7.14
+
+Not available. See git log.
--- a/Contributing.md
+++ b/Contributing.md
@ -0,0 +1,81 @@
+# Contributing to StreamDevice
+
+Contributions from the EPICS community (and others) are welcome.
+To ease the integration process, please follow the following guidelines.
+
+All contributions should be done as a pull request to the git repository
+https://github.com/paulscherrerinstitute/StreamDevice. Make sure to provide
+meaningful commit messages (no essay but more than "changes").
+
+For small modifications, a patch file is sufficient. Send it to me or better
+create an issue on https://github.com/paulscherrerinstitute/StreamDevice/issues
+and attach the patch file.
+
+Justify your change requests. Write a short summary for your pull request
+to explain what the change is about and what it improves or which bug it
+fixes. Use the issue system on github to report bugs.
+
+I reserve the right to accept or reject contributions or to request
+modifications before I accept them.
+
+Of course, you may as well report bugs without providing a solution yourself.
+
+## Code compatibility
+
+All code must compile for any EPICS release from at least R3.14.12 up to the
+latest one. Likewise the code must be compatible with any operating system
+supported by EPICS, like Linux, Windows, MacOS, RTEMS and VxWorks.
+In particular VxWorks 5 compatibility rules out many modern C++ features.
+But there are also other platforms that for example do not support C++11, so
+don't use it. 
+There should also be no compiler warning on any OS.
+
+Avoid compiler dependent features like #pragmas, assumptions on byte order,
+type size (in particular the size of pointers and long int) and other
+non-portable things like the availability of certain header files. Make sure
+non-portable code parts are enclosed in proper compiler branches and provide
+working implementations for all architectures.
+
+Make sure that the code in AsynDriverInterface stays compatible with old
+and new versions of asyn driver.
+
+The core of StreamDevice does not depend on EPICS. This is on purpose, to be
+able to use it in other control system frameworks. Modifications should not
+add EPICS dependencies except to StreamEpics and AsynDriverInterface, or the
+new dependency must be in a separate file which can be left out of the build
+without jeopardizing the main functionality of StreamDevice.
+
+The code must not depend on external libraries that may not be available on
+all systems, except if provided as a separate file which can be left out of
+the build on platforms that do not support the library.
+
+## Language
+
+Write in English. That includes all identifiers (variables, functions, ...),
+comments, documentation and commit messages. Check your spelling.
+
+## File formats
+
+All files are in Unix format (\n line terminators). Do not change them to
+any other format (e.g. Windows with \r\n terminators). Do not add new files in
+other formats.
+
+The files must contain only ASCII characters. Do not use any Unicode multi-byte
+characters (including byte order marks) or any pre-Unicode code page dependent
+characters (e.g. umlaut), not even in comments. Do not use form feed, vertical
+tab, or other control characters except newline.
+
+Indents are 4 spaces. Do not use tabs (except in Makefiles). Make sure your
+editor is set up accordingly.
+
+Files must end in a newline and there must be no spaces at the end of lines.
+Do not add excessive amount of newlines at the end of files.
+
+Do not add any editor configurations (e.g. for emacs) to the files. Also do
+not add any configuration files or directories for development environments,
+editors, etc.
+
+-------
+
+Dirk Zimoch <dirk.zimoch@psi.ch>, June 2021
+
--- a/6
+++ b/6
@ -5,7 +5,7 @@ else
 include /ioc/tools/driver.makefile
 EXCLUDE_VERSIONS = 3.13.2
 PROJECT=stream
-BUILDCLASSES += Linux
+BUILDCLASSES += vxWorks Linux WIN32

 DOCUDIR = docs

@ -25,6 +25,10 @@ HEADERS += src/StreamFormatConverter.h
 HEADERS += src/StreamBuffer.h
 HEADERS += src/StreamError.h
 HEADERS += src/StreamVersion.h
+HEADERS += src/StreamProtocol.h
+HEADERS += src/StreamBusInterface.h
+HEADERS += src/StreamCore.h
+HEADERS += src/MacroMagic.h

 CPPFLAGS += -DSTREAM_INTERNAL -I$(COMMON_DIR)

--- a/19
+++ b/19
@ -21,21 +21,10 @@
 # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 #########################################################################/

-TOP = ..
-ifneq ($(wildcard ../configure),)
-  # We are in an EPICS R3.14+ <TOP> location
-  include $(TOP)/configure/CONFIG
-else ifneq ($(wildcard ../config),)
-  # We are in an EPICS R3.13 <TOP> location
-  CONFIG = $(TOP)/config
-  include $(TOP)/config/CONFIG_APP
-else
-  # Using our own local configuration
-  TOP = .
-  DIRS = configure
-  src_DEPEND_DIRS := $(DIRS)
-  include $(TOP)/configure/CONFIG
-endif
+TOP = .
+DIRS = configure
+src_DEPEND_DIRS := $(DIRS)
+include $(TOP)/configure/CONFIG

 DIRS += src
 DIRS += streamApp
--- a/configure/CONFIG
+++ b/configure/CONFIG
@ -1,14 +1,29 @@
-#CONFIG
-include $(TOP)/configure/CONFIG_APP
-# Add any changes to make definitions here
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!

-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = 
+# Allow user to override where the build rules come from
+RULES = $(EPICS_BASE)

-# Use this when your IOC and the host use different paths
-# to access the application. Typically this will be 
-# used with the Microsoft FTP server or with NFS mounts. Use
-# is indicated by failure of the cdCommands script on
-# vxWorks. You must rebuild in the iocBoot directory 
-# before this takes effect.
-#IOCS_APPL_TOP = <the top of the application as seen by the IOC>
+# RELEASE files point to other application tops
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+-include $(TOP)/configure/RELEASE.Common.$(T_A)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+INSTALL_LOCATION = $(TOP)
+
+# CONFIG_SITE files contain other build configuration settings
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif
--- a/configure/CONFIG_APP
+++ b/configure/CONFIG_APP
@ -1,26 +0,0 @@
-# CONFIG_APP
-
-include $(TOP)/configure/RELEASE
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
-include $(TOP)/configure/RELEASE.Common.$(T_A)
-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
-
-ifneq ($(wildcard $(EPICS_BASE)/configure),)
-CONFIG=$(EPICS_BASE)/configure
-else
-CONFIG=$(EPICS_BASE)/config
-DIRS += config
-endif
-include $(CONFIG)/CONFIG
-
-INSTALL_LOCATION = $(TOP)
-ifdef INSTALL_LOCATION_APP
-INSTALL_LOCATION = $(INSTALL_LOCATION_APP)
-endif
-
-ifdef T_A
-include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
-endif
-
-# dbst based database optimization (default: NO)
-DB_OPT = NO
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@ -0,0 +1,40 @@
+# CONFIG_SITE
+
+-include $(SUPPORT)/configure/CONFIG_SITE
+
+# Make any application-specific changes to the EPICS build
+#   configuration variables in this file.
+#
+# Host/target specific settings can be specified in files named
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#   CONFIG_SITE.Common.$(T_A)
+#   CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+# CHECK_RELEASE controls the consistency checking of the support
+#   applications pointed to by the RELEASE* files.
+# Normally CHECK_RELEASE should be set to YES.
+# Set CHECK_RELEASE to NO to disable checking completely.
+# Set CHECK_RELEASE to WARN to perform consistency checking but
+#   continue building even if conflicts are found.
+CHECK_RELEASE = YES
+
+# Set this when you only want to compile this application
+#   for a subset of the cross-compiled target architectures
+#   that Base is built for.
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
+
+# To install files into a location other than $(TOP) define
+#   INSTALL_LOCATION here.
+#INSTALL_LOCATION=</absolute/path/to/install/top>
+
+# Set this when the IOC and build host use different paths
+#   to the install location. This may be needed to boot from
+#   a Microsoft FTP server say, or on some NFS configurations.
+#IOCS_APPL_TOP = </IOC's/absolute/path/to/install/top>
+
+# These allow developers to override the CONFIG_SITE variable
+# settings without having to modify the configure/CONFIG_SITE
+# file itself.
+-include $(TOP)/../CONFIG_SITE.local
+-include $(TOP)/../configure/CONFIG_SITE.local
+-include $(TOP)/configure/CONFIG_SITE.local
--- a/configure/Makefile
+++ b/configure/Makefile
@ -2,7 +2,7 @@

 TOP=..

-include $(TOP)/configure/CONFIG_APP
+include $(TOP)/configure/CONFIG

 # Set the following to NO to disable consistency checking of
 # the support applications defined in $(TOP)/configure/RELEASE
--- a/docs/formats.html
+++ b/docs/formats.html
@ -589,6 +589,11 @@ In input, the next byte or bytes must match the checksum.
   href="http://www.ietf.org/rfc/rfc1950.txt">RFC 1950</a>.</dd>
 <dt><code>%&lt;hexsum8&gt;</code></dt>
  <dd>One byte. The sum of all hex digits. (Other characters are ignored.)</dd>
+ <dt><code>%&lt;lrc&gt;</code></dt>
+  <dd>One byte. The Longitudinal Redundancy Check according to <a target="ex"
+   href="https://en.wikipedia.org/wiki/Longitudinal_redundancy_check">Wikipedia</a>.</dd>
+ <dt><code>%&lt;hexlrc&gt;</code></dt>
+  <dd>One byte. The LRC for the hex digits. (Other characters are ignored.)</dd>
 </dl>

 <a name="regex"></a>
--- a/docs/setup.html
+++ b/docs/setup.html
@ -54,15 +54,17 @@ git clone https://github.com/paulscherrerinstitute/StreamDevice.git
 <p class="new">
 <em>StreamDevice</em> now comes with a standard
 <kbd>configure</kbd> directory.
-But it can still be built in an external <em>&lt;top&gt;</em>
+<del>But it can still be built in an external <em>&lt;top&gt;</em>
 directory as in previous versions.
 It will automatically detect <em>&lt;top&gt;</em> locations
 from the presence of <kbd>../configure</kbd> or <kbd>../config</kbd>
-directories.
+directories.</del> Using an upper level <kbd>../configure</kbd> is
+no longer supported due to compatibility issues with <em>SynApps</em>.
 </p>
 <p class="new">
 Edit the <kbd>configure/RELEASE</kbd> file to specify the install location
-of EPICS base and of additional software modules, for example:
+of EPICS base and of additional software modules or add a
+<kbd>configure/RELEASE.local</kbd> file to overwrite, for example:
 <pre>
 EPICS_BASE=/home/epics/base-3.16.1
 </pre>
@ -397,11 +399,30 @@ Debug output can be redirected to a file with the command
 When called without a filename, debug output is directed back
 to the console.
 </p>
+<p>
+By default the debug/error output is set to be colored if the terminal allows
+it but this can be set to always colored or never colored by setting 
+<code>streamDebugColored</code> to 1 or 0 respectively.
+</p>
+<p>
+Error and debug messages are prefixed with a time stamp unless the variable
+<code>streamMsgTimeStamped</code> is set to 0.
+</p>
+<p>
+When a device is disconnected StreamDevice can produce many repeated timeout 
+messages. To reduce this logging you can set <code>streamErrorDeadTime</code>
+to an integer number of seconds. When this is set repeated timeout messages 
+will not be printed in the specified dead time after the last message. The 
+default dead time is 0, resulting in every message being printed.
+</p>

 <h3>Example (vxWorks):</h3>
 <pre>
 streamError=1
 streamDebug=1
+streamDebugColored=1
+streamErrorDeadTime=30
+streamMsgTimeStamped=1
 streamSetLogfile("logfile.txt")
 </pre>

@ -409,6 +430,9 @@ streamSetLogfile("logfile.txt")
 <pre>
 var streamError 1
 var streamDebug 1
+var streamDebugColored 1
+var streamErrorDeadTime 30
+var streamMsgTimeStamped 1
 streamSetLogfile("logfile.txt")
 </pre>

--- a/src/AsynDriverInterface.cc
+++ b/src/AsynDriverInterface.cc
@ -34,18 +34,16 @@ extern "C" {
 #include "iocsh.h"
 #endif

-#include "StreamBusInterface.h"
-#include "StreamError.h"
-#include "StreamBuffer.h"
-
 #include "asynDriver.h"
 #include "asynOctet.h"
 #include "asynInt32.h"
 #include "asynUInt32Digital.h"
 #include "asynGpibDriver.h"

+#include "StreamBusInterface.h"
+#include "StreamError.h"
+#include "StreamBuffer.h"
 #include "devStream.h"
-
 #include "MacroMagic.h"

 #define Z PRINTF_SIZE_T_PREFIX
@ -887,14 +885,11 @@ readHandler()
            if (pasynOctet->setInputEos(pvtOctet, pasynUser,
                deveos, (int)deveoslen) == asynSuccess)
            {
-                if (ioAction != AsyncRead)
-                {
-                    debug("AsynDriverInterface::readHandler(%s) "
-                        "input EOS changed from \"%s\" to \"%s\"\n",
-                        clientName(),
-                        StreamBuffer(oldeos, oldeoslen).expand()(),
-                        StreamBuffer(deveos, deveoslen).expand()());
-                }
+                debug2("AsynDriverInterface::readHandler(%s) "
+                    "input EOS changed from \"%s\" to \"%s\"\n",
+                    clientName(),
+                    StreamBuffer(oldeos, oldeoslen).expand()(),
+                    StreamBuffer(deveos, deveoslen).expand()());
                break;
            }
            deveos++; deveoslen--;
@ -948,20 +943,18 @@ readHandler()
        eomReason = 0;
        pasynUser->errorMessage[0] = 0;

-        debug("AsynDriverInterface::readHandler(%s): ioAction=%s "
-            "read(..., bytesToRead=%" Z "u, ...) "
-            "[timeout=%g sec]\n",
-            clientName(), toStr(ioAction),
-            bytesToRead, pasynUser->timeout);
        status = pasynOctet->read(pvtOctet, pasynUser,
            buffer, bytesToRead, &received, &eomReason);
-        // Even though received is size_t I have seen (size_t)-1 here!
-        debug("AsynDriverInterface::readHandler(%s): "
-            "read returned %s: ioAction=%s received=%" Z "d, "
-            "eomReason=%s, buffer=\"%s\"\n",
-            clientName(), toStr(status), toStr(ioAction),
-            received, eomReasonToStr(eomReason),
-            StreamBuffer(buffer, received).expand()());
+        // Even though received is size_t I have seen (size_t)-1 here
+        // in case half a terminator had been read last time!
+        if (!(status == asynTimeout && pasynUser->timeout == 0 && received == 0))
+            debug("AsynDriverInterface::readHandler(%s): ioAction=%s "
+                "read(%" Z "u bytes, timeout=%g sec) returned status %s: received=%" Z "d bytes, "
+                "eomReason=%s, buffer=\"%s\"\n",
+                clientName(), toStr(ioAction),
+                bytesToRead, pasynUser->timeout, toStr(status), received,
+                eomReasonToStr(eomReason), StreamBuffer(buffer, received).expand()());
+
        // asyn 4.16 sets reason to ASYN_EOM_END when device disconnects.
        // What about earlier versions?
        if (!connected) eomReason |= ASYN_EOM_END;
@ -1037,7 +1030,7 @@ readHandler()
                    // reply timeout
                    if (ioAction == AsyncRead)
                    {
-                        debug("AsynDriverInterface::readHandler(%s): "
+                        debug2("AsynDriverInterface::readHandler(%s): "
                            "no async input, retry in in %g seconds\n",
                            clientName(), replyTimeout);
                        // start next poll after timer expires
@ -1140,9 +1133,10 @@ readHandler()
    {
        pasynOctet->setInputEos(pvtOctet, pasynUser,
            oldeos, oldeoslen);
-        debug("AsynDriverInterface::readHandler(%s) "
-            "input EOS restored to \"%s\"\n",
+        debug2("AsynDriverInterface::readHandler(%s) "
+            "input EOS restored from \"%s\" to \"%s\"\n",
            clientName(),
+            StreamBuffer(deveos, deveoslen).expand()(),
            StreamBuffer(oldeos, oldeoslen).expand()());
    }
 }
@ -1360,8 +1354,6 @@ timerExpired()
            // at the moment if another asynUser got input right now.
            // queueRequest might fail if another request was just queued
            pasynManager->isAutoConnect(pasynUser, &autoconnect);
-            debug("%s: polling for I/O Intr: autoconnected: %d, connect: %d\n",
-                clientName(), autoconnect, connected);
            if (autoconnect && !connected)
            {
                // has explicitely been disconnected
@ -1375,7 +1367,7 @@ timerExpired()
                asynStatus status = pasynManager->queueRequest(pasynUser,
                    asynQueuePriorityLow, -1.0);
                // if this fails, we are already queued by another thread
-                debug("AsynDriverInterface::timerExpired %s: "
+                debug2("AsynDriverInterface::timerExpired %s: "
                    "queueRequest(..., priority=Low, queueTimeout=-1) = %s %s\n",
                    clientName(), toStr(status),
                    status!=asynSuccess ? pasynUser->errorMessage : "");
@ -1493,7 +1485,7 @@ void AsynDriverInterface::
 handleRequest()
 {
    cancelTimer();
-    debug("AsynDriverInterface::handleRequest(%s) %s\n",
+    debug2("AsynDriverInterface::handleRequest(%s) %s\n",
        clientName(), toStr(ioAction));
    switch (ioAction)
    {
--- a/src/BinaryConverter.cc
+++ b/src/BinaryConverter.cc
@ -22,6 +22,7 @@

 #include <ctype.h>
 #include <limits.h>
+
 #include "StreamFormatConverter.h"
 #include "StreamError.h"

--- a/src/ChecksumConverter.cc
+++ b/src/ChecksumConverter.cc
@ -20,14 +20,17 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

-#include "StreamFormatConverter.h"
-#include "StreamError.h"
-#include <ctype.h>
-#if defined(__vxworks) || defined(vxWorks)
+#if defined(vxWorks)
+#include <version.h>
+#if defined(_WRS_VXWORKS_MAJOR) && _WRS_VXWORKS_MAJOR > 6 || (_WRS_VXWORKS_MAJOR == 6 && _WRS_VXWORKS_MINOR > 8)
+#include <stdint.h>
+#define PRIX32 "X"
+#define PRIu32 "u"
+#else
 #define PRIX32 "lX"
 #define PRIu32 "lu"
+#endif
 #define PRIX8  "X"
-#define SCNx8  "hhx"
 #define uint_fast8_t uint8_t
 #define int_fast8_t int8_t
 #elif defined(_MSC_VER) && _MSC_VER < 1700 /* Visual Studio 2010 does not have inttypes.h */
@ -35,30 +38,32 @@
 #define PRIX32 "X"
 #define PRIu32 "u"
 #define PRIX8  "X"
-#define SCNx8  "hhx"
 #else
 #define __STDC_FORMAT_MACROS
 #include <stdint.h>
 #include <inttypes.h>
 #endif
+#include <ctype.h>

-#if defined(__vxworks) || defined(vxWorks) || defined(_WIN32) || defined(__rtems__)
-// These systems have no strncasecmp
-#include "epicsVersion.h"
-#ifdef BASE_VERSION
-// 3.13
-static int strncasecmp(const char *s1, const char *s2, size_t n)
+#ifdef _MSC_VER
+#define strncasecmp _strnicmp
+#endif
+
+#if defined(vxWorks) || defined(__rtems__)
+// These systems have no strncasecmp at the moment
+// But avoid compiler errors in case strncasecmp exists in future versions
+static int mystrncasecmp(const char *s1, const char *s2, size_t n)
 {
    int r=0;
    while (n && (r = toupper(*s1)-toupper(*s2)) == 0) { n--; s1++; s2++; };
    return r;
 }
-#else
-#include "epicsString.h"
-#define strncasecmp epicsStrnCaseCmp
-#endif
+#define strncasecmp mystrncasecmp
 #endif

+#include "StreamFormatConverter.h"
+#include "StreamError.h"
+
 typedef uint32_t (*checksumFunc)(const uint8_t* data, size_t len,  uint32_t init);

 static uint32_t sum(const uint8_t* data, size_t len, uint32_t sum)
@ -517,6 +522,57 @@ static uint32_t brksCryo(const uint8_t* data, size_t len, uint32_t sum)
    return xsum;
 }

+// Longitudinal Redundancy Check
+static uint32_t lrc(const uint8_t* data, size_t len, uint32_t sum)
+{
+    while (len--) {
+        sum = (sum + (*data++)) & 0xFF;
+    }
+
+    sum = ((sum ^ 0xFF) + 1) & 0xFF;
+
+    return sum;
+}
+
+// Longitudinal Redundancy Check using ASCII representation of numbers, 2-by-2
+static uint32_t hexlrc(const uint8_t* data, size_t len, uint32_t sum)
+{
+    uint32_t d;
+    uint32_t final_digit = 0;
+
+    while (len--)
+    {
+        d = toupper(*data++);
+
+        // Convert all hex digits, ignore all other bytes
+        if (isxdigit(d))
+        {
+            // Convert digits from ASCII to number
+            if (isdigit(d)) {
+                d -= '0';
+            }
+            else {
+                d -= 'A' - 0x0A;
+            }
+
+            // For the most significant bits, shift 4 bits
+            if (len % 2) {
+                final_digit = d << 4;
+            // Least significant bits are summed to previous converted digit
+            } else {
+                d += final_digit;
+                final_digit = 0;
+                // Apply lrc rule
+                sum = (sum + d) & 0xFF;
+            }
+        }
+    }
+
+    // Apply lrc rule
+    sum = ((sum ^ 0xFF) + 1) & 0xFF;
+
+    return sum;
+}

 struct checksum
 {
@ -560,7 +616,9 @@ static checksum checksumMap[] =
    {"hexsum8", hexsum,           0x00,       0x00,       1}, // 0x2D
    {"cpi",     CPI,              0x00,       0x00,       1}, // 0x7E
    {"leybold", leybold,          0x00,       0x00,       1}, // 0x22
-    {"brksCryo",brksCryo,         0x00,       0x00,       1}  // 0x4A
+    {"brksCryo",brksCryo,         0x00,       0x00,       1}, // 0x4A
+    {"lrc",     lrc,              0x00,       0x00,       1}, // 0x23 
+    {"hexlrc",  hexlrc,           0x00,       0x00,       1}  // 0xA7
 };

 static uint32_t mask[5] = {0, 0xFF, 0xFFFF, 0xFFFFFF, 0xFFFFFFFF};
@ -747,7 +805,7 @@ scanPseudo(const StreamFormat& format, StreamBuffer& input, size_t& cursor)
    debug("ChecksumConverter %s: input checksum is 0x%0*" PRIX32 "\n",
        checksumMap[fnum].name, 2*checksumMap[fnum].bytes, sum);

-    uint_fast8_t inchar;
+    unsigned int inchar;

    if (format.flags & sign_flag) // decimal
    {
@ -774,7 +832,7 @@ scanPseudo(const StreamFormat& format, StreamBuffer& input, size_t& cursor)
        {
            if (format.flags & zero_flag) // ASCII
            {
-                if (sscanf(input(cursor+2*i), "%2" SCNx8, (int8_t *) &inchar) != 1)
+                if (sscanf(input(cursor+2*i), "%2x", &inchar) != 1)
                {
                    debug("ChecksumConverter %s: Input byte '%s' is not a hex byte\n",
                        checksumMap[fnum].name, input.expand(cursor+2*i,2)());
@ -818,7 +876,7 @@ scanPseudo(const StreamFormat& format, StreamBuffer& input, size_t& cursor)
        {
            if (format.flags & zero_flag) // ASCII
            {
-                sscanf(input(cursor+2*i), "%2" SCNx8, (int8_t *) &inchar);
+                sscanf(input(cursor+2*i), "%2x", &inchar);
            }
            else
            if (format.flags & left_flag) // poor man's hex: 0x30 - 0x3F
--- a/src/EnumConverter.cc
+++ b/src/EnumConverter.cc
@ -20,10 +20,11 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

+#include <stdlib.h>
+
 #include "StreamFormatConverter.h"
 #include "StreamError.h"
 #include "StreamProtocol.h"
-#include <stdlib.h>

 // Enum %{string0|string1|...}

@ -76,7 +77,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
                numEnums = -(numEnums+1);
                info.append('\0');
                memcpy(info(n), &numEnums, sizeof(numEnums));
-                debug("EnumConverter::parse %ld choices with default: %s\n",
+                debug2("EnumConverter::parse %ld choices with default: %s\n",
                    -numEnums, info.expand()());
                return enum_format;
            }
@ -99,7 +100,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
            if (*source++ == '}')
            {
                memcpy(info(n), &numEnums, sizeof(numEnums));
-                debug("EnumConverter::parse %ld choices: %s\n",
+                debug2("EnumConverter::parse %ld choices: %s\n",
                    numEnums, info.expand()());
                return enum_format;
            }
--- a/src/Makefile
+++ b/src/Makefile
@ -21,26 +21,18 @@
 # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 #########################################################################/

-TOP = ../..
-ifneq ($(wildcard ../../configure),)
-  include $(TOP)/configure/CONFIG
-else ifneq ($(wildcard ../../config),)
-  include $(TOP)/config/CONFIG_APP
-  include $(TOP)/config/RULES_ARCHS
-else
-  TOP= ..
-  include $(TOP)/configure/CONFIG
-endif
+TOP= ..
+include $(TOP)/configure/CONFIG

 -include CONFIG_STREAM
 -include ../CONFIG_STREAM

-LIBRARY_DEFAULT = stream
+LIBRARY_IOC = stream

-DBD += $(LIBRARY_DEFAULT).dbd
-DBD += $(LIBRARY_DEFAULT)-base.dbd
-ifdef CALC
-DBD += $(LIBRARY_DEFAULT)-scalcout.dbd
+DBD += stream.dbd
+DBD += stream-base.dbd
+ifneq ($(words $(CALC) $(SYNAPPS)), 0)
+DBD += stream-scalcout.dbd
 endif

 ifdef ASYN
@ -50,7 +42,7 @@ $(warning Asyn not included! Didn't you set ASYN in your RELEASE file?)
 endif

 ifeq ($(LOADABLE_MODULE),YES)
-SRCS += $(LIBRARY_DEFAULT)_registerRecordDeviceDriver.cpp
+SRCS += stream_registerRecordDeviceDriver.cpp
 endif
 SRCS += $(BUSSES:%=%Interface.cc)
 SRCS += $(FORMATS:%=%Converter.cc)
@ -68,6 +60,9 @@ ifneq ($(words $(PCRE_LIB) $(PCRE_INCLUDE)),0)
 LIB_SYS_LIBS_DEFAULT += pcre
 LIB_SYS_LIBS_WIN32 += $(PCRE_LIB)\\pcre
 SHRLIB_DEPLIB_DIRS += $(PCRE_LIB)
+ifdef ENABLE_STATIC
+CPPFLAGS += -DPCRE_STATIC
+endif
 endif
 endif

@ -79,6 +74,10 @@ INC += StreamFormatConverter.h
 INC += StreamBuffer.h
 INC += StreamError.h
 INC += StreamVersion.h
+INC += StreamProtocol.h
+INC += StreamBusInterface.h
+INC += StreamCore.h
+INC += MacroMagic.h

 # switch off annoying rset warnings in 3.16+
 CPPFLAGS += -DUSE_TYPED_RSET
@ -89,7 +88,7 @@ CPPFLAGS += -DSTREAM_INTERNAL

 # Update version string whenever something changed.
 StreamVersion$(OBJ): $(COMMON_DIR)/StreamVersion.h $(filter-out StreamVersion$(OBJ),$(LIBOBJS) $(LIBRARY_OBJS)) ../CONFIG_STREAM
-$(COMMON_DIR)/StreamVersion.h: $(SRCS) $(filter-out StreamVersion.h, $(INC))
+$(COMMON_DIR)/StreamVersion.h: ../../.VERSION $(SRCS) $(filter-out StreamVersion.h, $(INC))
 	@echo Creating $@
 	$(PERL) ../makeStreamVersion.pl $@

@ -102,28 +101,28 @@ streamReferences: ../CONFIG_STREAM
 	$(PERL) ../makeref.pl Converter $(FORMATS) >> $@

 # create stream-base.dbd from all RECORDTYPES except scalcout record
-$(COMMON_DIR)/$(LIBRARY_DEFAULT)-base.dbd: ../CONFIG_STREAM
+$(COMMON_DIR)/stream-base.dbd: ../CONFIG_STREAM
 	$(PERL) ../makedbd.pl $(if $(ASYN),--with-asyn) $(if $(BASE_3_14),,-3.13) $(filter-out scalcout, $(RECORDTYPES)) > $@

-$(LIBRARY_DEFAULT)-base.dbd$(DEP): ../CONFIG_STREAM
-	echo $(LIBRARY_DEFAULT)-base.dbd: $< > $@
+stream-base.dbd$(DEP): ../CONFIG_STREAM
+        echo stream-base.dbd: $< > $@

-STREAM_DBD_FILES = $(LIBRARY_DEFAULT)-base.dbd
+STREAM_DBD_FILES = stream-base.dbd

-ifdef CALC
+ifneq ($(words $(CALC) $(SYNAPPS)), 0)
 # create stream-scalcout.dbd for scalcout record
-$(COMMON_DIR)/$(LIBRARY_DEFAULT)-scalcout.dbd: ../CONFIG_STREAM
+$(COMMON_DIR)/stream-scalcout.dbd: ../CONFIG_STREAM
 	$(PERL) ../makedbd.pl --rec-only scalcout > $@

-$(LIBRARY_DEFAULT)-scalcout.dbd$(DEP): ../CONFIG_STREAM
-	echo $(LIBRARY_DEFAULT)-scalcout.dbd: $< > $@
+stream-scalcout.dbd$(DEP): ../CONFIG_STREAM
+        echo stream-scalcout.dbd: $< > $@

-STREAM_DBD_FILES += $(LIBRARY_DEFAULT)-scalcout.dbd
+STREAM_DBD_FILES += stream-scalcout.dbd
 endif

 # create stream.dbd for all record types
-$(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../CONFIG_STREAM
+$(COMMON_DIR)/stream.dbd: ../CONFIG_STREAM
 	$(PERL) ../makedbd.pl $(if $(ASYN),--with-asyn) $(if $(BASE_3_14),,-3.13) $(RECORDTYPES) > $@

-$(LIBRARY_DEFAULT).dbd$(DEP): ../CONFIG_STREAM
-	echo $(LIBRARY_DEFAULT).dbd: $< > $@
+stream.dbd$(DEP): ../CONFIG_STREAM
+        echo stream.dbd: $< > $@
--- a/src/MantissaExponentConverter.cc
+++ b/src/MantissaExponentConverter.cc
@ -22,9 +22,10 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

+#include <math.h>
+
 #include "StreamFormatConverter.h"
 #include "StreamError.h"
-#include <math.h>

 // Exponential Converter %m
 // Eric Berryman requested a double format that reads
--- a/src/RegexpConverter.cc
+++ b/src/RegexpConverter.cc
@ -20,13 +20,15 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

-#include "StreamFormatConverter.h"
-#include "StreamError.h"
-#include "pcre.h"
 #include <string.h>
 #include <limits.h>
 #include <ctype.h>

+#include "pcre.h"
+
+#include "StreamFormatConverter.h"
+#include "StreamError.h"
+
 #define Z PRINTF_SIZE_T_PREFIX

 // Perl regular expressions (PCRE) %/regexp/ and  %#/regexp/subst/
--- a/src/StreamBuffer.cc
+++ b/src/StreamBuffer.cc
@ -25,9 +25,6 @@
 #define _BSD_SOURCE
 #endif

-#include "StreamBuffer.h"
-#include "StreamError.h"
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@ -40,6 +37,7 @@

 #include <vxWorks.h>
 #include <fioLib.h>
+#include <string.h>

 struct outStr_s {
    char *str;
@ -74,6 +72,9 @@ int vsnprintf(char *str, size_t size, const char *format, va_list ap) {
 #endif // ! _WRS_VXWORKS_MAJOR
 #endif // vxWorks

+#include "StreamBuffer.h"
+#include "StreamError.h"
+
 #define P PRINTF_SIZE_T_PREFIX

 void StreamBuffer::
@ -341,7 +342,10 @@ StreamBuffer StreamBuffer::expand(ssize_t start, ssize_t length) const
    {
        c = buffer[i];
        if (c < 0x20 || c >= 0x7f)
-            result.print("\033[7m<%02x>\033[27m", c & 0xff);
+            result.print("%s<%02x>%s",
+                         ansiEscape(ANSI_REVERSE_VIDEO),
+                         c & 0xff,
+                         ansiEscape(ANSI_NOT_REVERSE_VIDEO));
        else
            result.append(c);
    }
@ -354,18 +358,21 @@ dump() const
    StreamBuffer result;
    size_t i;
    result.print("%" P "d,%" P "d,%" P "d:", offs, len, cap);
-    if (offs) result.print("\033[47m");
+    if (offs) result.print(ansiEscape(ANSI_BG_WHITE));
    char c;
    for (i = 0; i < cap; i++)
    {
        c = buffer[i];
-        if (offs && i == offs) result.append("\033[0m");
+        if (offs && i == offs) result.append(ansiEscape(ANSI_RESET));
        if (c < 0x20 || c >= 0x7f)
-            result.print("\033[7m<%02x>\033[27m", c & 0xff);
+            result.print("%s<%02x>%s",
+                         ansiEscape(ANSI_REVERSE_VIDEO),
+                         c & 0xff,
+                         ansiEscape(ANSI_NOT_REVERSE_VIDEO));
        else
            result.append(c);
-        if (i == offs+len-1) result.append("\033[47m");
+        if (i == offs+len-1) result.append(ansiEscape(ANSI_BG_WHITE));
    }
-    result.append("\033[0m");
+    result.append(ansiEscape(ANSI_RESET));
    return result;
 }
--- a/src/StreamBusInterface.cc
+++ b/src/StreamBusInterface.cc
@ -21,6 +21,7 @@
 *************************************************************************/

 #include <stdio.h>
+
 #include "StreamBusInterface.h"
 #include "StreamError.h"

--- a/src/StreamCore.cc
+++ b/src/StreamCore.cc
@ -20,13 +20,16 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

-#include "StreamCore.h"
-#include "StreamError.h"
 #include <ctype.h>
 #include <stdlib.h>

+#include "StreamCore.h"
+#include "StreamError.h"
+
 #define Z PRINTF_SIZE_T_PREFIX

+int streamErrorDeadTime = 0;
+
 /// debug functions /////////////////////////////////////////////

 char* StreamCore::
@ -72,9 +75,9 @@ printCommands(StreamBuffer& buffer, const char* c)
                buffer.append("    disconnect;\n");
                break;
            default:
-                buffer.append("\033[31;1mGARBAGE: ");
+                buffer.append(ansiEscape(ANSI_RED_BOLD)).append("GARBAGE: ");
                c = StreamProtocolParser::printString(buffer, c-1);
-                buffer.append("\033[0m\n");
+                buffer.append(ansiEscape(ANSI_RESET)).append("\n");
        }
    }
 }
@ -122,12 +125,11 @@ printProtocol(FILE* file)
 StreamCore* StreamCore::first = NULL;

 StreamCore::
-StreamCore() : activeCommand(end)
+StreamCore() : StreamBusInterface::Client(),
+    next(), streamname(), flags(None), inTerminatorDefined(), outTerminatorDefined(),
+    activeCommand(end), previousResult(Success), numberOfErrors(0), unparsedInput()
 {
    businterface = NULL;
-    flags = None;
-    next = NULL;
-    unparsedInput = false;
    // add myself to list of streams
    StreamCore** pstream;
    for (pstream = &first; *pstream; pstream = &(*pstream)->next);
@ -187,9 +189,12 @@ bool StreamCore::
 parse(const char* filename, const char* _protocolname)
 {
    protocolname = _protocolname;
-    // extract substitutions from protocolname "name(sub1,sub2)"
+    // extract substitutions from protocolname "name ( sub1, sub2 ) "
    ssize_t i = protocolname.find('(');
-    if (i >= 0)
+    if (i < 0) i = 0;
+    while (protocolname[i-1] == ' ')
+        protocolname.remove(--i, 1);
+    if (protocolname[i] == '(')
    {
        while (i < (ssize_t)protocolname.length())
        {
@ -486,6 +491,8 @@ finishProtocol(ProtocolResult status)
        switch (status)
        {
            case Success:
+                previousResult = Success;
+                numberOfErrors = 0;
                handler = NULL;
                break;
            case WriteTimeout:
@ -988,8 +995,10 @@ readCallback(StreamIoStatus status,
                evalIn();
                return 0;
            }
-            error("%s: No reply within %ld ms to \"%s\"\n",
-                name(), replyTimeout, outputLine.expand()());
+            if (checkShouldPrint(ReplyTimeout)) {
+                error("%s: No reply within %ld ms to \"%s\"\n",
+                    name(), replyTimeout, outputLine.expand()());
+            }
            inputBuffer.clear();
            finishProtocol(ReplyTimeout);
            return 0;
@ -1106,9 +1115,11 @@ readCallback(StreamIoStatus status,
        }
        else
        {
-            error("%s: Timeout after reading %" Z "d byte%s \"%s%s\"\n",
-                name(), end, end==1 ? "" : "s", end > 20 ? "..." : "",
-                inputBuffer.expand(-20)());
+            if (checkShouldPrint(ReadTimeout)) {
+                error("%s: Timeout after reading %" Z "d byte%s \"%s%s\"\n",
+                    name(), end, end==1 ? "" : "s", end > 20 ? "..." : "",
+                    inputBuffer.expand(-20)());
+            }
        }
    }

@ -1820,4 +1831,37 @@ license(void)
        "along with StreamDevice. If not, see https://www.gnu.org/licenses/.\n";
 }

+/**
+ * \brief Checks whether an error message should be printed based on the new error type.
+ *
+ * Will check based on the error type and the time since last error of the same type
+ * whether to print the new error. Also has a number of side effects such as counting
+ * up errors of each type and resetting the time since last error.
+ *
+ * \param[in] newErrorType the type of the new error
+ * \return true if the error should be preinted, else false
+ */
+bool  StreamCore::checkShouldPrint(ProtocolResult newErrorType)
+{
+    if (previousResult != newErrorType) {
+        previousResult = newErrorType;
+        numberOfErrors = 0;
+        time(&lastErrorTime);
+        return true;
+    }
+    else if ((int)(time(NULL) - lastErrorTime) > streamErrorDeadTime) {
+        time(&lastErrorTime);
+        if (numberOfErrors != 0) {
+            error("%s: %i additional errors of the following type seen in the last %i seconds\n",
+                name(), numberOfErrors, streamErrorDeadTime);
+        }
+        numberOfErrors = 0;
+        return true;
+    }
+    else {
+        numberOfErrors++;
+        return false;
+    }
+}
+
 #include "streamReferences"
--- a/src/StreamCore.h
+++ b/src/StreamCore.h
@ -73,7 +73,7 @@ void acceptEvent(unsigned short mask, unsigned short timeout)
 ***************************************/

 #include "MacroMagic.h"
-
+#include "time.h"

 // Flags: 0x00FFFFFF reserved for StreamCore
 const unsigned long None             = 0x0000;
@ -95,6 +95,9 @@ const unsigned long ClearOnStart     = InitRun|AsyncMode|GotValue|Aborted|
                                       BusOwner|Separator|ScanTried|
                                       AcceptInput|AcceptEvent|BusPending;

+// The amount of time to wait before printing duplicated messages
+extern int streamErrorDeadTime;
+
 struct StreamFormat;

 class StreamCore :
@ -173,6 +176,11 @@ protected:
    ProtocolResult runningHandler;
    StreamBuffer fieldAddress;

+    // Keep track of errors to reduce logging frequencies
+    ProtocolResult previousResult;
+    time_t lastErrorTime;
+    int numberOfErrors;
+
    StreamIoStatus lastInputStatus;
    bool unparsedInput;

@ -230,6 +238,7 @@ public:

 private:
    char* printCommands(StreamBuffer& buffer, const char* c);
+    bool  checkShouldPrint(ProtocolResult newErrorType);
 };

 #endif
--- a/src/StreamEpics.cc
+++ b/src/StreamEpics.cc
@ -21,8 +21,15 @@
 *************************************************************************/

 #include <errno.h>
-#include "StreamCore.h"
-#include "StreamError.h"
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined(vxWorks)
+#include <symLib.h>
+#include <sysSymTbl.h>
+#endif

 #include "epicsVersion.h"
 #ifdef BASE_VERSION
@ -30,10 +37,11 @@
 #endif

 #ifdef EPICS_3_13
+#include <semLib.h>
+#include <wdLib.h>
+#include <taskLib.h>
+
 extern "C" {
-
-static char* epicsStrDup(const char *s) { char* c = (char*)malloc(strlen(s)+1); strcpy(c, s); return c; }
-
 #endif

 #define epicsAlarmGLOBAL
@ -45,18 +53,11 @@ static char* epicsStrDup(const char *s) { char* c = (char*)malloc(strlen(s)+1);
 #include "recGbl.h"
 #include "devLib.h"
 #include "callback.h"
+#include "initHooks.h"

-#include <ctype.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #ifdef EPICS_3_13
-
-#include <semLib.h>
-#include <wdLib.h>
-#include <taskLib.h>
-
+static char* epicsStrDup(const char *s) { char* c = (char*)malloc(strlen(s)+1); strcpy(c, s); return c; }
 extern DBBASE *pdbbase;
-
 } // extern "C"

 #else // !EPICS_3_13
@ -71,29 +72,25 @@ extern DBBASE *pdbbase;
 #include "iocsh.h"
 #include "epicsExport.h"

-#if defined(VERSION_INT) || EPICS_MODIFICATION >= 11
-#include "initHooks.h"
-#define WITH_IOC_RUN
-#endif
-
 #if !defined(VERSION_INT) && EPICS_MODIFICATION < 9
 // iocshCmd() is missing in iocsh.h (up to R3.14.8.2)
-// To build with win32-x86, you MUST fix iocsh.h.
+// To build for Windows, you MUST fix iocsh.h.
 // Move the declaration below to iocsh.h and rebuild base.
 extern "C" epicsShareFunc int epicsShareAPI iocshCmd(const char *command);
 #endif

 #endif // !EPICS_3_13

-#if defined(__vxworks) || defined(vxWorks)
-#include <symLib.h>
-#include <sysSymTbl.h>
-#endif
-
+#include "StreamCore.h"
+#include "StreamError.h"
 #include "devStream.h"

 #define Z PRINTF_SIZE_T_PREFIX

+#if defined(VERSION_INT) || EPICS_MODIFICATION >= 11
+#define WITH_IOC_RUN
+#endif
+
 // More flags: 0x00FFFFFF used by StreamCore
 const unsigned long InDestructor  = 0x0100000;
 const unsigned long ValueReceived = 0x0200000;
@ -170,10 +167,7 @@ class Stream : protected StreamCore
    bool print(format_t *format, va_list ap);
    ssize_t scan(format_t *format, void* pvalue, size_t maxStringSize);
    bool process();
-
-#ifdef WITH_IOC_RUN
    static void initHook(initHookState);
-#endif

 // device support functions
    friend long streamInitRecord(dbCommon *record, const struct link *ioLink,
@ -198,6 +192,9 @@ public:
 extern "C" { // needed for Windows
 epicsExportAddress(int, streamDebug);
 epicsExportAddress(int, streamError);
+epicsExportAddress(int, streamDebugColored);
+epicsExportAddress(int, streamErrorDeadTime);
+epicsExportAddress(int, streamMsgTimeStamped);
 }

 // for subroutine record
@ -330,7 +327,6 @@ epicsExportAddress(drvet, stream);
 #ifdef EPICS_3_13
 void streamEpicsPrintTimestamp(char* buffer, size_t size)
 {
-    size_t tlen;
    char* c;
    TS_STAMP tm;
    tsLocalTime (&tm);
@ -339,16 +335,17 @@ void streamEpicsPrintTimestamp(char* buffer, size_t size)
    if (c) {
        c[4] = 0;
    }
-    tlen = strlen(buffer);
-    sprintf(buffer+tlen, " %.*s", (int)(size-tlen-2), taskName(0));
+}
+
+static const char* epicsThreadGetNameSelf()
+{
+    return taskName(0);
 }
 #else // !EPICS_3_13
 void streamEpicsPrintTimestamp(char* buffer, size_t size)
 {
-    size_t tlen;
    epicsTime tm = epicsTime::getCurrent();
-    tlen = tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%06f");
-    sprintf(buffer+tlen, " %.*s", (int)(size-tlen-2), epicsThreadGetNameSelf());
+    tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%06f");
 }
 #endif // !EPICS_3_13

@ -438,13 +435,21 @@ long streamReportRecord(const char* recordname)
    return OK;
 }

+#if defined(_WIN32) && !defined(_WIN64)
+static const char* epicsThreadGetNameSelfWrapper(void)
+{
+    return epicsThreadGetNameSelf();
+}
+#define epicsThreadGetNameSelf epicsThreadGetNameSelfWrapper
+#endif
+
 long Stream::
 drvInit()
 {
    char* path;
    debug("drvStreamInit()\n");
    path = getenv("STREAM_PROTOCOL_PATH");
-#if defined(__vxworks) || defined(vxWorks)
+#if defined(vxWorks)
    // for compatibility reasons look for global symbols
    if (!path)
    {
@ -461,54 +466,87 @@ drvInit()
 #endif
    if (!path)
        fprintf(stderr,
-            "drvStreamInit: Warning! STREAM_PROTOCOL_PATH not set. "
-            "Defaults to \"%s\"\n", StreamProtocolParser::path);
+            "drvStreamInit: Warning! STREAM_PROTOCOL_PATH not set.\n");
    else
        StreamProtocolParser::path = path;
    debug("StreamProtocolParser::path = %s\n",
        StreamProtocolParser::path);
    StreamPrintTimestampFunction = streamEpicsPrintTimestamp;
-
-#ifdef WITH_IOC_RUN
+    StreamGetThreadNameFunction = epicsThreadGetNameSelf;
    initHookRegister(initHook);
-#endif

    return OK;
 }

-#ifdef WITH_IOC_RUN
 void Stream::
 initHook(initHookState state)
 {
    Stream* stream;

-    if (state == initHookAtIocRun)
-    {
-        debug("Stream::initHook(initHookAtIocRun) interruptAccept=%d\n", interruptAccept);
-
-        static int inIocInit = 1;
-        if (inIocInit)
+    switch (state) {
+#ifdef WITH_IOC_RUN
+        case initHookAtIocRun:
        {
-            // We don't want to run @init twice in iocInit
-            inIocInit = 0;
-            return;
-        }
-
-        for (stream = static_cast<Stream*>(first); stream;
-            stream = static_cast<Stream*>(stream->next))
-        {
-            if (!stream->onInit) continue;
-            debug("Stream::initHook(initHookAtIocRun) Re-inititializing %s\n", stream->name());
-            if (!stream->startProtocol(StartInit))
+            // re-run @init handlers after restart
+            static int inIocInit = 1;
+            if (inIocInit)
            {
-                error("%s: Re-initialization failed.\n",
-                    stream->name());
+                // We don't want to run @init twice in iocInit
+                inIocInit = 0;
+                return;
            }
-            stream->initDone.wait();
+
+            for (stream = static_cast<Stream*>(first); stream;
+                stream = static_cast<Stream*>(stream->next))
+            {
+                if (!stream->onInit) continue;
+                debug("%s: running @init handler\n", stream->name());
+                if (!stream->startProtocol(StartInit))
+                {
+                    error("%s: @init handler failed.\n",
+                        stream->name());
+                }
+                stream->initDone.wait();
+            }
+            break;
        }
+        case initHookAtIocPause:
+        {
+            // stop polling I/O Intr
+            for (stream = static_cast<Stream*>(first); stream;
+                stream = static_cast<Stream*>(stream->next))
+            {
+                if (stream->record->scan == SCAN_IO_EVENT) {
+                    debug("%s: stopping \"I/O Intr\"\n", stream->name());
+                    stream->finishProtocol(Stream::Abort);
+                }
+            }
+            break;
+        }
+        case initHookAfterIocRunning:
+#else
+        case initHookAfterInterruptAccept:
+#endif
+        {
+            // start polling I/O Intr
+            for (stream = static_cast<Stream*>(first); stream;
+                stream = static_cast<Stream*>(stream->next))
+            {
+                if (stream->record->scan == SCAN_IO_EVENT) {
+                    debug("%s: starting \"I/O Intr\"\n", stream->name());
+                    if (!stream->startProtocol(StartAsync))
+                    {
+                        error("%s: Can't start \"I/O Intr\" protocol\n",
+                            stream->name());
+                    }
+                }
+            }
+            break;
+        }
+        default:
+            break;
    }
 }
-#endif

 // device support (C interface) //////////////////////////////////////////

@ -622,7 +660,16 @@ long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt)
    *ppvt = stream->ioscanpvt;
    if (cmd == 0)
    {
-        debug("streamGetIointInfo: starting protocol\n");
+#ifdef WITH_IOC_RUN
+        if (!interruptAccept) {
+            // We will start polling later in initHook.
+            debug("streamGetIointInfo(%s): start later...\n",
+                record->name);
+            return OK;
+        }
+#endif
+        debug("streamGetIointInfo(%s): start protocol\n",
+            record->name);
        // SCAN has been set to "I/O Intr"
        if (!stream->startProtocol(Stream::StartAsync))
        {
@ -633,6 +680,8 @@ long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt)
    else
    {
        // SCAN is no longer "I/O Intr"
+        debug("streamGetIointInfo(%s): abort protocol\n",
+            record->name);
        stream->finishProtocol(Stream::Abort);
    }
    return OK;
--- a/src/StreamError.cc
+++ b/src/StreamError.cc
@ -20,18 +20,26 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

-#include "StreamError.h"
-#ifdef _WIN32
-#include <windows.h>
-#endif
 #include <string.h>
 #include <time.h>
 #include <stdio.h>

+#ifdef _WIN32
+#include <windows.h>
+#include <io.h>
+#else
+#include <unistd.h>
+#endif /* _WIN32 */
+
+#include "StreamError.h"
+
 int streamDebug = 0;
 int streamError = 1;
 FILE *StreamDebugFile = NULL;

+/*0: disable timestamps on stream messages (both debug and error)*/
+int streamMsgTimeStamped = 1;
+
 #ifndef va_copy
 #ifdef __va_copy
 #define va_copy __va_copy
@ -46,18 +54,36 @@ FILE *StreamDebugFile = NULL;
 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
 #endif

-/* Enable ANSI colors in Windows console */
-static int win_console_init() {
-    DWORD dwMode = 0;
-    HANDLE hCons = GetStdHandle(STD_ERROR_HANDLE);
-    GetConsoleMode(hCons, &dwMode);
-    dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-    SetConsoleMode(hCons, dwMode);
-    return 0;
+/* Enable ANSI color support in Windows console */
+static bool win_console_init() {
+    HANDLE hCons[] = { GetStdHandle(STD_ERROR_HANDLE),
+                       GetStdHandle(STD_OUTPUT_HANDLE) };
+    for(int i=0; i < sizeof(hCons) / sizeof(HANDLE); ++i)
+    {
+        DWORD dwMode = 0;
+        if (hCons[i] == NULL ||
+            hCons[i] == INVALID_HANDLE_VALUE ||
+            !GetConsoleMode(hCons[i], &dwMode))
+        {
+            return false;
+        }
+        dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
+        if (!SetConsoleMode(hCons[i], dwMode))
+        {
+            return false;
+        }
+    }
+    return true;
 }
-static int s = win_console_init();

-#endif
+/* do isatty() call second as always want to run win_console_init() */
+int streamDebugColored = win_console_init() && _isatty(_fileno(stderr));
+
+#else
+
+int streamDebugColored = isatty(fileno(stderr));
+
+#endif /* _WIN32 */

 /* You can globally change the printTimestamp function
   by setting the StreamPrintTimestampFunction variable
@ -73,6 +99,7 @@ static void printTimestamp(char* buffer, size_t size)
 }

 void (*StreamPrintTimestampFunction)(char* buffer, size_t size) = printTimestamp;
+const char* (*StreamGetThreadNameFunction)(void) = NULL;

 void StreamError(const char* fmt, ...)
 {
@ -92,44 +119,84 @@ void StreamError(int line, const char* file, const char* fmt, ...)

 void StreamVError(int line, const char* file, const char* fmt, va_list args)
 {
-    char timestamp[40];
    if (!(streamError || streamDebug)) return; // Error logging disabled
-    StreamPrintTimestampFunction(timestamp, 40);
+    char timestamp[40];
+    const char *threadname = NULL;
+    int timeStamped = streamMsgTimeStamped;
+    if (timeStamped)
+    {
+        StreamPrintTimestampFunction(timestamp, sizeof(timestamp));
+    }
+    if (StreamGetThreadNameFunction)
+    {
+        threadname = StreamGetThreadNameFunction();
+    }
 #ifdef va_copy
    if (StreamDebugFile)
    {
        va_list args2;
        va_copy(args2, args);
-        fprintf(StreamDebugFile, "%s ", timestamp);
+        if (timeStamped)
+        {
+            fprintf(StreamDebugFile, "%s ", timestamp);
+        }
+        if (threadname)
+        {
+            fprintf(StreamDebugFile, "%s ", threadname);
+        }
        vfprintf(StreamDebugFile, fmt, args2);
        fflush(StreamDebugFile);
        va_end(args2);
    }
 #endif
-    fprintf(stderr, "\033[31;1m");
-    fprintf(stderr, "%s ", timestamp);
+    fprintf(stderr, "%s", ansiEscape(ANSI_RED_BOLD));
+    if (timeStamped)
+    {
+        fprintf(stderr, "%s ", timestamp);
+    }
+    if (threadname)
+    {
+        fprintf(stderr, "%s ", threadname);
+    }
    if (file)
    {
        fprintf(stderr, "%s line %d: ", file, line);
    }
    vfprintf(stderr, fmt, args);
-    fprintf(stderr, "\033[0m");
+    fprintf(stderr, "%s", ansiEscape(ANSI_RESET));
 }

 int StreamDebugClass::
 print(const char* fmt, ...)
 {
    va_list args;
-    char timestamp[40];
-    StreamPrintTimestampFunction(timestamp, 40);
    va_start(args, fmt);
    const char* f = strrchr(file, '/');
    if (f) f++; else f = file;
    FILE* fp = StreamDebugFile ? StreamDebugFile : stderr;
-    fprintf(fp, "%s ", timestamp);
+    if (streamMsgTimeStamped)
+    {
+        char timestamp[40];
+        StreamPrintTimestampFunction(timestamp, sizeof(timestamp));
+        fprintf(fp, "%s ", timestamp);
+    }
+    if (StreamGetThreadNameFunction)
+    {
+        fprintf(fp, "%s ", StreamGetThreadNameFunction());
+    }
    fprintf(fp, "%s:%d: ", f, line);
    vfprintf(fp, fmt, args);
    fflush(fp);
    va_end(args);
    return 1;
 }
+
+/**
+ * Return an ANSI escape code if coloured debug output is enabled
+ */
+const char* ansiEscape(AnsiMode mode)
+{
+    static const char* AnsiEscapes[] = { "\033[7m", "\033[27m", "\033[47m",
+                                         "\033[0m", "\033[31;1m" };
+    return streamDebugColored ? AnsiEscapes[mode] : "";
+}
--- a/src/StreamError.h
+++ b/src/StreamError.h
@ -32,7 +32,10 @@

 extern int streamDebug;
 extern int streamError;
+extern int streamDebugColored;
+extern int streamMsgTimeStamped;
 extern void (*StreamPrintTimestampFunction)(char* buffer, size_t size);
+extern const char* (*StreamGetThreadNameFunction)(void);

 void StreamError(int line, const char* file, const char* fmt, ...)
 __attribute__((__format__(__printf__,3,4)));
@ -65,5 +68,13 @@ StreamDebugObject(const char* file, int line)

 #define error StreamError
 #define debug (!streamDebug)?0:StreamDebugObject(__FILE__,__LINE__).print
+#define debug2 (streamDebug<2)?0:StreamDebugObject(__FILE__,__LINE__).print
+
+/*
+ * ANSI escape sequences for terminal output
+ */
+enum AnsiMode { ANSI_REVERSE_VIDEO, ANSI_NOT_REVERSE_VIDEO, ANSI_BG_WHITE,
+                ANSI_RESET, ANSI_RED_BOLD };
+extern const char* ansiEscape(AnsiMode mode);

 #endif
--- a/src/StreamFormatConverter.cc
+++ b/src/StreamFormatConverter.cc
@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
+
 #include "StreamFormatConverter.h"
 #include "StreamError.h"

@ -148,8 +149,6 @@ parseFormat(const char*& source, FormatType formatType, StreamFormat& streamForm
        error("Missing converter character\n");
        return false;
    }
-    debug("StreamFormatConverter::parseFormat: converter='%c'\n",
-        streamFormat.conv);
    StreamFormatConverter* converter;
    converter = StreamFormatConverter::find(streamFormat.conv);
    if (!converter)
--- a/src/StreamProtocol.cc
+++ b/src/StreamProtocol.cc
@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdarg.h>
+
 #include "StreamProtocol.h"
 #include "StreamFormatConverter.h"
 #include "StreamError.h"
@ -52,7 +53,7 @@ class StreamProtocolParser::Protocol::Variable
 // StreamProtocolParser

 StreamProtocolParser* StreamProtocolParser::parsers = NULL;
-const char* StreamProtocolParser::path = ".";
+const char* StreamProtocolParser::path = NULL;
 static const char* specialChars = " ,;{}=()$'\"+-*/";

 // Client destructor
@ -156,52 +157,70 @@ this after protocol arguments have been replaced.
 StreamProtocolParser* StreamProtocolParser::
 readFile(const char* filename)
 {
-    FILE* file;
-#ifdef _WIN32
-    const char pathseparator = ';';
-    const char dirseparator = '\\';
-#else
-    const char pathseparator = ':';
-    const char dirseparator = '/';
-#endif
+    FILE* file = NULL;
    StreamProtocolParser* parser;
    const char *p;
-    const char *s;
    size_t n;
    StreamBuffer dir;

-    // look for filename in every dir in search path
-    for (p = path; *p; p += n)
-    {
-        dir.clear();
-        // get next dir from search path (avoiding strtok, strsep, strcspn)
-        s = strchr(p, pathseparator);
-        if (s) n = s - p;
-        else n = strlen(p);
-        dir.append(p, n);
-        if (n && p[n-1] != dirseparator) dir.append(dirseparator);
-        if (s) p++;
-        // append filename
-        dir.append(filename);
-        // try to read the file
-        debug("StreamProtocolParser::readFile: try '%s'\n", dir());
-        file = fopen(dir(), "r");
-        if (file)
+    // no path or absolute file name
+    if (!path || filename[0] == '/'
+#ifdef _WIN32
+        || filename[0] == '\\' || (isalpha(filename[0]) && filename[1] == ':')
+#endif
+        ) {
+        // absolute file name
+        file = fopen(filename, "r");
+        if (file) {
+            debug("StreamProtocolParser::readFile: found '%s'\n", filename);
+        } else {
+            error("Can't find readable file '%s'\n", filename);
+            return NULL;
+        }
+    } else {
+        // look for filename in every dir in search path
+        for (p = path; *p; p += n)
        {
-            // file found; create a parser to read it
-            parser = new StreamProtocolParser(file, filename);
-            fclose(file);
-            if (!parser->valid) return NULL;
-//             printf(
-// "/---------------------------------------------------------------------\\\n");
-//             parser->report();
-//             printf(
-// "\\---------------------------------------------------------------------/\n");
-            return parser;
+            dir.clear();
+            // allow ':' or ';' for OS independence
+            // we need to be careful with drive letters though
+            n = strcspn(p, ":;");
+#ifdef _WIN32
+            if (n == 1 && p[1] == ':' && isalpha(p[0]))
+            {
+                // driver letter
+                n = 2 + strcspn(p+2, ":;");
+            }
+#endif
+            dir.append(p, n);
+            // append / after everything except empty path [or drive letter]
+            // Windows is fine with / as well
+            if (n) {
+#ifdef _WIN32
+                if (n != 2 || p[1] != ':' || !isalpha(p[0]))
+#endif
+                dir.append('/');
+            }
+            if (p[n]) n++; // skip the path separator
+            dir.append(filename);
+            // try to read the file
+            debug("StreamProtocolParser::readFile: try '%s'\n", dir());
+            file = fopen(dir(), "r");
+            if (file) {
+                debug("StreamProtocolParser::readFile: found '%s'\n", dir());
+                break;
+            }
+        }
+        if (!file) {
+            error("Can't find readable file '%s' in '%s'\n", filename, path);
+            return NULL;
        }
    }
-    error("Can't find readable file '%s' in '%s'\n", filename, path);
-    return NULL;
+    // file found; create a parser to read it
+    parser = new StreamProtocolParser(file, filename);
+    fclose(file);
+    if (!parser->valid) return NULL;
+    return parser;
 }

 /*
@ -262,7 +281,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
        startline = line;
        if (!readToken(token, " ,;{}=()$'\"", isGlobalContext(commands)))
            return false;
-        debug("StreamProtocolParser::parseProtocol:"
+        debug2("StreamProtocolParser::parseProtocol:"
            " token='%s'\n", token.expand()());

        if (token[0] == 0)
@ -413,7 +432,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
            error(line, filename(), "after command '%s'\n", token());
            return false;
        }
-        debug("parseProtocol: command '%s'\n", (*commands).expand()());
+        debug2("parseProtocol: command '%s'\n", (*commands).expand()());
        commands->append('\0'); // terminate value with null byte
    }
 }
@ -468,7 +487,7 @@ Each time newline is read, line is incremented.
    if (c == '$')
    {
        // a variable
-        debug("StreamProtocolParser::readToken: Variable\n");
+        debug2("StreamProtocolParser::readToken: Variable\n");
        buffer.append(c);
        if (quote) buffer.append('"'); // mark as quoted variable
        c = getc(file);
@ -485,7 +504,7 @@ Each time newline is read, line is incremented.
            quote = false;
            // variable like ${xyz}
            if (!readToken(buffer, "{}=;")) return false;
-            debug("StreamProtocolParser::readToken: Variable '%s' in {}\n",
+            debug2("StreamProtocolParser::readToken: Variable '%s' in {}\n",
                buffer(token));
            c = getc(file);
            if (c != '}')
@ -511,7 +530,7 @@ Each time newline is read, line is incremented.
    }
    else if (quote || c == '\'' || c == '"')
    {
-        debug("StreamProtocolParser::readToken: Quoted string\n");
+        debug2("StreamProtocolParser::readToken: Quoted string\n");
        // quoted string
        if (!quote)
        {
@ -570,13 +589,13 @@ Each time newline is read, line is incremented.
    }
    else if (strchr (specialchars, c))
    {
-        debug("StreamProtocolParser::readToken: Special '%c'\n", c);
+        debug2("StreamProtocolParser::readToken: Special '%c'\n", c);
        // a single character
        buffer.append(c);
        return true;
    }
    // a word or (variable name)
-    debug("StreamProtocolParser::readToken: word\n");
+    debug2("StreamProtocolParser::readToken: word\n");
    while (1)
    {
        buffer.append(tolower(c));
@ -587,7 +606,7 @@ Each time newline is read, line is incremented.
            break;
        }
    }
-    debug("StreamProtocolParser::readToken: word='%s' c='%c'\n",
+    debug2("StreamProtocolParser::readToken: word='%s' c='%c'\n",
        buffer(token), c);
    buffer.append('\0').append(&l, sizeof(l)); // append line number
    return true;
@ -615,7 +634,7 @@ parseValue(StreamBuffer& buffer, bool lazy)
    {
        token = buffer.length(); // start of next token
        if (!readToken(buffer)) return false;
-        debug("StreamProtocolParser::parseValue:%d: %s\n",
+        debug2("StreamProtocolParser::parseValue:%d: %s\n",
            line, buffer.expand(token)());
        c = buffer[token];
        if (c == '$') // a variable
@ -775,7 +794,7 @@ Protocol(const Protocol& p, StreamBuffer& name, int _line)
    parameter[0] = protocolname();
    for (i = 0; i < 9; i++)
    {
-        debug("StreamProtocolParser::Protocol::Protocol $%d=\"%s\"\n",
+        if (i) debug("StreamProtocolParser::Protocol::Protocol $%d=\"%s\"\n",
            i, parameter[i]);
        nextparameter = parameter[i] + strlen(parameter[i]) + 1;
        if (nextparameter > name.length() + parameter[0]) break;
@ -928,7 +947,7 @@ getCommands(const char* handlername, StreamBuffer& code, Client* client)
    if (!pvar) return true;
    if (!pvar->value) return true;
    const char* source = pvar->value();
-    debug("StreamProtocolParser::Protocol::getCommands"
+    debug2("StreamProtocolParser::Protocol::getCommands"
        "(handlername=\"%s\", client=\"%s\"): source=%s\n",
            handlername, client->name(), pvar->value.expand()());
    if (!compileCommands(code, source, client))
@ -945,15 +964,15 @@ getCommands(const char* handlername, StreamBuffer& code, Client* client)
            "in protocol '%s'\n", protocolname());
        return false;
    }
-    debug("commands %s: %s\n", handlername, pvar->value.expand()());
-    debug("compiled to: %s\n", code.expand()());
+    debug2("commands %s: %s\n", handlername, pvar->value.expand()());
+    debug2("compiled to: %s\n", code.expand()());
    return true;
 }

 bool StreamProtocolParser::Protocol::
 replaceVariable(StreamBuffer& buffer, const char* varname)
 {
-    debug("StreamProtocolParser::Protocol::replaceVariable %s\n", varname);
+    debug2("StreamProtocolParser::Protocol::replaceVariable %s\n", varname);
    bool quoted = false;
    if (*++varname == '"')
    {
@ -1033,16 +1052,16 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
    unsigned long n;
    StreamBuffer buffer;

-    debug("StreamProtocolParser::Protocol::compileNumber source=\"%s\"\n",
+    debug2("StreamProtocolParser::Protocol::compileNumber source=\"%s\"\n",
        source);
    while (*source == '$' || (*source >= '0' && *source <= '9'))
    {
-        debug("StreamProtocolParser::Protocol::compileNumber *source=%u source=\"%s\"\n",
+        debug2("StreamProtocolParser::Protocol::compileNumber *source=%u source=\"%s\"\n",
            *source, source);
        if (*source == '$')
        {
            if (!replaceVariable(buffer, source)) return false;
-            debug("buffer=%s\n", buffer.expand()());
+            debug2("buffer=%s\n", buffer.expand()());
            buffer.truncate(-1-(int)sizeof(int));
        }
        else
@ -1077,7 +1096,7 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
        return false;
    }
    number = n;
-    debug("StreamProtocolParser::Protocol::compileNumber %s = %ld\n",
+    debug2("StreamProtocolParser::Protocol::compileNumber %s = %ld\n",
        buffer(), n);
    return true;
 }
@ -1095,7 +1114,7 @@ compileString(StreamBuffer& buffer, const char*& source,
    size_t formatpos = buffer.length();
    line = getLineNumber(source);

-    debug("StreamProtocolParser::Protocol::compileString "
+    debug2("StreamProtocolParser::Protocol::compileString "
        "line %d source=\"%s\" formatType=%s quoted=%i recursionDepth=%d\n",
        line, source, ::toStr(formatType), quoted, recursionDepth);

@ -1110,7 +1129,7 @@ compileString(StreamBuffer& buffer, const char*& source,
        // this is step 2: replacing the formats
        if (!*source || (newline = getLineNumber(source)) != line)
        {
-            debug("StreamProtocolParser::Protocol::compileString line %i: %s\n", line, buffer.expand()());
+            debug2("StreamProtocolParser::Protocol::compileString line %i: %s\n", line, buffer.expand()());
            // compile all formats in this line
            // We do this here after all variables in this line
            // have been replaced and after string has been coded.
@ -1133,7 +1152,7 @@ compileString(StreamBuffer& buffer, const char*& source,
                            formatpos+=2;
                            continue;
                        }
-                        debug("StreamProtocolParser::Protocol::compileString "
+                        debug2("StreamProtocolParser::Protocol::compileString "
                            "format=\"%s\"\n", buffer.expand(formatpos)());
                        nformats++;
                        formatbuffer.clear();
@ -1150,14 +1169,14 @@ compileString(StreamBuffer& buffer, const char*& source,
                        }
                        size_t formatlen = p - buffer(formatpos);
                        buffer.replace(formatpos, formatlen, formatbuffer);
-                        debug("StreamProtocolParser::Protocol::compileString "
+                        debug2("StreamProtocolParser::Protocol::compileString "
                            "replaced by: \"%s\"\n", buffer.expand(formatpos)());
                        formatpos += formatbuffer.length();
                        continue;
                    }
                    formatpos ++;
                }
-                debug("StreamProtocolParser::Protocol::compileString "
+                debug2("StreamProtocolParser::Protocol::compileString "
                    "%d formats found in line %d\n", nformats, line);
            }
            if (!*source) break;
@ -1400,7 +1419,7 @@ compileString(StreamBuffer& buffer, const char*& source,
            "Unexpected '%s' in string\n", source);
        return false;
    }
-    debug("StreamProtocolParser::Protocol::compileString buffer=%s\n", buffer.expand()());
+    debug2("StreamProtocolParser::Protocol::compileString buffer=%s\n", buffer.expand()());
    return true;
 }

@ -1446,7 +1465,7 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
        // add fieldname for debug purpose
        fieldname=buffer.length();
        buffer.append(source, fieldnameEnd - source).append(eos);
-        debug("StreamProtocolParser::Protocol::compileFormat: fieldname='%s'\n",
+        debug2("StreamProtocolParser::Protocol::compileFormat: fieldname='%s'\n",
            buffer(fieldname));
        StreamBuffer fieldAddress;
        if (!client->getFieldAddress(buffer(fieldname), fieldAddress))
@ -1507,14 +1526,14 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
    // add formatstr for debug purpose
    buffer.append(formatstart, source-formatstart).append(eos);

-    debug("StreamProtocolParser::Protocol::compileFormat: formatstring=\"%s\"\n",
+    debug2("StreamProtocolParser::Protocol::compileFormat: formatstring=\"%s\"\n",
        StreamBuffer(formatstart, source-formatstart).expand()());

    // add streamFormat structure and info
    buffer.append(&streamFormat, sizeof(streamFormat));
    buffer.append(infoString);

-    debug("StreamProtocolParser::Protocol::compileFormat: format.type=%s, "
+    debug2("StreamProtocolParser::Protocol::compileFormat: format.type=%s, "
        "infolen=%ld infostring=\"%s\"\n",
        StreamFormatTypeStr[streamFormat.type],
        streamFormat.infolen, infoString.expand()());
--- a/src/StreamVersion.c
+++ b/src/StreamVersion.c
@ -26,10 +26,16 @@
 #define STR(x) STR2(x)
 const char StreamVersion [] =
    "StreamDevice"
-#if STREAM_MAJOR+0
+#ifdef STREAM_MAJOR
    " " STR(STREAM_MAJOR)
    "." STR(STREAM_MINOR)
    "." STR(STREAM_PATCHLEVEL)
    STREAM_DEV
 #endif
-    " commit:" STREAM_COMMIT_HASH;
+#ifdef STREAM_COMMIT_DATE
+    " " STREAM_COMMIT_DATE
+#endif
+#ifdef STREAM_COMMIT_HASH
+    "\n  commit: " STREAM_COMMIT_HASH
+#endif
+;
--- a/src/TimestampConverter.cc
+++ b/src/TimestampConverter.cc
@ -20,14 +20,14 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

-#include "StreamFormatConverter.h"
-#include "StreamError.h"
-
 #include <time.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <errno.h>

+#include "StreamFormatConverter.h"
+#include "StreamError.h"
+
 /* timezone in UNIX contains the seconds between UTC and local time,
 but not in Free-BSD! Here timezone() is a function delivering
 the time zone abbreviation (e.g. CET). Alternatively, the timezone
--- a/src/devaaiStream.c
+++ b/src/devaaiStream.c
@ -171,10 +171,10 @@ static long writeData(dbCommon *record, format_t *format)
                        break;
 #ifdef DBR_INT64
                    case DBF_INT64:
-                        dval = ((epicsInt64 *)aai->bptr)[nowd];
+                        dval = (double)((epicsInt64 *)aai->bptr)[nowd];
                        break;
                    case DBF_UINT64:
-                        dval = ((epicsUInt64 *)aai->bptr)[nowd];
+                        dval = (double)((epicsUInt64 *)aai->bptr)[nowd];
                        break;
 #endif
                    case DBF_LONG:
@ -214,10 +214,10 @@ static long writeData(dbCommon *record, format_t *format)
                {
 #ifdef DBR_INT64
                    case DBF_INT64:
-                        lval = ((epicsInt64 *)aai->bptr)[nowd];
+                        lval = (long)((epicsInt64 *)aai->bptr)[nowd];
                        break;
                    case DBF_UINT64:
-                        lval = ((epicsUInt64 *)aai->bptr)[nowd];
+                        lval = (long)((epicsUInt64 *)aai->bptr)[nowd];
                        break;
 #endif
                    case DBF_LONG:
--- a/src/devaaoStream.c
+++ b/src/devaaoStream.c
@ -20,7 +20,6 @@
 * along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 *************************************************************************/

-#include <stdio.h>
 #include "epicsString.h"
 #include "aaoRecord.h"
 #include "devStream.h"
@ -200,10 +199,10 @@ static long writeData(dbCommon *record, format_t *format)
                        break;
 #ifdef DBR_INT64
                    case DBF_INT64:
-                        dval = ((epicsInt64 *)aao->bptr)[nowd];
+                        dval = (double)((epicsInt64 *)aao->bptr)[nowd];
                        break;
                    case DBF_UINT64:
-                        dval = ((epicsUInt64 *)aao->bptr)[nowd];
+                        dval = (double)((epicsUInt64 *)aao->bptr)[nowd];
                        break;
 #endif
                    case DBF_LONG:
@ -243,10 +242,10 @@ static long writeData(dbCommon *record, format_t *format)
                {
 #ifdef DBR_INT64
                    case DBF_INT64:
-                        lval = ((epicsInt64 *)aao->bptr)[nowd];
+                        lval = (long)((epicsInt64 *)aao->bptr)[nowd];
                        break;
                    case DBF_UINT64:
-                        lval = ((epicsUInt64 *)aao->bptr)[nowd];
+                        lval = (long)((epicsUInt64 *)aao->bptr)[nowd];
                        break;
 #endif
                    case DBF_LONG:
--- a/src/devaoStream.c
+++ b/src/devaoStream.c
@ -73,7 +73,7 @@ static long readData(dbCommon *record, format_t *format)
    if (record->pact) return DO_NOT_CONVERT;
    /* In @init handler, no processing, enforce monitor updates. */
    ao->omod = ao->oval != val;
-    ao->orbv = ao->oval = val;
+    ao->orbv = (epicsInt32)(ao->oval = val);
    monitor_mask = recGblResetAlarms(record);
    if (!(fabs(ao->mlst - val) <= ao->mdel))
    {
--- a/src/devlsiStream.c
+++ b/src/devlsiStream.c
@ -37,7 +37,7 @@ static long readData(dbCommon *record, format_t *format)
    {
        lsi->val[length] = 0;
    }
-    lsi->len = length;
+    lsi->len = (epicsUInt32)length;
    return OK;
 }

--- a/src/devlsoStream.c
+++ b/src/devlsoStream.c
@ -39,7 +39,7 @@ static long readData(dbCommon *record, format_t *format)
    {
        lso->val[length] = 0;
    }
-    lso->len = length;
+    lso->len = (epicsUInt32)length;
    if (record->pact) return OK;
    /* In @init handler, no processing, enforce monitor updates. */
    monitor_mask = recGblResetAlarms(record);
--- a/src/devstringoutStream.c
+++ b/src/devstringoutStream.c
@ -43,7 +43,7 @@ static long readData(dbCommon *record, format_t *format)
        strncmp(so->oval, so->val, sizeof(so->val)))
    {
        monitor_mask |= DBE_VALUE | DBE_LOG;
-        strncpy(so->oval, so->val, sizeof(so->val));
+        strncpy(so->oval, so->val, sizeof(so->oval));
    }
    if (monitor_mask)
        db_post_events(record, so->val, monitor_mask);
--- a/src/devwaveformStream.c
+++ b/src/devwaveformStream.c
@ -172,10 +172,10 @@ static long writeData(dbCommon *record, format_t *format)
                        break;
 #ifdef DBR_INT64
                    case DBF_INT64:
-                        dval = ((epicsInt64 *)wf->bptr)[nowd];
+                        dval = (double)((epicsInt64 *)wf->bptr)[nowd];
                        break;
                    case DBF_UINT64:
-                        dval = ((epicsUInt64 *)wf->bptr)[nowd];
+                        dval = (double)((epicsUInt64 *)wf->bptr)[nowd];
                        break;
 #endif
                    case DBF_LONG:
@ -215,10 +215,10 @@ static long writeData(dbCommon *record, format_t *format)
                {
 #ifdef DBR_INT64
                    case DBF_INT64:
-                        lval = ((epicsInt64 *)wf->bptr)[nowd];
+                        lval = (long)((epicsInt64 *)wf->bptr)[nowd];
                        break;
                    case DBF_UINT64:
-                        lval = ((epicsUInt64 *)wf->bptr)[nowd];
+                        lval = (long)((epicsUInt64 *)wf->bptr)[nowd];
                        break;
 #endif
                    case DBF_LONG:
--- a/src/makeStreamVersion.pl
+++ b/src/makeStreamVersion.pl
@ -23,7 +23,7 @@
 use strict;


-my ( $major, $minor, $patch, $dev, $branch, $date, $hash );
+my ( $major, $minor, $patch, $dev, $date, $hash );

 if (my $version = `git describe --tags --abbrev=0 --dirty --match "[0-9]*" 2>/dev/null`) {
    if ($version =~ m/(\d+)\.(\d+)\.(\d+)?(.*)?/) {
@ -39,10 +39,10 @@ if (!$major) {
            if ($line =~ m/COMMIT: *([[:xdigit:]]+)/) {
                $hash = $1;
            }
-            if ($line =~ m/REFS: *tag: *((\d+)\.(\d+)\.(\d+)?,)? *(.*)/) {
-                $major = $2; $minor = $3; $patch = $4; $branch = $5;
+            if ($line =~ m/REFS: .*tag: *(\d+)\.(\d+)\.?(\d+)?/) {
+                $major = $1; $minor = $2; $patch = $3 or $patch = 0;
            }
-            if ($line =~ m/DATE: *(.+)/) {  
+            if ($line =~ m/DATE: *([-0-9:+ ]*)/) {  
                $date = $1;
            }
        }
@ -58,14 +58,20 @@ print $out <<EOF;
 #ifndef StreamVersion_h
 #define StreamVersion_h

+EOF
+if ($major) {
+    print $out <<EOF;
 #define STREAM_MAJOR $major
 #define STREAM_MINOR $minor
 #define STREAM_PATCHLEVEL $patch
 #define STREAM_DEV "$dev"
-#define STREAM_COMMIT_HASH "$hash"
-#define STREAM_COMMIT_DATE "$date"
-
-#endif /* StreamVersion_h */
 EOF
-
+}
+if ($hash) {
+    print $out "#define STREAM_COMMIT_HASH \"$hash\"\n";
+}
+if ($date) {
+    print $out "#define STREAM_COMMIT_DATE \"$date\"\n";
+}
+print $out "#endif /* StreamVersion_h */\n";
 close $out
--- a/src/makedbd.pl
+++ b/src/makedbd.pl
@ -32,6 +32,9 @@ if (@ARGV[0] eq "-3.13") {
 } else {
    print "variable(streamDebug, int)\n";
    print "variable(streamError, int)\n";
+    print "variable(streamDebugColored, int)\n";
+    print "variable(streamErrorDeadTime, int)\n";
+    print "variable(streamMsgTimeStamped, int)\n";
    print "registrar(streamRegistrar)\n";
    if ($asyn) { print "registrar(AsynDriverInterfaceRegistrar)\n"; }
 }
--- a/streamApp/Makefile
+++ b/streamApp/Makefile
@ -21,16 +21,8 @@
 # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
 #########################################################################/

-TOP = ../..
-ifneq ($(wildcard ../../configure),)
-  include $(TOP)/configure/CONFIG
-else ifneq ($(wildcard ../../config),)
-  include $(TOP)/config/CONFIG_APP
-  include $(TOP)/config/RULES_ARCHS
-else
-  TOP= ..
-  include $(TOP)/configure/CONFIG
-endif
+TOP= ..
+include $(TOP)/configure/CONFIG

 PROD = streamApp
 DBD  = streamApp.dbd
@ -86,6 +78,13 @@ endif

 PROD_LIBS += $(EPICS_BASE_IOC_LIBS)

+# Some linux systems moved RPC related symbols to libtirpc
+# Define TIRPC in configure/CONFIG_SITE in this case
+ifeq ($(TIRPC),YES)
+  USR_INCLUDES_Linux += -I/usr/include/tirpc
+  PROD_SYS_LIBS_DEFAULT += tirpc
+endif
+
 # switch off annoying rset warnings in 3.16+
 CPPFLAGS += -DUSE_TYPED_RSET

--- a/streamApp/checksums.proto
+++ b/streamApp/checksums.proto
@ -54,4 +54,6 @@ write {
    out "%s  hexsum8   %0.12<hexsum8>";
    out "%s  cpi       %0.12<cpi>";
    out "%s  leybold   %0.12<leybold>";
+    out "%s  lrc       %0.12<lrc>";
+    out "%s  hexlrc    %0.12<hexlrc>";
 }
--- a/streamApp/test.db
+++ b/streamApp/test.db
@ -22,20 +22,20 @@
 record (stringout, "$(P):cmd")
 {
    field (DTYP, "stream")
-    field (OUT,  "@test.proto command terminal")
+    field (OUT,  "@test.proto command  terminal")
    field (PRIO, "HIGH")
    field (VAL, "")
 }
 record (stringout, "$(P):info")
 {
    field (DTYP, "stream")
-    field (OUT,  "@test.proto info terminal")
+    field (OUT,  "@test.proto info terminal   ")
    field (PRIO, "HIGH")
 }
 record (stringout, "$(P):request")
 {
    field (DTYP, "stream")
-    field (OUT,  "@test.proto request($(P):reply.VAL) terminal")
+    field (OUT,  "@test.proto request ($(P):reply.VAL) terminal")
    field (PRIO, "HIGH")
 }
 record (stringin, "$(P):reply")
@ -44,7 +44,7 @@ record (stringin, "$(P):reply")
 record (stringout, "$(P):checksum")
 {
    field (DTYP, "stream")
-    field (OUT,  "@test.proto checksum($(CHKSUM=sum)) terminal")
+    field (OUT,  "@test.proto checksum     ($(CHKSUM=sum))   terminal")
 }
 record (stringin, "$(P):spy")
 {
--- a/streamApp/tests/testStreamBuffer
+++ b/streamApp/tests/testStreamBuffer
@ -1,6 +1,7 @@
 rm -f test.*

 cat > test.cc << EOF
+#include <StreamError.h>
 #include <StreamBuffer.h>
 #include <assert.h>
 #include <stdio.h>
@ -55,14 +56,14 @@ EOF

 if [ "$1" = "-sls" ]
 then
-    O=../../O.*_$EPICS_HOST_ARCH/StreamBuffer.o
+    O=../../O.*_$EPICS_HOST_ARCH
 else
-    O=../../src/O.$EPICS_HOST_ARCH/StreamBuffer.o
+    O=../../src/O.$EPICS_HOST_ARCH
 fi

 for o in $O
 do
-    g++ -I ../../src $o test.cc -o test.exe
+    g++ -I ../../src $o/StreamBuffer.o $o/StreamError.o test.cc -o test.exe
    ./test.exe
    if [ $? != 0 ]
    then
Author	SHA1	Message	Date
Ralph Lange	51e4a0749d	make "ifdef CALC" also consider SYNAPPS variable change the ifdefs to the same expression used in CONFIG_STREAM	2021-11-05 11:42:48 +01:00
Ralph Lange	4cdace3ffe	make "stream" in DBD and other file names explicit The LIBRARY_* variables may specify multiple libraries. (So they can't be used as part of file names.)	2021-11-05 11:42:48 +01:00
Dirk Zimoch	d19b16d096	fix strncpy warning	2021-11-05 11:21:21 +01:00
Matthew Furseman	b1e0d63c6b	Canonical handling of user include files	2021-11-05 10:14:21 +01:00
Dirk Zimoch	d1b43b879c	strncasecmp does exist when compiling for Windows on MinGW	2021-11-05 10:13:58 +01:00
Matthew Furseman	6b0ee5e946	Conditionally use tirpc if defined	2021-09-21 13:01:32 +01:00
Matthew Furseman	a0d1b35862	Add preprocessor definition for static PCRE	2021-09-21 12:58:20 +01:00
Dirk Zimoch	dfbd308d46	32 bit Windows needs wrapper for calling convention reasons	2021-09-01 10:13:58 +02:00
Dirk Zimoch	b615dae9b1	Change log added	2021-07-05 19:57:03 +02:00
Dirk Zimoch	ac6c96c645	poll for I/O Intr only while interruptAccept is true	2021-07-05 19:10:46 +02:00
Dirk Zimoch	fe1ac364ab	allow to use absolute file paths	2021-07-05 19:09:58 +02:00
Dirk Zimoch	a06006eade	allow : and ; as separators in STREAM_PROTOCOL_PATH	2021-07-05 19:09:58 +02:00
Dirk Zimoch	a4e843cc4c	re-arrange includes: first OS, then other software (e.g. EPICS), then my own headers	2021-07-05 19:09:57 +02:00
Dirk Zimoch	601d4a3709	shifted noisy debug from parser and I/O Intr to level 2	2021-07-05 19:09:48 +02:00
Dirk Zimoch	f495dd9853	print thread name in messages even if time stamps are not printed	2021-07-05 19:09:10 +02:00
Dirk Zimoch	6b05e006da	fix initial space when timestamp is off	2021-07-05 19:09:10 +02:00
Dirk Zimoch	068632326c	document streamMsgTimeStamped	2021-07-05 19:09:10 +02:00
Yong Hu	a5eb4618b7	added a variable 'streamMsgTimeStamped' to enable/disable timestamps on debug & error messages	2021-07-05 19:09:09 +02:00
Dirk Zimoch	fe7f4a5e1b	some rules for contribution added	2021-07-05 19:09:09 +02:00
Dirk Zimoch	0010b8f23f	remove signed/unsigned warning	2021-07-05 19:09:08 +02:00
Dirk Zimoch	7e42f6fddf	fix initializer which is not compatible with vxWorks 5	2021-07-05 19:09:08 +02:00
Dominic Oram	2b15ae7ac0	Refactor to set dead time as a shell variable and add documentation	2021-07-05 19:09:08 +02:00
Dominic Oram	055e141791	Added configurable dead time for repeated messages	2021-07-05 19:09:07 +02:00
Dominic Oram	52486ae7a0	Created a generic function for reducing logging frequency of the same error	2021-07-05 19:09:07 +02:00
Dominic Oram	becf7d5585	Print reply timeout errors only every 5 seconds	2021-07-05 19:09:07 +02:00
Dominic Oram	132f03fc6c	Reply timeouts will now not be printed multiple times	2021-07-05 19:09:06 +02:00
Dirk Zimoch	3978357f17	fix test after introducing ansiEscape() function	2021-07-05 19:09:06 +02:00
Dirk Zimoch	a1ec9b99e8	color mode depends on stderr, not stdout	2021-07-05 19:09:05 +02:00
Dirk Zimoch	377d511c67	Merge branch 'lrc_checksum' of https://github.com/marciodo/StreamDevice	2021-04-09 17:41:57 +02:00
Dirk Zimoch	849586b7fa	Merge branch 'issue_65' of https://github.com/krisztianloki/StreamDevice	2021-04-09 17:37:28 +02:00
Dirk Zimoch	e6b2944c67	build for all OS classes	2021-04-01 14:47:36 +02:00
Marcio Paduan Donadio	67c205e87b	Added description of the LRC checksum to the documentation	2021-03-17 14:24:32 -07:00
Marcio Paduan Donadio	575c0ffcf8	Implemented lrc checksum and also a version that interprets ASCII as number: hexlrc	2021-03-16 19:14:36 -07:00
Krisztián Löki	e662ebda04	Initialize inTerminatorDefined and outTerminatorDefined	2021-03-02 15:47:29 +01:00
Freddie Akeroyd	ea8873becd	Remove out of date comment	2021-02-25 15:43:29 +00:00
Freddie Akeroyd	cf7e7bd6ee	Add <unistd.h> for non-windows systems	2021-02-23 17:15:27 +00:00
Freddie Akeroyd	e36ee60ba7	Remove errlog.h include	2021-02-23 15:26:50 +00:00
Freddie Akeroyd	e7f36a71af	Use streamDebugColored IOC variable instead	2021-02-23 15:24:24 +00:00
Freddie Akeroyd	ce4b14c611	Check for NULL as well as INVALID_HANDLE_VALUE	2021-02-23 01:09:50 +00:00
Freddie Akeroyd	7c55d7bdfa	Add missing space character	2021-02-23 01:00:28 +00:00
Freddie Akeroyd	6afa4828eb	Allow configuring of coloured console output with STREAM_DEBUG_COLOR The STREAM_DEBUG_COLOR environment variable can be set to: yes - always generate ANSI colour escape codes on debug/error output no - use plain text output for debug/error auto - (default) output ANSI codes if terminal supports it	2021-02-22 22:07:52 +00:00
Dirk Zimoch	75bbb1a252	vxWorks does not support %hhx scanf format	2020-12-11 11:42:55 +01:00
Dirk Zimoch	227bb83f60	fix formats for vxWorks 6.9	2020-09-29 17:40:04 +02:00
Dirk Zimoch	4edff374d0	fix some type conversion warning on Windows	2020-09-29 17:39:07 +02:00
Dirk Zimoch	9273476135	install missing headers	2020-09-29 17:34:58 +02:00
Dirk Zimoch	8b9359723a	fix problem with extra spaces after protocol name in link	2020-08-18 14:46:16 +02:00
Dirk Zimoch	bf55d4c202	Do not use upper level configure and do not install to upper level any more. Drops backward compatibility to Stream 2.7	2020-07-30 17:55:17 +02:00
Dirk Zimoch	1cace82a70	make version generation more robust	2020-07-30 17:15:47 +02:00