Minor reformat of code to match hyperion-style. Added ws2812b as option to disable for devices without dma-pwm

Author: tvdzwan

CMakeLists.txt

@@ -13,6 +13,9 @@ message(STATUS "ENABLE_DISPMANX = " ${ENABLE_DISPMANX})
 option(ENABLE_SPIDEV   "Enable the SPIDEV device" ON)
 message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
 
+option(ENABLE_WS2812BPWM   "Enable the WS2812b-PWM device" ON)
+message(STATUS "ENABLE_WS2812BPWM = " ${ENABLE_WS2812BPWM})
+
 option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
 message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 
@@ -22,9 +25,9 @@ message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
 option(ENABLE_PROTOBUF "Enable PROTOBUF server" ON)
 message(STATUS "ENABLE_PROTOBUF = " ${ENABLE_PROTOBUF})
 
-if (ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
+if(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
 	message(FATAL_ERROR "V4L2 grabber requires PROTOBUF. Disable V4L2 or enable PROTOBUF")
-endif (ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
+endif(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
 
 # Createt the configuration file
 # configure a header file to pass some of the CMake settings

HyperionConfig.h.in

@@ -9,6 +9,9 @@
 // Define to enable the spi-device
 #cmakedefine ENABLE_SPIDEV
 
+// Define to enable the ws2812b-pwm-device
+#cmakedefine ENABLE_WS2812BPWM
+
 // Define to enable the spi-device
 #cmakedefine ENABLE_TINKERFORGE
 

libsrc/leddevice/CMakeLists.txt

@@ -68,6 +68,7 @@ if(ENABLE_SPIDEV)
 	)
 endif(ENABLE_SPIDEV)
 
+if(ENABLE_WS2812BPWM)
 SET(Leddevice_HEADERS
 		${Leddevice_HEADERS}
 		${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.h
@@ -76,6 +77,7 @@ SET(Leddevice_SOURCES
 		${Leddevice_SOURCES}
 		${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.cpp
 )
+endif(ENABLE_WS2812BPWM)
 
 if(ENABLE_TINKERFORGE)
 	SET(Leddevice_HEADERS

libsrc/leddevice/LedDeviceFactory.cpp

@@ -31,7 +31,9 @@
 #include "LedDevicePhilipsHue.h"
 #include "LedDeviceTpm2.h"
 
-#include "LedDeviceWS2812b.h"
+#ifdef ENABLE_WS2812BPWM
+	#include "LedDeviceWS2812b.h"
+#endif
 
 LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
 {
@@ -180,14 +182,17 @@ LedDevice * LedDeviceFactory::construct(const Json::Value & deviceConfig)
 		const std::string output = deviceConfig["output"].asString();
 		const unsigned rate = deviceConfig["rate"].asInt();
 
-		LedDeviceTpm2* deviceTpm2 = new LedDeviceTpm2(output, rate);
+		LedDeviceTpm2 * deviceTpm2 = new LedDeviceTpm2(output, rate);
 		deviceTpm2->open();
 		device = deviceTpm2;
-	}else if (type == "ws2812b")
+	}
+#ifdef ENABLE_WS2812BPWM
+	else if (type == "ws2812b")
 	{
 		LedDeviceWS2812b * ledDeviceWS2812b = new LedDeviceWS2812b();
 		device = ledDeviceWS2812b;
 	}
+#endif
 	else
 	{
 		std::cout << "Unable to create device " << type << std::endl;