Merge remote-tracking branch 'remotes/origin/add_effect_engine' into add_effect_engine

Former-commit-id: b7d9accb5ef9449af7ebcb67a8423d8f58480e17
This commit is contained in:
T. van der Zwan 2013-12-06 23:21:50 +01:00
commit 3ebcc1f69a

View File

@ -37,8 +37,38 @@
"transform" :
[
{
"id" : "MyPi device",
"leds" : "0-49",
"id" : "MyPi red",
"leds" : "0-11,37-49",
"hsv" :
{
"saturationGain" : 1.0000,
"valueGain" : 1.5000
},
"red" :
{
"threshold" : 0.1000,
"gamma" : 2.0000,
"blacklevel" : 0.3000,
"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
}
},
{
"id" : "MyPi blue",
"leds" : "12-36",
"hsv" :
{
"saturationGain" : 1.0000,
@ -63,7 +93,7 @@
"threshold" : 0.1000,
"gamma" : 2.0000,
"blacklevel" : 0.0000,
"whitelevel" : 1.0000
"whitelevel" : 0.3000
}
}
],
@ -345,6 +375,40 @@
"enable" : true
},
"effects" :
{
"Rainbow swirl" :
{
"script" : "/home/pi/hyperion/effects/rainbow-swirl.py",
"args" :
{
"rotation-time" : 10.0,
"brightness" : 1.0,
"reverse" : false
}
},
"Rainbow mood" :
{
"script" : "/home/pi/hyperion/effects/rainbow-mood.py",
"args" :
{
"rotation-time" : 10.0,
"brightness" : 1.0,
"reverse" : false
}
},
"Knight rider" :
{
"script" : "/home/pi/hyperion/effects/knight-rider.py",
"args" :
{
"speed" : 1.0,
"fadeFactor" : 0.7
}
}
},
/// The boot-sequence configuration, contains the following items:
/// * type : The type of the boot-sequence ('rainbow', 'knightrider', 'none')
/// The boot-sequence configuration, contains the following items:
@ -352,7 +416,13 @@
/// * duration_ms : The length of the boot-sequence [ms]
"bootsequence" :
{
"type" : "Rainbow",
"script" : "/home/pi/hyperion/effects/rainbow-swirl.py",
"args" :
{
"rotation-time" : 3.0,
"brightness" : 1.0,
"reverse" : false
},
"duration_ms" : 3000
},