From dad095c698ae7445d2637f5e4fb37c82964d9c58 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 00:49:19 +0000 Subject: [PATCH 01/24] Build both versions of libftdi --- .travis.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 67b22a5ef6..b3950f08e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,24 +45,42 @@ matrix: env: - TASK='compile' - CPPUNIT='1.13' + - LIBFTDI='0' - os: osx osx_image: xcode9.3beta compiler: clang env: - TASK='compile' - CPPUNIT='1.14' + - LIBFTDI='0' - os: osx osx_image: xcode9.3beta compiler: gcc env: - TASK='compile' - CPPUNIT='1.13' + - LIBFTDI='0' - os: osx osx_image: xcode9.3beta compiler: gcc env: - TASK='compile' - CPPUNIT='1.14' + - LIBFTDI='0' + - os: osx + osx_image: xcode9.3beta + compiler: clang + env: + - TASK='compile' + - CPPUNIT='1.14' + - LIBFTDI='1' + - os: osx + osx_image: xcode9.3beta + compiler: gcc + env: + - TASK='compile' + - CPPUNIT='1.14' + - LIBFTDI='1' - os: linux dist: trusty compiler: clang @@ -247,7 +265,9 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi #Fix a broken homebrew libtool install - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex protobuf@3.1 libftdi libftdi0 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex protobuf@3.1 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" != "1" ]; then brew install libftdi0; fi # install libftdi0 + - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" == "1" ]; then brew install libftdi; fi # install the latest libftdi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p ${HOME}/Library/Python/2.7/lib/python/site-packages; echo 'import site; site.addsitedir("/usr/local/lib/python2.7/site-packages")' >> ${HOME}/Library/Python/2.7/lib/python/site-packages/homebrew.pth; fi - if [ "$TRAVIS_OS_NAME" == "osx" -a "$CPPUNIT" != "1.14" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/e6e43cf6a3%5E/Formula/cppunit.rb; fi # install a slightly older cppunit, as latest needs C++11 support From 03b45cb52c3297528a5430c0e05442133baeffc6 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 01:30:36 +0000 Subject: [PATCH 02/24] Check we have either version of libftdi present --- configure.ac | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index b1ab03bd68..fe9c705c9f 100644 --- a/configure.ac +++ b/configure.ac @@ -612,19 +612,27 @@ AC_ARG_ENABLE( [ja-rule], [AS_HELP_STRING([--enable-ja-rule], [Build the Ja Rule test tool])]) -# libftdi: this requires libusb-0.1.4+ don't know if I should also +# libftdi0: this requires libusb-0.1.4+ don't know if I should also # check for it, since the libusb check above is not for 0.1.4 but for libusb-1 AC_ARG_ENABLE( [libftdi], [AS_HELP_STRING([--disable-libftdi], - [Avoid using libftdi even if it exists])]) + [Avoid using libftdi or libftdi1 even if either exists])]) -have_libftdi="no" +have_libftdi0="no" +AS_IF([test "x$enable_libftdi" != xno], + [PKG_CHECK_MODULES([libftdi], [libftdi >= 0.18], [have_libftdi0="yes"], + [true])]) +have_libftdi1="no" AS_IF([test "x$enable_libftdi" != xno], - [PKG_CHECK_MODULES([libftdi], [libftdi >= 0.18], [have_libftdi="yes"], + [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0], [have_libftdi1="yes"], [true])]) +have_libftdi="no" +if test "x$have_libftdi0" = xyes || test "x$have_libftdi1" = xyes; then + have_libftdi="yes" +fi AS_IF([test "x$have_libftdi" = xyes], - [AC_DEFINE([HAVE_LIBFTDI], [1], [define if libftdi is installed])]) + [AC_DEFINE([HAVE_LIBFTDI], [1], [define if libftdi or libftdi1 is installed])]) # libusb AC_ARG_ENABLE( From dc01cafa426a00855188faa7e3639d4525f52974 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 01:49:16 +0000 Subject: [PATCH 03/24] Some more explicit defines for libftdi0 and 1 --- configure.ac | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fe9c705c9f..85bc1500ce 100644 --- a/configure.ac +++ b/configure.ac @@ -621,12 +621,16 @@ AC_ARG_ENABLE( have_libftdi0="no" AS_IF([test "x$enable_libftdi" != xno], - [PKG_CHECK_MODULES([libftdi], [libftdi >= 0.18], [have_libftdi0="yes"], + [PKG_CHECK_MODULES([libftdi0], [libftdi >= 0.18], [have_libftdi0="yes"], [true])]) +AS_IF([test "x$have_libftdi0" = xyes], + [AC_DEFINE([HAVE_LIBFTDI0], [1], [define if libftdi0 is installed])]) have_libftdi1="no" AS_IF([test "x$enable_libftdi" != xno], [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0], [have_libftdi1="yes"], [true])]) +AS_IF([test "x$have_libftdi1" = xyes], + [AC_DEFINE([HAVE_LIBFTDI1], [1], [define if libftdi1 is installed])]) have_libftdi="no" if test "x$have_libftdi0" = xyes || test "x$have_libftdi1" = xyes; then have_libftdi="yes" From 8cb4ec85a973a252c403a0dc40f9c136233804be Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 01:51:45 +0000 Subject: [PATCH 04/24] Add either library as necessary --- plugins/ftdidmx/Makefile.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index 19c72eb8e0..6b3af3ec57 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -13,7 +13,13 @@ plugins_ftdidmx_libolaftdidmx_la_SOURCES = \ plugins/ftdidmx/FtdiWidget.cpp \ plugins/ftdidmx/FtdiWidget.h plugins_ftdidmx_libolaftdidmx_la_LIBADD = \ - $(libftdi_LIBS) \ common/libolacommon.la \ olad/plugin_api/libolaserverplugininterface.la +if HAVE_FTDI1 +plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ + $(libftdi1_LIBS) +else +plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ + $(libftdi0_LIBS) +endif endif From 8f8bb8a68f5c4fa5d6301b95e227c8ebf86688c9 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 03:14:49 +0000 Subject: [PATCH 05/24] Add the AM_CONDITIONALs --- configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac index 85bc1500ce..a8af196d80 100644 --- a/configure.ac +++ b/configure.ac @@ -623,12 +623,14 @@ have_libftdi0="no" AS_IF([test "x$enable_libftdi" != xno], [PKG_CHECK_MODULES([libftdi0], [libftdi >= 0.18], [have_libftdi0="yes"], [true])]) +AM_CONDITIONAL([HAVE_LIBFTDI0], [test "x$have_libftdi0" = xyes]) AS_IF([test "x$have_libftdi0" = xyes], [AC_DEFINE([HAVE_LIBFTDI0], [1], [define if libftdi0 is installed])]) have_libftdi1="no" AS_IF([test "x$enable_libftdi" != xno], [PKG_CHECK_MODULES([libftdi1], [libftdi1 >= 1.0], [have_libftdi1="yes"], [true])]) +AM_CONDITIONAL([HAVE_LIBFTDI1], [test "x$have_libftdi1" = xyes]) AS_IF([test "x$have_libftdi1" = xyes], [AC_DEFINE([HAVE_LIBFTDI1], [1], [define if libftdi1 is installed])]) have_libftdi="no" From ea26c8f70ad7e179b39432ed0700829fd08053f2 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 03:24:55 +0000 Subject: [PATCH 06/24] Make the names match --- plugins/ftdidmx/Makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index 6b3af3ec57..6d3e0f43ad 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -15,7 +15,7 @@ plugins_ftdidmx_libolaftdidmx_la_SOURCES = \ plugins_ftdidmx_libolaftdidmx_la_LIBADD = \ common/libolacommon.la \ olad/plugin_api/libolaserverplugininterface.la -if HAVE_FTDI1 +if HAVE_LIBFTDI1 plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ $(libftdi1_LIBS) else From 893f4d9f64cfd0a69b9c213c8e5bcee5fa74023a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 03:50:24 +0000 Subject: [PATCH 07/24] Fix the include --- plugins/ftdidmx/FtdiWidget.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/ftdidmx/FtdiWidget.h b/plugins/ftdidmx/FtdiWidget.h index 6b0519784b..2f856e5f2b 100644 --- a/plugins/ftdidmx/FtdiWidget.h +++ b/plugins/ftdidmx/FtdiWidget.h @@ -35,7 +35,16 @@ #ifndef PLUGINS_FTDIDMX_FTDIWIDGET_H_ #define PLUGINS_FTDIDMX_FTDIWIDGET_H_ +#if HAVE_CONFIG_H +#include +#endif // HAVE_CONFIG_H + +#ifdef HAVE_LIBFTDI1 +#include +#else #include +#endif // HAVE_LIBFTDI1 + #include #include From f85e9a40dcfe4022b6ac3a5a705e0839c7532a3e Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 5 Mar 2018 04:01:41 +0000 Subject: [PATCH 08/24] Include the relevant ftdi.h --- plugins/ftdidmx/FtdiWidget.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/plugins/ftdidmx/FtdiWidget.cpp b/plugins/ftdidmx/FtdiWidget.cpp index d85e373d5f..7c97752492 100644 --- a/plugins/ftdidmx/FtdiWidget.cpp +++ b/plugins/ftdidmx/FtdiWidget.cpp @@ -32,8 +32,17 @@ * by E.S. Rosenberg a.k.a. Keeper of the Keys 5774/2014 */ -#include +#if HAVE_CONFIG_H +#include +#endif // HAVE_CONFIG_H + +#ifdef HAVE_LIBFTDI1 +#include +#else #include +#endif // HAVE_LIBFTDI1 + +#include #include #include From 9f99407d7efbc1d11959bd93dc0fe4110099af4d Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Fri, 25 May 2018 01:57:04 +0300 Subject: [PATCH 09/24] libftdi1 uses libusb_device instead of usb_device. --- plugins/ftdidmx/FtdiWidget.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/ftdidmx/FtdiWidget.cpp b/plugins/ftdidmx/FtdiWidget.cpp index 7c97752492..4d32e4ff15 100644 --- a/plugins/ftdidmx/FtdiWidget.cpp +++ b/plugins/ftdidmx/FtdiWidget.cpp @@ -136,7 +136,11 @@ void FtdiWidget::Widgets(vector *widgets) { ftdi_device_list* current_device = list; while (current_device != NULL) { +#if HAVE_LIBFTDI1 + struct libusb_device *dev = current_device->dev; +#else struct usb_device *dev = current_device->dev; +#endif current_device = current_device->next; i++; From 6f44616806416b4c72d15fa98ca7caa1881cefde Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Fri, 25 May 2018 01:58:38 +0300 Subject: [PATCH 10/24] FTDI make instructions should come from the ftdi plugin makefile. --- olad/Makefile.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/olad/Makefile.mk b/olad/Makefile.mk index a1b8140eec..527bfc26c2 100644 --- a/olad/Makefile.mk +++ b/olad/Makefile.mk @@ -72,10 +72,6 @@ olad_olad_LDADD = olad/libolaserver.la \ common/libolacommon.la \ ola/libola.la -if USE_FTDI -olad_olad_LDADD += -lftdi -lusb -endif - # TESTS ################################################## test_programs += \ From 224cad8936ad11821119059594808dbd80192e82 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Fri, 25 May 2018 02:51:12 +0300 Subject: [PATCH 11/24] Minor style cleanups. --- plugins/ftdidmx/FtdiWidget.cpp | 2 +- plugins/ftdidmx/Makefile.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/ftdidmx/FtdiWidget.cpp b/plugins/ftdidmx/FtdiWidget.cpp index 4d32e4ff15..f4c27fd8fe 100644 --- a/plugins/ftdidmx/FtdiWidget.cpp +++ b/plugins/ftdidmx/FtdiWidget.cpp @@ -140,7 +140,7 @@ void FtdiWidget::Widgets(vector *widgets) { struct libusb_device *dev = current_device->dev; #else struct usb_device *dev = current_device->dev; -#endif +#endif //HAVE_LIBFTDI1 current_device = current_device->next; i++; diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index 6d3e0f43ad..76d6ba3acc 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -21,5 +21,6 @@ plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ else plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ $(libftdi0_LIBS) -endif -endif +endif // HAVE_LIBFTDI1 + +endif // USE_FTDI From ddf7dfaf135997a8729b26845748a9ff75638cb8 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 27 May 2018 01:29:22 +0300 Subject: [PATCH 12/24] Attempt to fix travis for buidling libftdi0 versions, I'm assuming that they actually need to refer to libftdi without 0 like in the past and. --- plugins/ftdidmx/Makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index 76d6ba3acc..f29dbf4577 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -20,7 +20,7 @@ plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ $(libftdi1_LIBS) else plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ - $(libftdi0_LIBS) + $(libftdi_LIBS) endif // HAVE_LIBFTDI1 endif // USE_FTDI From 2f2a8367cf06bbebae5efe18075a7dd2b921ccb6 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 28 May 2018 01:10:55 +0100 Subject: [PATCH 13/24] Don't install libusb on Mac anymore, as it's unnecessary --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f036ad7441..f81ece0603 100644 --- a/.travis.yml +++ b/.travis.yml @@ -267,7 +267,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi #Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex protobuf@3.1 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex protobuf@3.1 liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy and libusb already present - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" != "1" ]; then brew install libftdi0; fi # install libftdi0 - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" == "1" ]; then brew install libftdi; fi # install the latest libftdi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release From 0fae3d9e8ad6a47b78f9ece029cc19feffac79b1 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 28 May 2018 02:03:00 +0100 Subject: [PATCH 14/24] Don't install libusb on Mac anymore, as it's unnecessary --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f036ad7441..93b705f909 100644 --- a/.travis.yml +++ b/.travis.yml @@ -267,7 +267,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall -s libtool; fi #Fix a broken homebrew python upgrade - see https://github.com/Homebrew/homebrew-core/issues/26358 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python || true; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex protobuf@3.1 libusb liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy already present + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ccache bison flex protobuf@3.1 liblo libmicrohttpd; fi # ossp-uuid, homebrew/python/numpy and libusb are already present - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" != "1" ]; then brew install libftdi0; fi # install libftdi0 - if [ "$TRAVIS_OS_NAME" == "osx" -a "$LIBFTDI" == "1" ]; then brew install libftdi; fi # install the latest libftdi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link -f protobuf@3.1; export PKG_CONFIG_PATH=/usr/local/opt/protobuf@3.1/lib/pkgconfig; brew install --build-from-source --ignore-dependencies --env=std protobuf-c; fi # While protobuf is not on the latest release From c8d17420b0044a07162db2b438e4ba2ac89c86b6 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 28 May 2018 04:40:00 +0100 Subject: [PATCH 15/24] Remove some incorrectly formatted Makefile comments --- plugins/ftdidmx/Makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index f29dbf4577..ad7995498b 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -21,6 +21,6 @@ plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ else plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ $(libftdi_LIBS) -endif // HAVE_LIBFTDI1 +endif -endif // USE_FTDI +endif From cf072085da97be400828e6ebcb045dd32b702510 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Jun 2018 01:13:05 +0300 Subject: [PATCH 16/24] Changed formatting --- plugins/ftdidmx/Makefile.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index f29dbf4577..0064a444c8 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -21,6 +21,6 @@ plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ else plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ $(libftdi_LIBS) -endif // HAVE_LIBFTDI1 +endif #HAVE_LIBFTDI1 -endif // USE_FTDI +endif #USE_FTDI From c01f3e15c603fde7380cbb80f125e9dba56a87cd Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Jun 2018 01:23:37 +0300 Subject: [PATCH 17/24] Lint error fix --- plugins/ftdidmx/FtdiWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ftdidmx/FtdiWidget.cpp b/plugins/ftdidmx/FtdiWidget.cpp index f4c27fd8fe..715cfa74a2 100644 --- a/plugins/ftdidmx/FtdiWidget.cpp +++ b/plugins/ftdidmx/FtdiWidget.cpp @@ -140,7 +140,7 @@ void FtdiWidget::Widgets(vector *widgets) { struct libusb_device *dev = current_device->dev; #else struct usb_device *dev = current_device->dev; -#endif //HAVE_LIBFTDI1 +#endif // HAVE_LIBFTDI1 current_device = current_device->next; i++; From db1c3f58a642a5ed32131221b85bfa1d0bc9e65a Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Jun 2018 03:13:37 +0300 Subject: [PATCH 18/24] Fix libftdi0 --- plugins/ftdidmx/Makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index ad7995498b..de84956941 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -20,7 +20,7 @@ plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ $(libftdi1_LIBS) else plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ - $(libftdi_LIBS) + $(libftdi0_LIBS) endif endif From 9767477b9b959f7029ba21766a889f0ed6dd1a1d Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Jun 2018 10:27:43 +0300 Subject: [PATCH 19/24] Minor changes requested by Peter. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 808a99111f..3079dfd0c1 100644 --- a/configure.ac +++ b/configure.ac @@ -617,7 +617,7 @@ AC_ARG_ENABLE( AC_ARG_ENABLE( [libftdi], [AS_HELP_STRING([--disable-libftdi], - [Avoid using libftdi or libftdi1 even if either exists])]) + [Avoid using libftdi0 or libftdi1 even if either exists])]) have_libftdi0="no" AS_IF([test "x$enable_libftdi" != xno], @@ -638,7 +638,7 @@ if test "x$have_libftdi0" = xyes || test "x$have_libftdi1" = xyes; then have_libftdi="yes" fi AS_IF([test "x$have_libftdi" = xyes], - [AC_DEFINE([HAVE_LIBFTDI], [1], [define if libftdi or libftdi1 is installed])]) + [AC_DEFINE([HAVE_LIBFTDI], [1], [define if libftdi0 or libftdi1 is installed])]) # libusb AC_ARG_ENABLE( From 1fa4807e13b6a7b6366d7b267bbc446c044cb6ce Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Jun 2018 10:29:54 +0300 Subject: [PATCH 20/24] Changed travis references to xcode9.3beta to xcode9.3 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01a3e6e52d..20037cc5d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,14 +68,14 @@ matrix: - CPPUNIT='1.14' - LIBFTDI='0' - os: osx - osx_image: xcode9.3beta + osx_image: xcode9.3 compiler: clang env: - TASK='compile' - CPPUNIT='1.14' - LIBFTDI='1' - os: osx - osx_image: xcode9.3beta + osx_image: xcode9.3 compiler: gcc env: - TASK='compile' From 7fd77ad331cb16a2897e7f325f1091350bf25c46 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 3 Jun 2018 12:05:33 +0300 Subject: [PATCH 21/24] Style change requested by Peter --- plugins/ftdidmx/Makefile.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/ftdidmx/Makefile.mk b/plugins/ftdidmx/Makefile.mk index de84956941..6781d115d6 100644 --- a/plugins/ftdidmx/Makefile.mk +++ b/plugins/ftdidmx/Makefile.mk @@ -16,11 +16,9 @@ plugins_ftdidmx_libolaftdidmx_la_LIBADD = \ common/libolacommon.la \ olad/plugin_api/libolaserverplugininterface.la if HAVE_LIBFTDI1 -plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ - $(libftdi1_LIBS) +plugins_ftdidmx_libolaftdidmx_la_LIBADD += $(libftdi1_LIBS) else -plugins_ftdidmx_libolaftdidmx_la_LIBADD += \ - $(libftdi0_LIBS) +plugins_ftdidmx_libolaftdidmx_la_LIBADD += $(libftdi0_LIBS) endif endif From 9a280438091d8b619f42a5e7e51c13a135420584 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 9 Jun 2018 13:56:20 +0100 Subject: [PATCH 22/24] Fix the order of some includes --- plugins/ftdidmx/FtdiWidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/ftdidmx/FtdiWidget.cpp b/plugins/ftdidmx/FtdiWidget.cpp index 715cfa74a2..384ed20381 100644 --- a/plugins/ftdidmx/FtdiWidget.cpp +++ b/plugins/ftdidmx/FtdiWidget.cpp @@ -42,8 +42,8 @@ #include #endif // HAVE_LIBFTDI1 -#include #include +#include #include #include From f5de7fbda355e4b74202e578168066b1ea6fe9c1 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 10 Jun 2018 06:47:20 +0100 Subject: [PATCH 23/24] Fix a typo --- include/ola/rdm/DimmerSubDevice.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ola/rdm/DimmerSubDevice.h b/include/ola/rdm/DimmerSubDevice.h index 426e7a599b..4ad31549b6 100644 --- a/include/ola/rdm/DimmerSubDevice.h +++ b/include/ola/rdm/DimmerSubDevice.h @@ -21,7 +21,7 @@ * @addtogroup rdm_resp * @{ * @file DimmerSubDevice.h - * @brief A soft responder that impements a SubDevice in DimmerResponder + * @brief A soft responder that implements a SubDevice in DimmerResponder * @} */ From 4501d328cf21e8304ec1e479cc684e2713c20b55 Mon Sep 17 00:00:00 2001 From: "E.S. Rosenberg a.k.a. Keeper of the Keys" Date: Sun, 10 Jun 2018 12:11:05 +0300 Subject: [PATCH 24/24] Added myself. --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index e7d9705521..f63ea667dc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -24,3 +24,4 @@ Contributors: Sean Sill, various fixes. Stefan Krüger, added APA102 support to the SPI Plugin Tobi Schäfer, for the MacPort files + E.S. Rosenberg, further work on ftdidmx plugin.