mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
Added factory to boot-sequence
Added json-config for boot-sequence.
This commit is contained in:
T. van der Zwan
parent
213545afe7
commit
0788253cac
@ -2,302 +2,317 @@
|
|||||||
// Generation script: ./WriteConfig
|
// Generation script: ./WriteConfig
|
||||||
|
|
||||||
{
|
{
|
||||||
"device" :
|
"device" :
|
||||||
{
|
{
|
||||||
"name" : "MyPi",
|
"name" : "MyPi",
|
||||||
"type" : "ws2801",
|
"type" : "ws2801",
|
||||||
"output" : "/dev/spidev0.0",
|
"output" : "/dev/spidev0.0",
|
||||||
"interval" : 20000,
|
"interval" : 20000,
|
||||||
"rate" : 48000
|
"rate" : 48000
|
||||||
},
|
},
|
||||||
"color" :
|
"color" :
|
||||||
{
|
{
|
||||||
"hsv" : {
|
"hsv" : {
|
||||||
"saturationGain" : 1.0,
|
"saturationGain" : 1.0,
|
||||||
"valueGain" : 1.0
|
"valueGain" : 1.0
|
||||||
},
|
},
|
||||||
"red" :
|
"red" :
|
||||||
{
|
{
|
||||||
"threshold" : 0.0,
|
"threshold" : 0.0,
|
||||||
"gamma" : 1.0,
|
"gamma" : 1.0,
|
||||||
"blacklevel" : 0.0,
|
"blacklevel" : 0.0,
|
||||||
"whitelevel" : 1.0
|
"whitelevel" : 1.0
|
||||||
},
|
},
|
||||||
"green" :
|
"green" :
|
||||||
{
|
{
|
||||||
"threshold" : 0.0,
|
"threshold" : 0.0,
|
||||||
"gamma" : 1.0,
|
"gamma" : 1.0,
|
||||||
"blacklevel" : 0.0,
|
"blacklevel" : 0.0,
|
||||||
"whitelevel" : 1.0
|
"whitelevel" : 1.0
|
||||||
},
|
},
|
||||||
"blue" :
|
"blue" :
|
||||||
{
|
{
|
||||||
"threshold" : 0.0,
|
"threshold" : 0.0,
|
||||||
"gamma" : 1.0,
|
"gamma" : 1.0,
|
||||||
"blacklevel" : 0.0,
|
"blacklevel" : 0.0,
|
||||||
"whitelevel" : 1.0
|
"whitelevel" : 1.0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"leds" :
|
"leds" :
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"index" : 0,
|
"index" : 0,
|
||||||
"hscan" : { "minimum" : 47.0588, "maximum" : 52.9412 },
|
"hscan" : { "minimum" : 47.0588, "maximum" : 52.9412 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 1,
|
"index" : 1,
|
||||||
"hscan" : { "minimum" : 41.1765, "maximum" : 47.0588 },
|
"hscan" : { "minimum" : 41.1765, "maximum" : 47.0588 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 2,
|
"index" : 2,
|
||||||
"hscan" : { "minimum" : 35.2941, "maximum" : 41.1765 },
|
"hscan" : { "minimum" : 35.2941, "maximum" : 41.1765 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 3,
|
"index" : 3,
|
||||||
"hscan" : { "minimum" : 29.4118, "maximum" : 35.2941 },
|
"hscan" : { "minimum" : 29.4118, "maximum" : 35.2941 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 4,
|
"index" : 4,
|
||||||
"hscan" : { "minimum" : 23.5294, "maximum" : 29.4118 },
|
"hscan" : { "minimum" : 23.5294, "maximum" : 29.4118 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 5,
|
"index" : 5,
|
||||||
"hscan" : { "minimum" : 17.6471, "maximum" : 23.5294 },
|
"hscan" : { "minimum" : 17.6471, "maximum" : 23.5294 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 6,
|
"index" : 6,
|
||||||
"hscan" : { "minimum" : 11.7647, "maximum" : 17.6471 },
|
"hscan" : { "minimum" : 11.7647, "maximum" : 17.6471 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 7,
|
"index" : 7,
|
||||||
"hscan" : { "minimum" : 5.88235, "maximum" : 11.7647 },
|
"hscan" : { "minimum" : 5.88235, "maximum" : 11.7647 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
// TOP-LEFT Corner
|
// TOP-LEFT Corner
|
||||||
{
|
{
|
||||||
"index" : 8,
|
"index" : 8,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 5.88235 },
|
"hscan" : { "minimum" : 0, "maximum" : 5.88235 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 9,
|
"index" : 9,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 10, "maximum" : 20 }
|
"vscan" : { "minimum" : 10, "maximum" : 20 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 10,
|
"index" : 10,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 20, "maximum" : 30 }
|
"vscan" : { "minimum" : 20, "maximum" : 30 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 11,
|
"index" : 11,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 30, "maximum" : 40 }
|
"vscan" : { "minimum" : 30, "maximum" : 40 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 12,
|
"index" : 12,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 40, "maximum" : 50 }
|
"vscan" : { "minimum" : 40, "maximum" : 50 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 13,
|
"index" : 13,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 50, "maximum" : 60 }
|
"vscan" : { "minimum" : 50, "maximum" : 60 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 14,
|
"index" : 14,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 60, "maximum" : 70 }
|
"vscan" : { "minimum" : 60, "maximum" : 70 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 15,
|
"index" : 15,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 70, "maximum" : 80 }
|
"vscan" : { "minimum" : 70, "maximum" : 80 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 16,
|
"index" : 16,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
"hscan" : { "minimum" : 0, "maximum" : 10 },
|
||||||
"vscan" : { "minimum" : 80, "maximum" : 90 }
|
"vscan" : { "minimum" : 80, "maximum" : 90 }
|
||||||
},
|
},
|
||||||
// BOTTOM-LEFT Corner
|
// BOTTOM-LEFT Corner
|
||||||
{
|
{
|
||||||
"index" : 17,
|
"index" : 17,
|
||||||
"hscan" : { "minimum" : 0, "maximum" : 5.88235 },
|
"hscan" : { "minimum" : 0, "maximum" : 5.88235 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 18,
|
"index" : 18,
|
||||||
"hscan" : { "minimum" : 5.88235, "maximum" : 11.7647 },
|
"hscan" : { "minimum" : 5.88235, "maximum" : 11.7647 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 19,
|
"index" : 19,
|
||||||
"hscan" : { "minimum" : 11.7647, "maximum" : 17.6471 },
|
"hscan" : { "minimum" : 11.7647, "maximum" : 17.6471 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 20,
|
"index" : 20,
|
||||||
"hscan" : { "minimum" : 17.6471, "maximum" : 23.5294 },
|
"hscan" : { "minimum" : 17.6471, "maximum" : 23.5294 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 21,
|
"index" : 21,
|
||||||
"hscan" : { "minimum" : 23.5294, "maximum" : 29.4118 },
|
"hscan" : { "minimum" : 23.5294, "maximum" : 29.4118 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 22,
|
"index" : 22,
|
||||||
"hscan" : { "minimum" : 29.4118, "maximum" : 35.2941 },
|
"hscan" : { "minimum" : 29.4118, "maximum" : 35.2941 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 23,
|
"index" : 23,
|
||||||
"hscan" : { "minimum" : 35.2941, "maximum" : 41.1765 },
|
"hscan" : { "minimum" : 35.2941, "maximum" : 41.1765 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 24,
|
"index" : 24,
|
||||||
"hscan" : { "minimum" : 41.1765, "maximum" : 47.0588 },
|
"hscan" : { "minimum" : 41.1765, "maximum" : 47.0588 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 25,
|
"index" : 25,
|
||||||
"hscan" : { "minimum" : 47.0588, "maximum" : 52.9412 },
|
"hscan" : { "minimum" : 47.0588, "maximum" : 52.9412 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 26,
|
"index" : 26,
|
||||||
"hscan" : { "minimum" : 52.9412, "maximum" : 58.8235 },
|
"hscan" : { "minimum" : 52.9412, "maximum" : 58.8235 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 27,
|
"index" : 27,
|
||||||
"hscan" : { "minimum" : 58.8235, "maximum" : 64.7059 },
|
"hscan" : { "minimum" : 58.8235, "maximum" : 64.7059 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 28,
|
"index" : 28,
|
||||||
"hscan" : { "minimum" : 64.7059, "maximum" : 70.5882 },
|
"hscan" : { "minimum" : 64.7059, "maximum" : 70.5882 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 29,
|
"index" : 29,
|
||||||
"hscan" : { "minimum" : 70.5882, "maximum" : 76.4706 },
|
"hscan" : { "minimum" : 70.5882, "maximum" : 76.4706 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 30,
|
"index" : 30,
|
||||||
"hscan" : { "minimum" : 76.4706, "maximum" : 82.3529 },
|
"hscan" : { "minimum" : 76.4706, "maximum" : 82.3529 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 31,
|
"index" : 31,
|
||||||
"hscan" : { "minimum" : 82.3529, "maximum" : 88.2353 },
|
"hscan" : { "minimum" : 82.3529, "maximum" : 88.2353 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 32,
|
"index" : 32,
|
||||||
"hscan" : { "minimum" : 88.2353, "maximum" : 94.1176 },
|
"hscan" : { "minimum" : 88.2353, "maximum" : 94.1176 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
// BOTTOM-RIGHT Corner
|
// BOTTOM-RIGHT Corner
|
||||||
{
|
{
|
||||||
"index" : 33,
|
"index" : 33,
|
||||||
"hscan" : { "minimum" : 94.1176, "maximum" : 100 },
|
"hscan" : { "minimum" : 94.1176, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
"vscan" : { "minimum" : 90, "maximum" : 100 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 34,
|
"index" : 34,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 80, "maximum" : 90 }
|
"vscan" : { "minimum" : 80, "maximum" : 90 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 35,
|
"index" : 35,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 70, "maximum" : 80 }
|
"vscan" : { "minimum" : 70, "maximum" : 80 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 36,
|
"index" : 36,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 60, "maximum" : 70 }
|
"vscan" : { "minimum" : 60, "maximum" : 70 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 37,
|
"index" : 37,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 50, "maximum" : 60 }
|
"vscan" : { "minimum" : 50, "maximum" : 60 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 38,
|
"index" : 38,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 40, "maximum" : 50 }
|
"vscan" : { "minimum" : 40, "maximum" : 50 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 39,
|
"index" : 39,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 30, "maximum" : 40 }
|
"vscan" : { "minimum" : 30, "maximum" : 40 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 40,
|
"index" : 40,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 20, "maximum" : 30 }
|
"vscan" : { "minimum" : 20, "maximum" : 30 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 41,
|
"index" : 41,
|
||||||
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
"hscan" : { "minimum" : 90, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 10, "maximum" : 20 }
|
"vscan" : { "minimum" : 10, "maximum" : 20 }
|
||||||
},
|
},
|
||||||
// TOP-RIGHT Corner
|
// TOP-RIGHT Corner
|
||||||
{
|
{
|
||||||
"index" : 42,
|
"index" : 42,
|
||||||
"hscan" : { "minimum" : 94.1176, "maximum" : 100 },
|
"hscan" : { "minimum" : 94.1176, "maximum" : 100 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 43,
|
"index" : 43,
|
||||||
"hscan" : { "minimum" : 88.2353, "maximum" : 94.1176 },
|
"hscan" : { "minimum" : 88.2353, "maximum" : 94.1176 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 44,
|
"index" : 44,
|
||||||
"hscan" : { "minimum" : 82.3529, "maximum" : 88.2353 },
|
"hscan" : { "minimum" : 82.3529, "maximum" : 88.2353 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 45,
|
"index" : 45,
|
||||||
"hscan" : { "minimum" : 76.4706, "maximum" : 82.3529 },
|
"hscan" : { "minimum" : 76.4706, "maximum" : 82.3529 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 46,
|
"index" : 46,
|
||||||
"hscan" : { "minimum" : 70.5882, "maximum" : 76.4706 },
|
"hscan" : { "minimum" : 70.5882, "maximum" : 76.4706 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 47,
|
"index" : 47,
|
||||||
"hscan" : { "minimum" : 64.7059, "maximum" : 70.5882 },
|
"hscan" : { "minimum" : 64.7059, "maximum" : 70.5882 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 48,
|
"index" : 48,
|
||||||
"hscan" : { "minimum" : 58.8235, "maximum" : 64.7059 },
|
"hscan" : { "minimum" : 58.8235, "maximum" : 64.7059 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"index" : 49,
|
"index" : 49,
|
||||||
"hscan" : { "minimum" : 52.9412, "maximum" : 58.8235 },
|
"hscan" : { "minimum" : 52.9412, "maximum" : 58.8235 },
|
||||||
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
"vscan" : { "minimum" : 0, "maximum" : 10 }
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"xbmcVideoChecker" : {
|
|
||||||
"enable" : true,
|
"xbmcVideoChecker" : {
|
||||||
"xbmcAddress" : "127.0.0.1",
|
"enable" : true,
|
||||||
"xbmcTcpPort" : 9090
|
"xbmcAddress" : "127.0.0.1",
|
||||||
}
|
"xbmcTcpPort" : 9090
|
||||||
|
},
|
||||||
|
|
||||||
|
"bootsequence" :
|
||||||
|
{
|
||||||
|
"type" : "rainbow",
|
||||||
|
"duration_ms" : 3000
|
||||||
|
},
|
||||||
|
|
||||||
|
"framegrabber" :
|
||||||
|
{
|
||||||
|
"width" : 64,
|
||||||
|
"height" : 64,
|
||||||
|
"frequency_Hz" : 10
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
24
include/bootsequence/BootSequence.h
Normal file
24
include/bootsequence/BootSequence.h
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Pure virtual base class (or interface) for boot sequences. A BootSequence is started after the
|
||||||
|
/// Hyperion deamon is started to demonstrate the proper functioninf of the attached leds (and lets
|
||||||
|
/// face it because it is cool)
|
||||||
|
///
|
||||||
|
class BootSequence
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Empty virtual destructor for abstract base class
|
||||||
|
///
|
||||||
|
virtual ~BootSequence()
|
||||||
|
{
|
||||||
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Starts the boot sequence writing one or more colors to the attached leds
|
||||||
|
///
|
||||||
|
virtual void start() = 0;
|
||||||
|
};
|
||||||
29
include/bootsequence/BootSequenceFactory.h
Normal file
29
include/bootsequence/BootSequenceFactory.h
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
// Jsoncpp includes
|
||||||
|
#include <json/json.h>
|
||||||
|
|
||||||
|
// Bootsequence includes
|
||||||
|
#include <bootsequence/BootSequence.h>
|
||||||
|
|
||||||
|
// Hyperion includes
|
||||||
|
#include <hyperion/Hyperion.h>
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Factory for settings based construction of a boot-sequence
|
||||||
|
///
|
||||||
|
class BootSequenceFactory
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Creates a BootSequence using the given configuration (and Hyperion connection). Ownship of
|
||||||
|
/// the returned instance is transferred
|
||||||
|
///
|
||||||
|
/// @param[in] hyperion The Hyperion controlling the leds
|
||||||
|
/// @param[in] jsonConfig The boot-sequence configuration
|
||||||
|
///
|
||||||
|
/// @return The bootsequence (ownership is transferred to the caller
|
||||||
|
///
|
||||||
|
static BootSequence * createBootSequence(Hyperion * hyperion, const Json::Value & jsonConfig);
|
||||||
|
};
|
||||||
@ -1,32 +0,0 @@
|
|||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
// QT includes
|
|
||||||
#include <QTimer>
|
|
||||||
|
|
||||||
// Hyperion includes
|
|
||||||
#include <hyperion/Hyperion.h>
|
|
||||||
|
|
||||||
class RainbowBootSequence : public QObject
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
RainbowBootSequence(Hyperion * hyperion);
|
|
||||||
|
|
||||||
void start();
|
|
||||||
|
|
||||||
private slots:
|
|
||||||
void update();
|
|
||||||
|
|
||||||
private:
|
|
||||||
QTimer _timer;
|
|
||||||
|
|
||||||
Hyperion * _hyperion;
|
|
||||||
|
|
||||||
int _priority;
|
|
||||||
|
|
||||||
std::vector<RgbColor> _ledColors;
|
|
||||||
int _iterationCounter;
|
|
||||||
};
|
|
||||||
|
|
||||||
34
libsrc/bootsequence/BootSequenceFactory.cpp
Normal file
34
libsrc/bootsequence/BootSequenceFactory.cpp
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
|
||||||
|
// Bootsequence includes
|
||||||
|
#include <bootsequence/BootSequenceFactory.h>
|
||||||
|
|
||||||
|
// Local Bootsequence includes
|
||||||
|
#include "RainbowBootSequence.h"
|
||||||
|
|
||||||
|
BootSequence * BootSequenceFactory::createBootSequence(Hyperion * hyperion, const Json::Value & jsonConfig)
|
||||||
|
{
|
||||||
|
const std::string type = jsonConfig["type"].asString();
|
||||||
|
|
||||||
|
if (type == "none")
|
||||||
|
{
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
else if (type == "rainbow")
|
||||||
|
{
|
||||||
|
const unsigned duration_ms = jsonConfig["duration_ms"].asUInt();
|
||||||
|
return new RainbowBootSequence(hyperion, duration_ms);
|
||||||
|
}
|
||||||
|
else if (type == "knightrider")
|
||||||
|
{
|
||||||
|
std::cout << "KNIGHT RIDER NOT IMPLEMENTED YET" << std::endl;
|
||||||
|
return nullptr;
|
||||||
|
// const unsigned duration_ms = jsonConfig["duration_ms"].asUint();
|
||||||
|
// const std::string colorStr = jsonConfig["color"].asString();
|
||||||
|
// return new KnightRiderSequence(hyperion, duration_ms);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::cerr << "Unknown boot-sequence selected; boot-sequence disabled." << std::endl;
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -5,13 +5,16 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/bootsequence)
|
|||||||
|
|
||||||
# Group the headers that go through the MOC compiler
|
# Group the headers that go through the MOC compiler
|
||||||
SET(BootsequenceQT_HEADERS
|
SET(BootsequenceQT_HEADERS
|
||||||
${CURRENT_HEADER_DIR}/RainbowBootSequence.h
|
${CURRENT_SOURCE_DIR}/RainbowBootSequence.h
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(BootsequenceHEADERS
|
SET(BootsequenceHEADERS
|
||||||
|
${CURRENT_HEADER_DIR}/BootSequence.h
|
||||||
|
${CURRENT_HEADER_DIR}/BootSequenceFactory.h
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(BootsequenceSOURCES
|
SET(BootsequenceSOURCES
|
||||||
|
${CURRENT_SOURCE_DIR}/BootSequenceFactory.cpp
|
||||||
${CURRENT_SOURCE_DIR}/RainbowBootSequence.cpp
|
${CURRENT_SOURCE_DIR}/RainbowBootSequence.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -1,9 +1,11 @@
|
|||||||
|
|
||||||
|
// Utils includes
|
||||||
#include <utils/HsvTransform.h>
|
#include <utils/HsvTransform.h>
|
||||||
|
|
||||||
#include <bootsequence/RainbowBootSequence.h>
|
// Local-Bootsequence include
|
||||||
|
#include "RainbowBootSequence.h"
|
||||||
|
|
||||||
RainbowBootSequence::RainbowBootSequence(Hyperion * hyperion) :
|
RainbowBootSequence::RainbowBootSequence(Hyperion * hyperion, const unsigned duration_ms) :
|
||||||
_timer(),
|
_timer(),
|
||||||
_hyperion(hyperion),
|
_hyperion(hyperion),
|
||||||
_priority(0),
|
_priority(0),
|
||||||
@ -16,9 +18,7 @@ RainbowBootSequence::RainbowBootSequence(Hyperion * hyperion) :
|
|||||||
HsvTransform::hsv2rgb(iLed*360/_hyperion->getLedCount(), 255, 255, color.red, color.green, color.blue);
|
HsvTransform::hsv2rgb(iLed*360/_hyperion->getLedCount(), 255, 255, color.red, color.green, color.blue);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned sequenceLength_ms = 3000;
|
_timer.setInterval(duration_ms/_hyperion->getLedCount());
|
||||||
|
|
||||||
_timer.setInterval(sequenceLength_ms/_hyperion->getLedCount());
|
|
||||||
_timer.setSingleShot(false);
|
_timer.setSingleShot(false);
|
||||||
QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(update()));
|
QObject::connect(&_timer, SIGNAL(timeout()), this, SLOT(update()));
|
||||||
}
|
}
|
||||||
|
|||||||
57
libsrc/bootsequence/RainbowBootSequence.h
Normal file
57
libsrc/bootsequence/RainbowBootSequence.h
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
// QT includes
|
||||||
|
#include <QTimer>
|
||||||
|
|
||||||
|
// Bootsequence include
|
||||||
|
#include <bootsequence/BootSequence.h>
|
||||||
|
|
||||||
|
// Hyperion includes
|
||||||
|
#include <hyperion/Hyperion.h>
|
||||||
|
|
||||||
|
///
|
||||||
|
/// The RainborBootSequence shows a 'rainbow' (all lights have a different color). The rainbow is
|
||||||
|
/// rotated over each led during the length of the sequence.
|
||||||
|
///
|
||||||
|
class RainbowBootSequence : public QObject, public BootSequence
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
///
|
||||||
|
/// Constructs the rainbow boot-sequence. Hyperion is used for writing the led colors. The given
|
||||||
|
/// duration is the length of the sequence.
|
||||||
|
///
|
||||||
|
/// @param[in] hyperion The Hyperion instance
|
||||||
|
/// @param[in] duration_ms The length of the sequence [ms]
|
||||||
|
///
|
||||||
|
RainbowBootSequence(Hyperion * hyperion, const unsigned duration_ms);
|
||||||
|
|
||||||
|
///
|
||||||
|
/// Starts the boot-sequence
|
||||||
|
///
|
||||||
|
virtual void start();
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
///
|
||||||
|
/// Moves the rainbow one led further
|
||||||
|
///
|
||||||
|
void update();
|
||||||
|
|
||||||
|
private:
|
||||||
|
/// The timer used to generate an 'update' signal every interval
|
||||||
|
QTimer _timer;
|
||||||
|
|
||||||
|
/// The Hyperion instance
|
||||||
|
Hyperion * _hyperion;
|
||||||
|
|
||||||
|
/// The priority of the boot sequence
|
||||||
|
int _priority;
|
||||||
|
|
||||||
|
/// The current color of the boot sequence (the rainbow)
|
||||||
|
std::vector<RgbColor> _ledColors;
|
||||||
|
/// The counter of the number of iterations left
|
||||||
|
int _iterationCounter;
|
||||||
|
};
|
||||||
|
|
||||||
@ -11,7 +11,9 @@
|
|||||||
|
|
||||||
// Hyperion includes
|
// Hyperion includes
|
||||||
#include <hyperion/Hyperion.h>
|
#include <hyperion/Hyperion.h>
|
||||||
#include <bootsequence/RainbowBootSequence.h>
|
|
||||||
|
// Bootsequence includes
|
||||||
|
#include <bootsequence/BootSequenceFactory.h>
|
||||||
|
|
||||||
// Dispmanx grabber includes
|
// Dispmanx grabber includes
|
||||||
#include <dispmanx-grabber/DispmanxWrapper.h>
|
#include <dispmanx-grabber/DispmanxWrapper.h>
|
||||||
@ -74,8 +76,8 @@ int main(int argc, char** argv)
|
|||||||
Hyperion hyperion(config);
|
Hyperion hyperion(config);
|
||||||
std::cout << "Hyperion created and initialised" << std::endl;
|
std::cout << "Hyperion created and initialised" << std::endl;
|
||||||
|
|
||||||
RainbowBootSequence bootSequence(&hyperion);
|
BootSequence * bootSequence = BootSequenceFactory::createBootSequence(&hyperion, config["bootsequence"]);
|
||||||
bootSequence.start();
|
bootSequence->start();
|
||||||
|
|
||||||
const Json::Value & videoCheckerConfig = config["xbmcVideoChecker"];
|
const Json::Value & videoCheckerConfig = config["xbmcVideoChecker"];
|
||||||
XBMCVideoChecker xbmcVideoChecker(videoCheckerConfig["xbmcAddress"].asString(), videoCheckerConfig["xbmcTcpPort"].asUInt(), 1000, &hyperion, 999);
|
XBMCVideoChecker xbmcVideoChecker(videoCheckerConfig["xbmcAddress"].asString(), videoCheckerConfig["xbmcTcpPort"].asUInt(), 1000, &hyperion, 999);
|
||||||
@ -85,7 +87,13 @@ int main(int argc, char** argv)
|
|||||||
std::cout << "XBMC video checker created and started" << std::endl;
|
std::cout << "XBMC video checker created and started" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
DispmanxWrapper dispmanx(64, 64, 10, &hyperion);
|
// Construct and start the frame-grabber
|
||||||
|
const Json::Value & frameGrabberConfig = config["framegrabber"];
|
||||||
|
DispmanxWrapper dispmanx(
|
||||||
|
frameGrabberConfig["width"].asUInt(),
|
||||||
|
frameGrabberConfig["height"].asUInt(),
|
||||||
|
frameGrabberConfig["frequency_Hz"].asUInt(),
|
||||||
|
&hyperion);
|
||||||
dispmanx.start();
|
dispmanx.start();
|
||||||
std::cout << "Frame grabber created and started" << std::endl;
|
std::cout << "Frame grabber created and started" << std::endl;
|
||||||
|
|
||||||
@ -94,10 +102,14 @@ int main(int argc, char** argv)
|
|||||||
|
|
||||||
// run the application
|
// run the application
|
||||||
int rc = app.exec();
|
int rc = app.exec();
|
||||||
|
|
||||||
std::cout << "Application closed" << std::endl;
|
std::cout << "Application closed" << std::endl;
|
||||||
|
|
||||||
// Stop the frame grabber
|
// Stop the frame grabber
|
||||||
dispmanx.stop();
|
dispmanx.stop();
|
||||||
|
|
||||||
|
// Delete the boot sequence
|
||||||
|
delete bootSequence;
|
||||||
|
|
||||||
// Clear all colors (switchting off all leds)
|
// Clear all colors (switchting off all leds)
|
||||||
hyperion.clearall();
|
hyperion.clearall();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user