From e813bf32785b36d850ba464547f0607619c93060 Mon Sep 17 00:00:00 2001 From: brindosch Date: Fri, 11 Mar 2016 19:25:42 +0100 Subject: [PATCH] fixconflict Former-commit-id: 07882fe323b23178a04ce187eccddb0f71c357ff --- config/hyperion.config.json | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 4d03a70d..5bc313c3 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -1,19 +1,13 @@ // Automatically generated configuration file for 'Hyperion daemon' -// Generated by: HyperCon (The Hyperion deamon configuration file builder) -// Created with HyperCon V1.00.0 (11.03.2016) +// Generated by: HyperCon (The Hyperion deamon configuration file builder { /// Device configuration contains the following fields: /// * '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 - /// 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] /// * '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" : { "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 /// * effect : The effect selected as 'boot sequence' /// * 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" : { "paths" : @@ -147,14 +141,11 @@ /// * width : The width of the grabbed frames [pixels] /// * height : The height of the grabbed frames [pixels] /// * 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" : { "width" : 80, "height" : 45, - "frequency_Hz" : 10.0, - "priority" : 900 + "frequency_Hz" : 10.0 }, /// 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 - /// * port : Port at which the boblight server is started - /// * priority: Priority of the boblight server (Default=900) HINT: lower value result in HIGHER priority! + /// * port : Port at which the boblight server is started // "boblightServer" : // { -// "port" : 19333, -// "priority" : 900 +// "port" : 19333 // }, /// Configuration for the embedded V4L2 grabber