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 branch 'master' into master

Browse Source
This commit is contained in:
LordGrey
2020-09-25 19:46:22 +02:00
committed by GitHub
parent f72a1d7737 6c68454bea
commit 28cbec1009
17 changed files with 483 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/webconfig/js/content_leds.js
View File

@@ -568,7 +568,7 @@ $(document).ready(function() {
// create led device selection
var ledDevices = window.serverInfo.ledDevices.available;
var devRPiSPI = ['apa102', 'apa104', 'ws2801', 'lpd6803', 'lpd8806', 'p9813', 'sk6812spi', 'sk6822spi', 'ws2812spi'];
var devRPiSPI = ['apa102', 'apa104', 'ws2801', 'lpd6803', 'lpd8806', 'p9813', 'sk6812spi', 'sk6822spi', 'sk9822', 'ws2812spi'];
var devRPiPWM = ['ws281x'];
var devRPiGPIO = ['piblaster'];
var devNET = ['atmoorb', 'fadecandy', 'philipshue', 'nanoleaf', 'tinkerforge', 'tpm2net', 'udpe131', 'udpartnet', 'udph801', 'udpraw', 'wled', 'yeelight'];

2
assets/webconfig/js/ui_utils.js
View File

@@ -207,7 +207,7 @@ function initLanguageSelection()
{
// If language is not supported by hyperion, try fallback language
langLocale = $.i18n().options.fallbackLocale.substring(0,2);
langIdx = availLang.indexOf(langLocale)
langIdx = availLang.indexOf(langLocale);
if ( langIdx > -1 )
{
langText = availLangText[langIdx];

8
assets/webconfig/js/wizard.js
View File

@@ -1552,7 +1552,7 @@ function assign_yeelight_lights(){
options+= '>'+$.i18n(txt+val)+'</option>';
}
var enabled = 'enabled'
var enabled = 'enabled';
if (! models.includes (lights[lightid].model) )
{
var enabled = 'disabled';
@@ -1752,7 +1752,7 @@ async function discover_atmoorb_lights(multiCastGroup, multiCastPort){
// TODO: error case unhandled
// res can be: false (timeout) or res.error (not found)
if(res && !res.error){
const r = res.info
const r = res.info;
// Process devices returned by discovery
for(const device of r.devices)
@@ -1832,10 +1832,10 @@ function assign_atmoorb_lights(){
options+= '>'+$.i18n(txt+val)+'</option>';
}
var enabled = 'enabled'
var enabled = 'enabled';
if ( orbId < 1 || orbId > 255 )
{
enabled = 'disabled'
enabled = 'disabled';
options = '<option value=disabled>'+$.i18n('wiz_atmoorb_unsupported')+'</option>';
}