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

fixconflict

Browse Source 
Former-commit-id: 07882fe323b23178a04ce187eccddb0f71c357ff
This commit is contained in:
brindosch 2016-03-11 19:25:42 +01:00
parent e82643ff50
commit e813bf3278
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
config/hyperion.config.json
View File

@ -1,19 +1,13 @@
// Automatically generated configuration file for 'Hyperion daemon' // Automatically generated configuration file for 'Hyperion daemon'
// Generated by: HyperCon (The Hyperion deamon configuration file builder) // Generated by: HyperCon (The Hyperion deamon configuration file builder
// Created with HyperCon V1.00.0 (11.03.2016)
{ {
/// 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 /// * 'type' : The type of the device or leds (known types for now are
/// APA102, Adalight, AdalightAPA102, AmbiLed, Atmo, Hyperion-USBASP-WS2801, Hyperion-USBASP-WS2812, Lightberry, Lightpack, LPD6803, LPD8806, Multi-Lightpack, P9813, Paintpack, PhilipsHUE, PiBlaster, SEDU, Test, ThinkerForge, TPM2, WS2801, WS2812b, None) /// APA102, Adalight, AmbiLed, Atmo, Hyperion-USBASP-WS2801, Hyperion-USBASP-WS2812, Lightberry, Lightpack, LPD6803, LPD8806, Multi-Lightpack, P9813, Paintpack, PhilipsHUE, PiBlaster, SEDU, Test, ThinkerForge, TPM2, WS2801, WS2812b, None)
/// * [device type specific configuration] /// * [device type specific configuration]
/// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.). /// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.).
///
/// * 'Specific of Philips Hue:
/// * 'username' : The name of user registred on the Philips Hue Bridge
/// * 'switchOffOnBlack': Define if Hue light switch off when black is detected
/// * 'transitiontime' : Set the time of transition between color of Hue light
"device" : "device" :
{ {
"name" : "MyPi", "name" : "MyPi",
@ -114,7 +108,7 @@
/// * color : Set static color after boot -> set effect to "" (empty) and input the values [R,G,B] and set duration_ms NOT to 0 (use 1) instead /// * color : Set static color after boot -> set effect to "" (empty) and input the values [R,G,B] and set duration_ms NOT to 0 (use 1) instead
/// * effect : The effect selected as 'boot sequence' /// * effect : The effect selected as 'boot sequence'
/// * duration_ms : The duration of the selected effect (0=endless) /// * duration_ms : The duration of the selected effect (0=endless)
/// * priority : The priority of the selected effect/static color (default=990) HINT: lower value result in HIGHER priority! /// * priority : The priority of the selected effect/static color (default=0)
"effects" : "effects" :
{ {
"paths" : "paths" :
@ -147,14 +141,11 @@
/// * 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]
/// * priority : The priority of the frame-gabber (Default=900) HINT: lower value result in HIGHER priority!
/// * ATTENTION : Power-of-Two resolution is not supported and leads to unexpected behaviour!
"framegrabber" : "framegrabber" :
{ {
"width" : 80, "width" : 80,
"height" : 45, "height" : 45,
"frequency_Hz" : 10.0, "frequency_Hz" : 10.0
"priority" : 900
}, },
/// The configuration of the Kodi connection used to enable and disable the frame-grabber. Contains the following fields: /// The configuration of the Kodi connection used to enable and disable the frame-grabber. Contains the following fields:
@ -193,12 +184,10 @@
}, },
/// The configuration of the boblight server which enables the boblight remote interface /// The configuration of the boblight server which enables the boblight remote interface
/// * port : Port at which the boblight server is started /// * port : Port at which the boblight server is started
/// * priority: Priority of the boblight server (Default=900) HINT: lower value result in HIGHER priority!
// "boblightServer" : // "boblightServer" :
// { // {
// "port" : 19333, // "port" : 19333
// "priority" : 900
// }, // },
/// Configuration for the embedded V4L2 grabber /// Configuration for the embedded V4L2 grabber