frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Updated x86 config file with more color transforms

Browse Source 
Former-commit-id: 062ab180f30f3b1c3c236e6c3d0286da82e991ab
This commit is contained in:
T. van der Zwan 2013-11-22 10:46:40 +00:00
parent e43778b08b
commit 42b322a011
2 changed files with 87 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -37,6 +37,7 @@ include_directories(${CMAKE_SOURCE_DIR}/include)
# Prefer static linking over dynamic # Prefer static linking over dynamic
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so")
#set(CMAKE_BUILD_TYPE "Debug")
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")
# enable C++11 # enable C++11
@ -60,6 +61,7 @@ link_directories(${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
configure_file(bin/install_hyperion.sh ${LIBRARY_OUTPUT_PATH} @ONLY) configure_file(bin/install_hyperion.sh ${LIBRARY_OUTPUT_PATH} @ONLY)
configure_file(config/hyperion.config.json ${LIBRARY_OUTPUT_PATH} @ONLY) configure_file(config/hyperion.config.json ${LIBRARY_OUTPUT_PATH} @ONLY)
configure_file(config/hyperion_x86.config.json ${LIBRARY_OUTPUT_PATH} @ONLY)
# Add the source/lib directories # Add the source/lib directories
add_subdirectory(dependencies) add_subdirectory(dependencies)

108
config/hyperion_x86.config.json
View File

@ -34,32 +34,70 @@
/// - 'updateFrequency' The update frequency of the leds in Hz /// - 'updateFrequency' The update frequency of the leds in Hz
"color" : "color" :
{ {
"hsv" : "transform" :
{ [
"saturationGain" : 1.0000, {
"valueGain" : 1.5000 "id" : "device_1",
}, "leds" : "0,1,2,3-10, 12-32, 33, 34, 35-49",
"red" : "hsv" :
{ {
"threshold" : 0.1000, "saturationGain" : 1.0000,
"gamma" : 2.0000, "valueGain" : 1.5000
"blacklevel" : 0.0000, },
"whitelevel" : 0.8000 "red" :
}, {
"green" : "threshold" : 0.1000,
{ "gamma" : 2.0000,
"threshold" : 0.1000, "blacklevel" : 0.0000,
"gamma" : 2.0000, "whitelevel" : 0.8000
"blacklevel" : 0.0000, },
"whitelevel" : 1.0000 "green" :
}, {
"blue" : "threshold" : 0.1000,
{ "gamma" : 2.0000,
"threshold" : 0.1000, "blacklevel" : 0.0000,
"gamma" : 2.0000, "whitelevel" : 1.0000
"blacklevel" : 0.0000, },
"whitelevel" : 1.0000 "blue" :
}, {
"threshold" : 0.1000,
"gamma" : 2.0000,
"blacklevel" : 0.0000,
"whitelevel" : 1.0000
}
},
{
"id" : "device_2",
"leds" : "11",
"hsv" :
{
"saturationGain" : 1.0000,
"valueGain" : 1.5000
},
"red" :
{
"threshold" : 0.1000,
"gamma" : 2.0000,
"blacklevel" : 0.0000,
"whitelevel" : 0.8000
},
"green" :
{
"threshold" : 0.1000,
"gamma" : 2.0000,
"blacklevel" : 0.0000,
"whitelevel" : 1.0000
},
"blue" :
{
"threshold" : 0.1000,
"gamma" : 2.0000,
"blacklevel" : 0.0000,
"whitelevel" : 1.0000
}
}
],
"smoothing" : "smoothing" :
{ {
"type" : "none", "type" : "none",
@ -365,15 +403,15 @@
/// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show /// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
/// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback /// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback
/// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu /// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu
"xbmcVideoChecker" : // "xbmcVideoChecker" :
{ // {
"xbmcAddress" : "127.0.0.1", // "xbmcAddress" : "127.0.0.1",
"xbmcTcpPort" : 9090, // "xbmcTcpPort" : 9090,
"grabVideo" : true, // "grabVideo" : true,
"grabPictures" : true, // "grabPictures" : true,
"grabAudio" : true, // "grabAudio" : true,
"grabMenu" : false // "grabMenu" : false
}, // },
/// The configuration of the Json server which enables the json remote interface /// The configuration of the Json server which enables the json remote interface
/// * port : Port at which the json server is started /// * port : Port at which the json server is started