From 554a28a0b8814a39ab3c1b3e43ab7eba05f82957 Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Tue, 27 Aug 2019 15:28:31 -0500
Subject: [PATCH 1/6] Added modbus to travis config

---
 .ci/travis-prepare.sh | 13 +++++++++++++
 .travis.yml           | 14 +++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.ci/travis-prepare.sh b/.ci/travis-prepare.sh
index 003c4f6d..d0ba821c 100755
--- a/.ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@@ -19,6 +19,7 @@ cat << EOF > $RELEASE_PATH
 IPAC=$IPAC_PATH
 SNCSEQ=$SUPPORT/seq
 ASYN=$SUPPORT/asyn
+MODBUS=$SUPPORT/modbus
 EPICS_BASE=$SUPPORT/epics-base
 EOF
 
@@ -162,3 +163,15 @@ if [ ! -e "$SUPPORT/asyn/built" ]; then
 else
     echo "Using cached asyn"
 fi
+
+# modbus
+if [ ! -e "$SUPPORT/modbus/built" ]; then
+    echo "Build modbus"
+    install -d $SUPPORT/modbus
+    git clone --depth 10 --branch $MODBUS https://github.com/epics-modules/modbus.git $SUPPORT/modbus
+    cp $RELEASE_PATH $SUPPORT/modbus/configure/RELEASE
+    make -C "$SUPPORT/modbus" -j2
+    touch $SUPPORT/modbus/built
+else
+    echo "Using cached modbus"
+fi
diff --git a/.travis.yml b/.travis.yml
index 166dcf85..b3d20d67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ addons:
     - g++-mingw-w64-i686
     - re2c
 env:
- - BASE=3.14 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=3.14 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=R3.15.6 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=R3.15.6 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=7.0 STATIC=shared RTEMS=4.10 SEQ=2.2.6 ASYN=R4-35 IPAC=2.15
- - BASE=7.0 STATIC=shared CMPLR=clang WINE=32 SEQ=2.2.4 ASYN=R4-35 IPAC=
- - BASE=7.0 STATIC=static WINE=32 SEQ=2.2.6 ASYN=R4-35 IPAC=
+ - BASE=3.14 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=3.14 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=R3.15.6 STATIC=shared SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=R3.15.6 STATIC=static SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=7.0 STATIC=shared RTEMS=4.10 SEQ=2.2.6 ASYN=R4-35 IPAC=2.15 MODBUS=R2-11
+ - BASE=7.0 STATIC=shared CMPLR=clang WINE=32 SEQ=2.2.4 ASYN=R4-35 IPAC=  MODBUS=R2-11
+ - BASE=7.0 STATIC=static WINE=32 SEQ=2.2.6 ASYN=R4-35 IPAC=  MODBUS=R2-11
 install: ./.ci/travis-prepare.sh
 before_script:
   - cp ./configure/EXAMPLE_CONFIG_SITE.local ./configure/CONFIG_SITE.local

From 9b290003419f96a53ea583101a7082449ea9eb7e Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Tue, 27 Aug 2019 16:24:06 -0500
Subject: [PATCH 2/6] Updated motorOms to
 b0c0e464ceeb590fc5a877d7b48437f24b66db97

---
 modules/motorOms | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/motorOms b/modules/motorOms
index 85cde67e..b0c0e464 160000
--- a/modules/motorOms
+++ b/modules/motorOms
@@ -1 +1 @@
-Subproject commit 85cde67e5c785d1dfc1f46c35105f5ef796b579e
+Subproject commit b0c0e464ceeb590fc5a877d7b48437f24b66db97

From 2b47a942fc1e9b77c71ae685ba3e88aabad7f4a7 Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Wed, 28 Aug 2019 09:42:46 -0500
Subject: [PATCH 3/6] Updated motorOms to
 67fe88c1b5aeb80216666c36acf6c1b17e102fe7

---
 modules/motorOms | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/motorOms b/modules/motorOms
index b0c0e464..67fe88c1 160000
--- a/modules/motorOms
+++ b/modules/motorOms
@@ -1 +1 @@
-Subproject commit b0c0e464ceeb590fc5a877d7b48437f24b66db97
+Subproject commit 67fe88c1b5aeb80216666c36acf6c1b17e102fe7

From 175dba6d87930f62dd8678a61ceebc1a4b60eaee Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Wed, 28 Aug 2019 09:58:30 -0500
Subject: [PATCH 4/6] Updated motorHytec to
 7872aebc0f026efca7839e61410bc0a546922a8c

---
 modules/motorHytec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/motorHytec b/modules/motorHytec
index e5f39322..7872aebc 160000
--- a/modules/motorHytec
+++ b/modules/motorHytec
@@ -1 +1 @@
-Subproject commit e5f3932222152e16c3dea8fef205b7f1724dbc42
+Subproject commit 7872aebc0f026efca7839e61410bc0a546922a8c

From 900a8bcc93601cd9edbc6c79ad55b3e512951a90 Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Wed, 28 Aug 2019 10:09:16 -0500
Subject: [PATCH 5/6] Updated motorOmsAsyn to
 e949e2c51c0766a878dd7f1c322d1144305f06fe

---
 modules/motorOmsAsyn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/motorOmsAsyn b/modules/motorOmsAsyn
index 1b4c794c..e949e2c5 160000
--- a/modules/motorOmsAsyn
+++ b/modules/motorOmsAsyn
@@ -1 +1 @@
-Subproject commit 1b4c794c24c8794b4cb6efb07c024fa9c1bb7d76
+Subproject commit e949e2c51c0766a878dd7f1c322d1144305f06fe

From 1d9525f19e445802a0765859b6ddb31c8415f5f2 Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Wed, 28 Aug 2019 10:22:18 -0500
Subject: [PATCH 6/6] Updated motorOms to
 49c7fce59bec4198129fa794183d5fc061649bf6

---
 modules/motorOms | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/motorOms b/modules/motorOms
index 67fe88c1..49c7fce5 160000
--- a/modules/motorOms
+++ b/modules/motorOms
@@ -1 +1 @@
-Subproject commit 67fe88c1b5aeb80216666c36acf6c1b17e102fe7
+Subproject commit 49c7fce59bec4198129fa794183d5fc061649bf6