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

Changed default settings of HyperCon;

Browse Source 
Fixed configuration mismatch between Hyperion and HyperCon


Former-commit-id: 20ee2dd709e4a02934d5badee60da9d6a6f3c6d4
This commit is contained in:
poljvd 2013-10-16 17:04:38 +02:00
parent aa4e2cbe2e
commit 62909c05ec
6 changed files with 382 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
config/hyperion.config.json
View File

@ -1,13 +1,13 @@
// Hyperion configuration // Automatically generated configuration file for 'Hyperion daemon'
// Generated by: HyperCon (The Hyperion deamon configuration file builder
{ {
/// 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 'ws2801', 'test' and /// * 'type' : The type of the device or leds (known types for now are 'ws2801', 'test' and 'none')
/// 'none')
/// * 'output' : The output specification depends on selected device /// * 'output' : The output specification depends on selected device
/// - 'ws2801' this is the device (eg '/dev/spidev0.0') /// - 'ws2801' this is the device (eg '/dev/spidev0.0')
/// - 'test' this is the file used to write test output (eg /// - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out')
/// '/home/pi/hyperion.out')
/// * 'rate' : The baudrate of the output to the device (only applicable for 'ws2801') /// * 'rate' : The baudrate of the output to the device (only applicable for 'ws2801')
"device" : "device" :
{ {
@ -17,45 +17,42 @@
"rate" : 1000000 "rate" : 1000000
}, },
/// Color manipulation configuration used to tune the output colors to specific surroundings. /// Color manipulation configuration used to tune the output colors to specific surroundings. Contains the following fields:
/// Contains the following fields: /// * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following tuning parameters:
/// * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following
/// tuning parameters:
/// - 'saturationGain' The gain adjustement of the saturation /// - 'saturationGain' The gain adjustement of the saturation
/// - 'valueGain' The gain adjustement of the value /// - 'valueGain' The gain adjustement of the value
/// * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the /// * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the following tuning parameters for each channel:
/// following tuning parameters for each channel: /// - 'threshold' The minimum required input value for the channel to be on (else zero)
/// - 'threshold' The minimum required input value for the channel to be on (else
/// zero)
/// - 'gamma' The gamma-curve correction factor /// - 'gamma' The gamma-curve correction factor
/// - 'blacklevel' The lowest possible value (when the channel is black) /// - 'blacklevel' The lowest possible value (when the channel is black)
/// - 'whitelevel' The highest possible value (when the channel is white) /// - 'whitelevel' The highest possible value (when the channel is white)
"color" : "color" :
{ {
"hsv" : { "hsv" :
"saturationGain" : 1.0, {
"valueGain" : 1.5 saturationGain : 1.0000,
valuGain : 1.5000
}, },
"red" : "red" :
{ {
"threshold" : 0.1, threshold : 0.1000,
"gamma" : 2.0, gamma : 2.0000,
"blacklevel" : 0.0, blacklevel : 0.0000,
"whitelevel" : 0.8 whitelevel : 0.8000
}, },
"green" : "green" :
{ {
"threshold" : 0.1, threshold : 0.1000,
"gamma" : 2.0, gamma : 2.0000,
"blacklevel" : 0.0, blacklevel : 0.0000,
"whitelevel" : 1.0 whitelevel : 1.0000
}, },
"blue" : "blue" :
{ {
"threshold" : 0.1, threshold : 0.1000,
"gamma" : 2.0, gamma : 2.0000,
"blacklevel" : 0.0, blacklevel : 0.0000,
"whitelevel" : 1.0 whitelevel : 1.0000
} }
}, },
@ -72,253 +69,253 @@
[ [
{ {
"index" : 0, "index" : 0,
"hscan" : { "minimum" : 47.0588, "maximum" : 52.9412 }, "hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 1, "index" : 1,
"hscan" : { "minimum" : 41.1765, "maximum" : 47.0588 }, "hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 2, "index" : 2,
"hscan" : { "minimum" : 35.2941, "maximum" : 41.1765 }, "hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 3, "index" : 3,
"hscan" : { "minimum" : 29.4118, "maximum" : 35.2941 }, "hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 4, "index" : 4,
"hscan" : { "minimum" : 23.5294, "maximum" : 29.4118 }, "hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 5, "index" : 5,
"hscan" : { "minimum" : 17.6471, "maximum" : 23.5294 }, "hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 6, "index" : 6,
"hscan" : { "minimum" : 11.7647, "maximum" : 17.6471 }, "hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 7, "index" : 7,
"hscan" : { "minimum" : 5.88235, "maximum" : 11.7647 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 8, "index" : 8,
"hscan" : { "minimum" : 0, "maximum" : 5.88235 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 9, "index" : 9,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 10, "maximum" : 20 } "vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
}, },
{ {
"index" : 10, "index" : 10,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 20, "maximum" : 30 } "vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
}, },
{ {
"index" : 11, "index" : 11,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 30, "maximum" : 40 } "vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
}, },
{ {
"index" : 12, "index" : 12,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 40, "maximum" : 50 } "vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
}, },
{ {
"index" : 13, "index" : 13,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 50, "maximum" : 60 } "vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
}, },
{ {
"index" : 14, "index" : 14,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 60, "maximum" : 70 } "vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
}, },
{ {
"index" : 15, "index" : 15,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 70, "maximum" : 80 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
}, },
{ {
"index" : 16, "index" : 16,
"hscan" : { "minimum" : 0, "maximum" : 10 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
"vscan" : { "minimum" : 80, "maximum" : 90 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 17, "index" : 17,
"hscan" : { "minimum" : 0, "maximum" : 5.88235 }, "hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 18, "index" : 18,
"hscan" : { "minimum" : 5.88235, "maximum" : 11.7647 }, "hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 19, "index" : 19,
"hscan" : { "minimum" : 11.7647, "maximum" : 17.6471 }, "hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 20, "index" : 20,
"hscan" : { "minimum" : 17.6471, "maximum" : 23.5294 }, "hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 21, "index" : 21,
"hscan" : { "minimum" : 23.5294, "maximum" : 29.4118 }, "hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 22, "index" : 22,
"hscan" : { "minimum" : 29.4118, "maximum" : 35.2941 }, "hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 23, "index" : 23,
"hscan" : { "minimum" : 35.2941, "maximum" : 41.1765 }, "hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 24, "index" : 24,
"hscan" : { "minimum" : 41.1765, "maximum" : 47.0588 }, "hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 25, "index" : 25,
"hscan" : { "minimum" : 47.0588, "maximum" : 52.9412 }, "hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 26, "index" : 26,
"hscan" : { "minimum" : 52.9412, "maximum" : 58.8235 }, "hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 27, "index" : 27,
"hscan" : { "minimum" : 58.8235, "maximum" : 64.7059 }, "hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 28, "index" : 28,
"hscan" : { "minimum" : 64.7059, "maximum" : 70.5882 }, "hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 29, "index" : 29,
"hscan" : { "minimum" : 70.5882, "maximum" : 76.4706 }, "hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 30, "index" : 30,
"hscan" : { "minimum" : 76.4706, "maximum" : 82.3529 }, "hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 31, "index" : 31,
"hscan" : { "minimum" : 82.3529, "maximum" : 88.2353 }, "hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 32, "index" : 32,
"hscan" : { "minimum" : 88.2353, "maximum" : 94.1176 }, "hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 33, "index" : 33,
"hscan" : { "minimum" : 94.1176, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 90, "maximum" : 100 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
}, },
{ {
"index" : 34, "index" : 34,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 80, "maximum" : 90 } "vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
}, },
{ {
"index" : 35, "index" : 35,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 70, "maximum" : 80 } "vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
}, },
{ {
"index" : 36, "index" : 36,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 60, "maximum" : 70 } "vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
}, },
{ {
"index" : 37, "index" : 37,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 50, "maximum" : 60 } "vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
}, },
{ {
"index" : 38, "index" : 38,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 40, "maximum" : 50 } "vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
}, },
{ {
"index" : 39, "index" : 39,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 30, "maximum" : 40 } "vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
}, },
{ {
"index" : 40, "index" : 40,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 20, "maximum" : 30 } "vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
}, },
{ {
"index" : 41, "index" : 41,
"hscan" : { "minimum" : 90, "maximum" : 100 }, "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
"vscan" : { "minimum" : 10, "maximum" : 20 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 42, "index" : 42,
"hscan" : { "minimum" : 94.1176, "maximum" : 100 }, "hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 43, "index" : 43,
"hscan" : { "minimum" : 88.2353, "maximum" : 94.1176 }, "hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 44, "index" : 44,
"hscan" : { "minimum" : 82.3529, "maximum" : 88.2353 }, "hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 45, "index" : 45,
"hscan" : { "minimum" : 76.4706, "maximum" : 82.3529 }, "hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 46, "index" : 46,
"hscan" : { "minimum" : 70.5882, "maximum" : 76.4706 }, "hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 47, "index" : 47,
"hscan" : { "minimum" : 64.7059, "maximum" : 70.5882 }, "hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 48, "index" : 48,
"hscan" : { "minimum" : 58.8235, "maximum" : 64.7059 }, "hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
}, },
{ {
"index" : 49, "index" : 49,
"hscan" : { "minimum" : 52.9412, "maximum" : 58.8235 }, "hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
"vscan" : { "minimum" : 0, "maximum" : 10 } "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
} }
], ],
@ -327,7 +324,7 @@
/// * duration_ms : The length of the boot-sequence [ms] /// * duration_ms : The length of the boot-sequence [ms]
"bootsequence" : "bootsequence" :
{ {
"type" : "rainbow", "type" : "Rainbow",
"duration_ms" : 3000 "duration_ms" : 3000
}, },
@ -339,18 +336,18 @@
{ {
"width" : 64, "width" : 64,
"height" : 64, "height" : 64,
"frequency_Hz" : 10 "frequency_Hz" : 10.0
}, },
/// The configuration of the XBMC connection used to enable and disable the frame-grabber. /// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
/// Contains the following fields:
/// * xbmcAddress : The IP address of the XBMC-host /// * xbmcAddress : The IP address of the XBMC-host
/// * xbmcTcpPort : The TCP-port of the XBMC-server /// * xbmcTcpPort : The TCP-port of the XBMC-server
/// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback /// * grabVideo : Flag indicating that the frame-grabber is on(true) during video playback
/// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show /// * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
/// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback /// * grabAudio : Flag indicating that the frame-grabber is on(true) during audio playback
/// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu /// * grabMenu : Flag indicating that the frame-grabber is on(true) in the XBMC menu
"xbmcVideoChecker" : { "xbmcVideoChecker" :
{
"xbmcAddress" : "127.0.0.1", "xbmcAddress" : "127.0.0.1",
"xbmcTcpPort" : 9090, "xbmcTcpPort" : 9090,
"grabVideo" : true, "grabVideo" : true,

2
deploy/HyperCon.jar.REMOVED.git-id
View File

@ -1 +1 @@
34df0df1f139f6ea0ac0d9e856deb7226f262632 34c1dea63242566ecea3eeaff08e35d5ec008425

8
libsrc/hyperion/Hyperion.cpp
View File

@ -66,10 +66,10 @@ LedString Hyperion::createLedString(const Json::Value& ledsConfig)
led.index = ledConfig["index"].asInt(); led.index = ledConfig["index"].asInt();
const Json::Value& hscanConfig = ledConfig["hscan"]; const Json::Value& hscanConfig = ledConfig["hscan"];
const Json::Value& vscanConfig = ledConfig["vscan"]; const Json::Value& vscanConfig = ledConfig["vscan"];
led.minX_frac = std::max(0.0, std::min(100.0, hscanConfig["minimum"].asDouble()))/100.0; led.minX_frac = std::max(0.0, std::min(1.0, hscanConfig["minimum"].asDouble()));
led.maxX_frac = std::max(0.0, std::min(100.0, hscanConfig["maximum"].asDouble()))/100.0; led.maxX_frac = std::max(0.0, std::min(1.0, hscanConfig["maximum"].asDouble()));
led.minY_frac = 1.0 - std::max(0.0, std::min(100.0, vscanConfig["maximum"].asDouble()))/100.0; led.minY_frac = std::max(0.0, std::min(1.0, vscanConfig["maximum"].asDouble()));
led.maxY_frac = 1.0 - std::max(0.0, std::min(100.0, vscanConfig["minimum"].asDouble()))/100.0; led.maxY_frac = std::max(0.0, std::min(1.0, vscanConfig["minimum"].asDouble()));
ledString.leds().push_back(led); ledString.leds().push_back(led);
} }

8
src/config-tool/ConfigTool/src/org/hyperion/hypercon/gui/MiscConfigPanel.java
View File

@ -44,7 +44,7 @@ public class MiscConfigPanel extends JPanel {
add(mMenuLabel); add(mMenuLabel);
mMenuCombo = new JComboBox<>(new String[] {"On", "Off"}); mMenuCombo = new JComboBox<>(new String[] {"On", "Off"});
mMenuCombo.setSelectedItem("Off"); mMenuCombo.setSelectedItem(mMiscConfig.mMenuOn? "On": "Off");
mMenuCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light in the XBMC Menu"); mMenuCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light in the XBMC Menu");
mMenuCombo.addActionListener(mActionListener); mMenuCombo.addActionListener(mActionListener);
add(mMenuCombo); add(mMenuCombo);
@ -53,7 +53,7 @@ public class MiscConfigPanel extends JPanel {
add(mVideoLabel); add(mVideoLabel);
mVideoCombo = new JComboBox<>(new String[] {"On", "Off"}); mVideoCombo = new JComboBox<>(new String[] {"On", "Off"});
mVideoCombo.setSelectedItem("On"); mVideoCombo.setSelectedItem(mMiscConfig.mVideoOn? "On": "Off");
mVideoCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light during video playback"); mVideoCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light during video playback");
mVideoCombo.addActionListener(mActionListener); mVideoCombo.addActionListener(mActionListener);
add(mVideoCombo); add(mVideoCombo);
@ -62,7 +62,7 @@ public class MiscConfigPanel extends JPanel {
add(mPictureLabel); add(mPictureLabel);
mPictureCombo = new JComboBox<>(new String[] {"On", "Off"}); mPictureCombo = new JComboBox<>(new String[] {"On", "Off"});
mPictureCombo.setSelectedItem("Off"); mPictureCombo.setSelectedItem(mMiscConfig.mPictureOn? "On": "Off");
mPictureCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light when viewing pictures"); mPictureCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light when viewing pictures");
mPictureCombo.addActionListener(mActionListener); mPictureCombo.addActionListener(mActionListener);
add(mPictureCombo); add(mPictureCombo);
@ -71,7 +71,7 @@ public class MiscConfigPanel extends JPanel {
add(mAudioLabel); add(mAudioLabel);
mAudioCombo = new JComboBox<>(new String[] {"On", "Off"}); mAudioCombo = new JComboBox<>(new String[] {"On", "Off"});
mAudioCombo.setSelectedItem("Off"); mAudioCombo.setSelectedItem(mMiscConfig.mAudioOn? "On": "Off");
mAudioCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light when listing to audio"); mAudioCombo.setToolTipText("Enables('On') or disbales('Off') the ambi-light when listing to audio");
mAudioCombo.addActionListener(mActionListener); mAudioCombo.addActionListener(mActionListener);
add(mAudioCombo); add(mAudioCombo);

16
src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/ColorConfig.java
View File

@ -10,30 +10,30 @@ public class ColorConfig {
/** The saturation gain (in HSV space) */ /** The saturation gain (in HSV space) */
double mSaturationGain = 1.0; double mSaturationGain = 1.0;
/** The value gain (in HSV space) */ /** The value gain (in HSV space) */
double mValueGain = 1.0; double mValueGain = 1.5;
/** The minimum required RED-value (in RGB space) */ /** The minimum required RED-value (in RGB space) */
double mRedThreshold = 0.0; double mRedThreshold = 0.1;
/** The gamma-curve correct for the RED-value (in RGB space) */ /** The gamma-curve correct for the RED-value (in RGB space) */
double mRedGamma = 1.0; double mRedGamma = 2.0;
/** The black-level of the RED-value (in RGB space) */ /** The black-level of the RED-value (in RGB space) */
double mRedBlacklevel = 0.0; double mRedBlacklevel = 0.0;
/** The white-level of the RED-value (in RGB space) */ /** The white-level of the RED-value (in RGB space) */
double mRedWhitelevel = 1.0; double mRedWhitelevel = 0.8;
/** The minimum required GREEN-value (in RGB space) */ /** The minimum required GREEN-value (in RGB space) */
double mGreenThreshold = 0.0; double mGreenThreshold = 0.1;
/** The gamma-curve correct for the GREEN-value (in RGB space) */ /** The gamma-curve correct for the GREEN-value (in RGB space) */
double mGreenGamma = 1.0; double mGreenGamma = 2.0;
/** The black-level of the GREEN-value (in RGB space) */ /** The black-level of the GREEN-value (in RGB space) */
double mGreenBlacklevel = 0.0; double mGreenBlacklevel = 0.0;
/** The white-level of the GREEN-value (in RGB space) */ /** The white-level of the GREEN-value (in RGB space) */
double mGreenWhitelevel = 1.0; double mGreenWhitelevel = 1.0;
/** The minimum required BLUE-value (in RGB space) */ /** The minimum required BLUE-value (in RGB space) */
double mBlueThreshold = 0.0; double mBlueThreshold = 0.1;
/** The gamma-curve correct for the BLUE-value (in RGB space) */ /** The gamma-curve correct for the BLUE-value (in RGB space) */
double mBlueGamma = 1.0; double mBlueGamma = 2.0;
/** The black-level of the BLUE-value (in RGB space) */ /** The black-level of the BLUE-value (in RGB space) */
double mBlueBlacklevel = 0.0; double mBlueBlacklevel = 0.0;
/** The white-level of the BLUE-value (in RGB space) */ /** The white-level of the BLUE-value (in RGB space) */

2
src/config-tool/ConfigTool/src/org/hyperion/hypercon/spec/DeviceConfig.java
View File

@ -12,7 +12,7 @@ public class DeviceConfig {
/** The device 'file' name */ /** The device 'file' name */
String mOutput = "/dev/spidev0.0"; String mOutput = "/dev/spidev0.0";
/** The baudrate of the device */ /** The baudrate of the device */
int mBaudrate = 48000; int mBaudrate = 1000000;
/** /**
* Creates the JSON string of the configuration as used in the Hyperion daemon configfile * Creates the JSON string of the configuration as used in the Hyperion daemon configfile