Skip to content

Commit

Permalink
DRY FTDI device
Browse files Browse the repository at this point in the history
  • Loading branch information
nurikk-sa committed Apr 13, 2023
1 parent 95698cb commit 0cce218
Show file tree
Hide file tree
Showing 19 changed files with 337 additions and 882 deletions.
5 changes: 4 additions & 1 deletion HyperionConfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,12 @@
// Define to enable the Serial devices
#cmakedefine ENABLE_DEV_SERIAL

// Define to enable the SPI devices
// Define to enable the SPI spidev devices
#cmakedefine ENABLE_DEV_SPI

// Define to enable the SPI ftdi devices
#cmakedefine ENABLE_DEV_FTDI

// Define to enable the Tinkerforge devices
#cmakedefine ENABLE_DEV_TINKERFORGE

Expand Down
1 change: 1 addition & 0 deletions assets/webconfig/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,7 @@
"edt_dev_spec_segmentsOverlapValidation_error": "Correct the WLED setup! The segment must not overlap with {{plural:$1| segment|segments}}: \"$2\".",
"edt_dev_spec_serial_title": "Serial number",
"edt_dev_spec_spipath_title": "SPI Device",
"edt_dev_spec_implementation_title": "SPI Implementation",
"edt_dev_spec_sslHSTimeoutMax_title": "Streamer handshake timeout maximum",
"edt_dev_spec_sslHSTimeoutMin_title": "Streamer handshake timeout minimum",
"edt_dev_spec_stayOnAfterStreaming_title": "Stay on after streaming",
Expand Down
8 changes: 1 addition & 7 deletions libsrc/leddevice/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ include_directories(
dev_spi
dev_rpi_pwm
dev_tinker
dev_ftdi
)

FILE ( GLOB Leddevice_SOURCES
Expand All @@ -43,7 +42,7 @@ if ( ENABLE_DEV_SERIAL )
FILE ( GLOB Leddevice_SERIAL_SOURCES "${CURRENT_SOURCE_DIR}/dev_serial/*.h" "${CURRENT_SOURCE_DIR}/dev_serial/*.cpp")
endif()

if ( ENABLE_DEV_SPI )
if ( ENABLE_DEV_SPI OR ENABLE_DEV_FTDI )
FILE ( GLOB Leddevice_SPI_SOURCES "${CURRENT_SOURCE_DIR}/dev_spi/*.h" "${CURRENT_SOURCE_DIR}/dev_spi/*.cpp")
endif()

Expand All @@ -65,10 +64,6 @@ if ( ENABLE_DEV_WS281XPWM )
FILE ( GLOB Leddevice_PWM_SOURCES "${CURRENT_SOURCE_DIR}/dev_rpi_pwm/*.h" "${CURRENT_SOURCE_DIR}/dev_rpi_pwm/*.cpp")
endif()

if (ENABLE_DEV_FTDI)
FILE ( GLOB Leddevice_FTDI_SOURCES "${CURRENT_SOURCE_DIR}/dev_ftdi/*.h" "${CURRENT_SOURCE_DIR}/dev_ftdi/*.cpp")
endif()

set(LedDevice_RESOURCES ${CURRENT_SOURCE_DIR}/LedDeviceSchemas.qrc )

SET( Leddevice_SOURCES
Expand All @@ -80,7 +75,6 @@ SET( Leddevice_SOURCES
${Leddevice_SPI_SOURCES}
${Leddevice_TINKER_SOURCES}
${Leddevice_USB_HID_SOURCES}
${Leddevice_FTDI_SOURCES}
)

# auto generate header file that include all available leddevice headers
Expand Down
3 changes: 0 additions & 3 deletions libsrc/leddevice/LedDeviceSchemas.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,5 @@
<file alias="schema-yeelight">schemas/schema-yeelight.json</file>
<file alias="schema-razer">schemas/schema-razer.json</file>
<file alias="schema-cololight">schemas/schema-cololight.json</file>
<file alias="schema-ws2812_ftdi">schemas/schema-ws2812_ftdi.json</file>
<file alias="schema-apa102_ftdi">schemas/schema-apa102_ftdi.json</file>
<file alias="schema-sk6812_ftdi">schemas/schema-sk6812_ftdi.json</file>
</qresource>
</RCC>
52 changes: 0 additions & 52 deletions libsrc/leddevice/dev_ftdi/LedDeviceAPA102_ftdi.cpp

This file was deleted.

50 changes: 0 additions & 50 deletions libsrc/leddevice/dev_ftdi/LedDeviceAPA102_ftdi.h

This file was deleted.

86 changes: 0 additions & 86 deletions libsrc/leddevice/dev_ftdi/LedDeviceSk6812_ftdi.cpp

This file was deleted.

52 changes: 0 additions & 52 deletions libsrc/leddevice/dev_ftdi/LedDeviceSk6812_ftdi.h

This file was deleted.

Loading

0 comments on commit 0cce218

Please sign in to comment.