frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id

Browse Source 
Conflicts:
	src/hyperion-aml/CMakeLists.txt
	src/hyperion-remote/CMakeLists.txt
	src/hyperion-v4l2/CMakeLists.txt

Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb
This commit is contained in:
redpanther
2016-03-13 08:04:49 +01:00
parent e848411785 66cb9c3714
commit c7df8c23c6
74 changed files with 1572 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HyperionConfig.h.in
View File

@@ -12,6 +12,9 @@
// Define to enable the ws2812b-pwm-device
#cmakedefine ENABLE_WS2812BPWM
// Define to enable the ws281x-pwm-via-dma-device using jgarff's library
#cmakedefine ENABLE_WS281XPWM
// Define to enable the spi-device
#cmakedefine ENABLE_TINKERFORGE
@@ -27,4 +30,4 @@
// Define to enable the osx grabber
#cmakedefine ENABLE_OSX
#define HYPERION_VERSION_ID "${HYPERION_VERSION_ID}"
#define HYPERION_VERSION_ID "${HYPERION_VERSION_ID}"