Fix use of old libftdi version

MRPT · Jun 14, 2023 · bf7ab8b · bf7ab8b
1 parent 5235dba
commit bf7ab8b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.lgtm.yml b/.lgtm.yml
@@ -13,7 +13,7 @@ extraction:
       - "libopencv-dev"
       - "libeigen3-dev"
       - "libgtest-dev"
-      - "libftdi-dev"
+      - "libftdi1-dev"
       - "freeglut3-dev"
       - "zlib1g-dev"
       - "libusb-1.0-0-dev"

diff --git a/doc/source/compiling.rst b/doc/source/compiling.rst
@@ -52,7 +52,7 @@ Minimum compiler requisites:
             libxrandr-dev libxxf86vm-dev
 
        # Support most common sensors:
-       sudo apt install libftdi-dev libusb-1.0-0-dev libudev-dev libfreenect-dev \
+       sudo apt install libftdi1-dev libusb-1.0-0-dev libudev-dev libfreenect-dev \
             libdc1394-22-dev libavformat-dev libswscale-dev libpcap-dev \
             liboctomap-dev libopenni2-dev
 

diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md
@@ -1,6 +1,8 @@
 \page changelog Change Log
 
 # Version 2.9.2: UNRELEASED
+- Changes in docs:
+  - Update dependency in instructions from `libftdi-dev` to `libftdi1-dev`
 - Changes in libraries:
   - \ref mrpt_comms_grp
     - mrpt::comms::CInterfaceFTDI Fix usage of deprecated API in libftdi

diff --git a/libs/comms/src/CInterfaceFTDI_LIN.cpp b/libs/comms/src/CInterfaceFTDI_LIN.cpp
@@ -419,8 +419,14 @@ void CInterfaceFTDI::Purge()
 	auto* ctx = static_cast<ftdi_context*>(m_ftdi_context);
 	ASSERT_(ctx->usb_dev);
 
+#if MRPT_FTDI_VERSION >= 0x120
 	if (ftdi_tcioflush(ctx) < 0)
+#else
+	if (ftdi_usb_purge_buffers(ctx) < 0)
+#endif
+	{
 		THROW_EXCEPTION("Error purging device buffers");
+	}
 
 	m_readBuffer.clear();
 #endif