mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Updated x86 config file with more color transforms
Former-commit-id: 062ab180f30f3b1c3c236e6c3d0286da82e991ab
This commit is contained in:
T. van der Zwan
parent
e43778b08b
commit
42b322a011
@ -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)
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
// Generated by: HyperCon (The Hyperion deamon configuration file builder
|
// Generated by: HyperCon (The Hyperion deamon configuration file builder
|
||||||
|
|
||||||
{
|
{
|
||||||
/// Device configuration contains the following fields:
|
/// Device configuration contains the following fields:
|
||||||
/// * 'name' : The user friendly name of the device (only used for display purposes)
|
/// * 'name' : The user friendly name of the device (only used for display purposes)
|
||||||
/// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp8806',
|
/// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'ldp8806',
|
||||||
/// 'lpd6803', 'sedu', 'adalight', 'lightpack', 'test' and 'none')
|
/// 'lpd6803', 'sedu', 'adalight', 'lightpack', 'test' and 'none')
|
||||||
@ -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",
|
||||||
@ -68,16 +106,16 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/// The configuration for each individual led. This contains the specification of the area
|
/// The configuration for each individual led. This contains the specification of the area
|
||||||
/// averaged of an input image for each led to determine its color. Each item in the list
|
/// averaged of an input image for each led to determine its color. Each item in the list
|
||||||
/// contains the following fields:
|
/// contains the following fields:
|
||||||
/// * index: The index of the led. This determines its location in the string of leds; zero
|
/// * index: The index of the led. This determines its location in the string of leds; zero
|
||||||
/// being the first led.
|
/// being the first led.
|
||||||
/// * hscan: The fractional part of the image along the horizontal used for the averaging
|
/// * hscan: The fractional part of the image along the horizontal used for the averaging
|
||||||
/// (minimum and maximum inclusive)
|
/// (minimum and maximum inclusive)
|
||||||
/// * vscan: The fractional part of the image along the vertical used for the averaging
|
/// * vscan: The fractional part of the image along the vertical used for the averaging
|
||||||
/// (minimum and maximum inclusive)
|
/// (minimum and maximum inclusive)
|
||||||
"leds" :
|
"leds" :
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"index" : 0,
|
"index" : 0,
|
||||||
@ -331,15 +369,15 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
||||||
/// The black border configuration, contains the following items:
|
/// The black border configuration, contains the following items:
|
||||||
/// * enable : true if the detector should be activated
|
/// * enable : true if the detector should be activated
|
||||||
"blackborderdetector" :
|
"blackborderdetector" :
|
||||||
{
|
{
|
||||||
"enable" : true
|
"enable" : true
|
||||||
},
|
},
|
||||||
|
|
||||||
/// The boot-sequence configuration, contains the following items:
|
/// The boot-sequence configuration, contains the following items:
|
||||||
/// * type : The type of the boot-sequence ('rainbow', 'knight_rider', 'none')
|
/// * type : The type of the boot-sequence ('rainbow', 'knight_rider', 'none')
|
||||||
/// * duration_ms : The length of the boot-sequence [ms]
|
/// * duration_ms : The length of the boot-sequence [ms]
|
||||||
"bootsequence" :
|
"bootsequence" :
|
||||||
{
|
{
|
||||||
@ -347,7 +385,7 @@
|
|||||||
"duration_ms" : 3000
|
"duration_ms" : 3000
|
||||||
},
|
},
|
||||||
|
|
||||||
/// The configuration for the frame-grabber, contains the following items:
|
/// The configuration for the frame-grabber, contains the following items:
|
||||||
/// * width : The width of the grabbed frames [pixels]
|
/// * width : The width of the grabbed frames [pixels]
|
||||||
/// * height : The height of the grabbed frames [pixels]
|
/// * height : The height of the grabbed frames [pixels]
|
||||||
/// * frequency_Hz : The frequency of the frame grab [Hz]
|
/// * frequency_Hz : The frequency of the frame grab [Hz]
|
||||||
@ -358,22 +396,22 @@
|
|||||||
"frequency_Hz" : 10.0
|
"frequency_Hz" : 10.0
|
||||||
},
|
},
|
||||||
|
|
||||||
/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
|
/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
|
||||||
/// * xbmcAddress : The IP address of the XBMC-host
|
/// * xbmcAddress : The IP address of the XBMC-host
|
||||||
/// * xbmcTcpPort : The TCP-port of the XBMC-server
|
/// * xbmcTcpPort : The TCP-port of the XBMC-server
|
||||||
/// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback
|
/// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback
|
||||||
/// * 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
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user