Remove support of blinkstick

calaos · Feb 7, 2024 · aa35144 · aa35144
1 parent ade219f
commit aa35144
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 222 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ RUN apt-get update -qq && \
     apt-get install -y \
         build-essential wget git curl \
         libsigc++-2.0-dev libjansson-dev libcurl4-openssl-dev libluajit2-5.1-dev libsqlite3-dev \
-        libcurl4-openssl-dev libusb-dev libow-dev imagemagick libev-dev libusb-1.0-0-dev \
+        libcurl4-openssl-dev libow-dev imagemagick libev-dev \
         knxd knxd-dev googletest libuv1-dev libmosquitto-dev libmosquittopp-dev \
         libola-dev ola \
         unzip zip cmake automake autoconf libtool autopoint gettext  \

diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ Requires:
  - luajit
  - sigc++ > 2.4.1
  - owfs (optional) [http://owfs.org/](http://owfs.org/)
- - libusb (optional)
  - imagemagick (optional)
  - OLA (optional) [https://github.com/OpenLightingProject/ola](https://github.com/OpenLightingProject/ola)
  - knxd (optional) [https://github.com/knxd/knxd](https://github.com/knxd/knxd)

diff --git a/configure.ac b/configure.ac
@@ -88,14 +88,6 @@ then
     AC_CHECK_LIB([owcapi], [OW_init],, AC_MSG_ERROR(Missing owfs library))
 fi
 
-have_libusb="no"
-PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], [have_libusb="yes"], [have_libusb="no"])
-AM_CONDITIONAL([HAVE_LIBUSB], [test "x${have_libusb}" = "xyes"])
-if test "x${have_libusb}" == "xyes"
-then
-     AC_DEFINE([HAVE_LIBUSB], [1], [libusb])
-fi
-
 have_libola="no"
 PKG_CHECK_MODULES([LIBOLA], [libola], [have_libola="yes"], [have_libola="no"])
 AM_CONDITIONAL([HAVE_LIBOLA], [test "x${have_libola}" = "xyes"])
@@ -220,7 +212,6 @@ echo "  UrlDownloader picture resizing.......: $(colorOut $CONVERT_INFO)"
 echo
 echo "Hardware support:"
 echo "  One Wire support.....................: $(colorOut $have_owcapi)"
-echo "  Libusb support.......................: $(colorOut $have_libusb)"
 echo "  Open Lightning Architecture support..: $(colorOut $have_libola)"
 echo "  Eib/KNX support (eibd or knxd).......: $(colorOut $have_libknx)"
 echo "  MQTT support (libmosquittopp)........: $(colorOut $have_mosquitto)"

diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -38,8 +38,6 @@
 ./src/bin/calaos_server/HttpServer.h
 ./src/bin/calaos_server/IO/AnalogIO.cpp
 ./src/bin/calaos_server/IO/AnalogIO.h
-./src/bin/calaos_server/IO/Blinkstick/BlinkstickOutputLightRGB.cpp
-./src/bin/calaos_server/IO/Blinkstick/BlinkstickOutputLightRGB.h
 ./src/bin/calaos_server/IO/ExternProc.cpp
 ./src/bin/calaos_server/IO/ExternProc.h
 ./src/bin/calaos_server/IO/Gpio/GpioCtrl.cpp

diff --git a/src/bin/calaos_server/IO/Blinkstick/BlinkstickOutputLightRGB.cpp b/src/bin/calaos_server/IO/Blinkstick/BlinkstickOutputLightRGB.cpp
diff --git a/src/bin/calaos_server/IO/Blinkstick/BlinkstickOutputLightRGB.h b/src/bin/calaos_server/IO/Blinkstick/BlinkstickOutputLightRGB.h
diff --git a/src/bin/calaos_server/Makefile.am b/src/bin/calaos_server/Makefile.am
@@ -45,7 +45,6 @@ AM_CPPFLAGS =                                                 \
         -I$(top_srcdir)/src/lib/sole                          \
         @CALAOS_COMMON_CFLAGS@                                \
         @CALAOS_SERVER_CFLAGS@                                \
-        @LIBUSB_CFLAGS@                                       \
         @LIBOLA_CFLAGS@                                       \
         @PTHREAD_CFLAGS@
 
@@ -415,16 +414,9 @@ calaos_server_SOURCES = \
         HistLogger.h                                    \
         main.cpp
 
-if HAVE_LIBUSB
-calaos_server_SOURCES += \
-        IO/Blinkstick/BlinkstickOutputLightRGB.cpp      \
-        IO/Blinkstick/BlinkstickOutputLightRGB.h
-endif
-
 calaos_server_LDADD =                                   \
         @CALAOS_COMMON_LIBS@                            \
         @CALAOS_SERVER_LIBS@                            \
-        @LIBUSB_LIBS@                                   \
         @INTLLIBS@                                      \
         @PTHREAD_CFLAGS@                                \
         $(top_builddir)/src/lib/libcalaos_common.la
@@ -514,4 +506,3 @@ calaos_mqtt_LDADD = \
 -lmosquitto -lmosquittopp \
 $(top_builddir)/src/lib/libcalaos_common.la
 endif
-