From a119b24d6c6aaa2aa928555bf1c42373934d49f6 Mon Sep 17 00:00:00 2001 From: Ainur Timerbaev Date: Thu, 13 Apr 2023 12:34:38 +0100 Subject: [PATCH] Refactor to IS_FTDI_DEVICE_NAME --- libsrc/leddevice/dev_spi/ProviderSpi.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libsrc/leddevice/dev_spi/ProviderSpi.cpp b/libsrc/leddevice/dev_spi/ProviderSpi.cpp index 7044cc0d..1b02b7d4 100644 --- a/libsrc/leddevice/dev_spi/ProviderSpi.cpp +++ b/libsrc/leddevice/dev_spi/ProviderSpi.cpp @@ -22,7 +22,7 @@ #include #define FTDI_CHECK_RESULT(statement) if (statement) {setInError(ftdi_get_error_string(_ftdic)); return retVal;} - +#define IS_FTDI_DEVICE_NAME(deviceName) (deviceName.startsWith("d:") || deviceName.startsWith("i:") || deviceName.startsWith("s:")) #define ANY_FTDI_VENDOR 0x0 #define ANY_FTDI_PRODUCT 0x0 @@ -88,9 +88,7 @@ bool ProviderSpi::init(const QJsonObject &deviceConfig) { _spiDataInvert = deviceConfig["invert"].toBool(_spiDataInvert); Debug(_log, "_spiDataInvert [%d], _spiMode [%d]", _spiDataInvert, _spiMode); #endif - bool isFtdiImplementation = _deviceName.startsWith("d:") - or _deviceName.startsWith("i:") - or _deviceName.startsWith("s:"); + bool isFtdiImplementation = IS_FTDI_DEVICE_NAME(_deviceName); _spiImplementation = isFtdiImplementation ? FTDI : SPIDEV; Debug(_log, "_baudRate_Hz [%d], _latchTime_ms [%d]", _baudRate_Hz, _latchTime_ms);