frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'hyperion-project/master' into userauthapi

Browse Source
This commit is contained in:
brindosch
2019-08-30 00:15:31 +02:00
parent 034bd164a2 782d44b81b
commit 1e4c29dacb
19 changed files with 826 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

350
config/hyperion.config.json.commented
View File

@@ -343,299 +343,271 @@
/// 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
/// contains the following fields:
/// * index: The index of the led. This determines its location in the string of leds; zero
/// being the first led.
/// * hscan: The fractional part of the image along the horizontal used for the averaging
/// (minimum and maximum inclusive)
/// * vscan: The fractional part of the image along the vertical used for the averaging
/// (minimum and maximum inclusive)
/// * h: The fractional part of the image along the horizontal used for the averaging
/// (min and max inclusive)
/// * v: The fractional part of the image along the vertical used for the averaging
/// (min and max inclusive)
"leds":
"leds":
[
{
"hscan": {
"maximum": 0.125,
"minimum": 0
"h": {
"max": 0.125,
"min": 0
},
"index": 0,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.25,
"minimum": 0.125
"h": {
"max": 0.25,
"min": 0.125
},
"index": 1,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.375,
"minimum": 0.25
"h": {
"max": 0.375,
"min": 0.25
},
"index": 2,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.5,
"minimum": 0.375
"h": {
"max": 0.5,
"min": 0.375
},
"index": 3,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.625,
"minimum": 0.5
"h": {
"max": 0.625,
"min": 0.5
},
"index": 4,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.75,
"minimum": 0.625
"h": {
"max": 0.75,
"min": 0.625
},
"index": 5,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.875,
"minimum": 0.75
"h": {
"max": 0.875,
"min": 0.75
},
"index": 6,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.875
"h": {
"max": 1,
"min": 0.875
},
"index": 7,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 8,
"vscan": {
"maximum": 0.2,
"minimum": 0
"v": {
"max": 0.2,
"min": 0
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 9,
"vscan": {
"maximum": 0.4,
"minimum": 0.2
"v": {
"max": 0.4,
"min": 0.2
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 10,
"vscan": {
"maximum": 0.6,
"minimum": 0.4
"v": {
"max": 0.6,
"min": 0.4
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 11,
"vscan": {
"maximum": 0.8,
"minimum": 0.6
"v": {
"max": 0.8,
"min": 0.6
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 12,
"vscan": {
"maximum": 1,
"minimum": 0.8
"v": {
"max": 1,
"min": 0.8
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.875
"h": {
"max": 1,
"min": 0.875
},
"index": 13,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.875,
"minimum": 0.75
"h": {
"max": 0.875,
"min": 0.75
},
"index": 14,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.75,
"minimum": 0.625
"h": {
"max": 0.75,
"min": 0.625
},
"index": 15,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.625,
"minimum": 0.5
"h": {
"max": 0.625,
"min": 0.5
},
"index": 16,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.5,
"minimum": 0.375
"h": {
"max": 0.5,
"min": 0.375
},
"index": 17,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.375,
"minimum": 0.25
"h": {
"max": 0.375,
"min": 0.25
},
"index": 18,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.25,
"minimum": 0.125
"h": {
"max": 0.25,
"min": 0.125
},
"index": 19,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.125,
"minimum": 0
"h": {
"max": 0.125,
"min": 0
},
"index": 20,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 21,
"vscan": {
"maximum": 1,
"minimum": 0.8
"v": {
"max": 1,
"min": 0.8
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 22,
"vscan": {
"maximum": 0.8,
"minimum": 0.6
"v": {
"max": 0.8,
"min": 0.6
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 23,
"vscan": {
"maximum": 0.6,
"minimum": 0.4
"v": {
"max": 0.6,
"min": 0.4
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 24,
"vscan": {
"maximum": 0.4,
"minimum": 0.2
"v": {
"max": 0.4,
"min": 0.2
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 25,
"vscan": {
"maximum": 0.2,
"minimum": 0
"v": {
"max": 0.2,
"min": 0
}
}
]

338
config/hyperion.config.json.default
View File

@@ -204,289 +204,263 @@
"leds":
[
{
"hscan": {
"maximum": 0.125,
"minimum": 0
"h": {
"max": 0.125,
"min": 0
},
"index": 0,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.25,
"minimum": 0.125
"h": {
"max": 0.25,
"min": 0.125
},
"index": 1,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.375,
"minimum": 0.25
"h": {
"max": 0.375,
"min": 0.25
},
"index": 2,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.5,
"minimum": 0.375
"h": {
"max": 0.5,
"min": 0.375
},
"index": 3,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.625,
"minimum": 0.5
"h": {
"max": 0.625,
"min": 0.5
},
"index": 4,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.75,
"minimum": 0.625
"h": {
"max": 0.75,
"min": 0.625
},
"index": 5,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 0.875,
"minimum": 0.75
"h": {
"max": 0.875,
"min": 0.75
},
"index": 6,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.875
"h": {
"max": 1,
"min": 0.875
},
"index": 7,
"vscan": {
"maximum": 0.08,
"minimum": 0
"v": {
"max": 0.08,
"min": 0
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 8,
"vscan": {
"maximum": 0.2,
"minimum": 0
"v": {
"max": 0.2,
"min": 0
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 9,
"vscan": {
"maximum": 0.4,
"minimum": 0.2
"v": {
"max": 0.4,
"min": 0.2
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 10,
"vscan": {
"maximum": 0.6,
"minimum": 0.4
"v": {
"max": 0.6,
"min": 0.4
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 11,
"vscan": {
"maximum": 0.8,
"minimum": 0.6
"v": {
"max": 0.8,
"min": 0.6
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.95
"h": {
"max": 1,
"min": 0.95
},
"index": 12,
"vscan": {
"maximum": 1,
"minimum": 0.8
"v": {
"max": 1,
"min": 0.8
}
},
{
"hscan": {
"maximum": 1,
"minimum": 0.875
"h": {
"max": 1,
"min": 0.875
},
"index": 13,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.875,
"minimum": 0.75
"h": {
"max": 0.875,
"min": 0.75
},
"index": 14,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.75,
"minimum": 0.625
"h": {
"max": 0.75,
"min": 0.625
},
"index": 15,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.625,
"minimum": 0.5
"h": {
"max": 0.625,
"min": 0.5
},
"index": 16,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.5,
"minimum": 0.375
"h": {
"max": 0.5,
"min": 0.375
},
"index": 17,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.375,
"minimum": 0.25
"h": {
"max": 0.375,
"min": 0.25
},
"index": 18,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.25,
"minimum": 0.125
"h": {
"max": 0.25,
"min": 0.125
},
"index": 19,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.125,
"minimum": 0
"h": {
"max": 0.125,
"min": 0
},
"index": 20,
"vscan": {
"maximum": 1,
"minimum": 0.92
"v": {
"max": 1,
"min": 0.92
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 21,
"vscan": {
"maximum": 1,
"minimum": 0.8
"v": {
"max": 1,
"min": 0.8
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 22,
"vscan": {
"maximum": 0.8,
"minimum": 0.6
"v": {
"max": 0.8,
"min": 0.6
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 23,
"vscan": {
"maximum": 0.6,
"minimum": 0.4
"v": {
"max": 0.6,
"min": 0.4
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 24,
"vscan": {
"maximum": 0.4,
"minimum": 0.2
"v": {
"max": 0.4,
"min": 0.2
}
},
{
"hscan": {
"maximum": 0.05,
"minimum": 0
"h": {
"max": 0.05,
"min": 0
},
"index": 25,
"vscan": {
"maximum": 0.2,
"minimum": 0
"v": {
"max": 0.2,
"min": 0
}
}
]