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

Fix WLED UI handling non supported segment streaming (#1610)

Browse Source
This commit is contained in:
LordGrey 2023-07-10 20:39:35 +02:00 committed by GitHub
parent af1a31b842
commit 64642a4457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2331,6 +2331,7 @@ function updateElementsWled(ledType, key) {
var enumSegSelectVals = []; var enumSegSelectVals = [];
var enumSegSelectTitleVals = []; var enumSegSelectTitleVals = [];
var enumSegSelectDefaultVal = ""; var enumSegSelectDefaultVal = "";
var defaultSegmentId = "-1";
if (devicesProperties[ledType] && devicesProperties[ledType][key]) { if (devicesProperties[ledType] && devicesProperties[ledType][key]) {
var ledDeviceProperties = devicesProperties[ledType][key]; var ledDeviceProperties = devicesProperties[ledType][key];
@ -2338,9 +2339,8 @@ function updateElementsWled(ledType, key) {
if (!jQuery.isEmptyObject(ledDeviceProperties)) { if (!jQuery.isEmptyObject(ledDeviceProperties)) {
if (ledDeviceProperties.info) { if (ledDeviceProperties.info) {
if (ledDeviceProperties.info.liveseg && ledDeviceProperties.info.liveseg < 0) { if (!ledDeviceProperties.info.hasOwnProperty("liveseg") || ledDeviceProperties.info.liveseg < 0) {
// "Use main segment only" is disabled // "Use main segment only" is disabled
var defaultSegmentId = "-1";
enumSegSelectVals.push(defaultSegmentId); enumSegSelectVals.push(defaultSegmentId);
enumSegSelectTitleVals.push($.i18n('edt_dev_spec_segments_disabled_title')); enumSegSelectTitleVals.push($.i18n('edt_dev_spec_segments_disabled_title'));
enumSegSelectDefaultVal = defaultSegmentId; enumSegSelectDefaultVal = defaultSegmentId;
@ -2392,13 +2392,12 @@ function updateElementsWled(ledType, key) {
hardwareLedCount = 1; hardwareLedCount = 1;
} }
if (segmentConfig) { if (segmentConfig && segmentConfig.streamSegmentId > defaultSegmentId) {
var configuredstreamSegmentId = window.serverConfig.device.segments.streamSegmentId.toString(); var configuredstreamSegmentId = window.serverConfig.device.segments.streamSegmentId.toString();
enumSegSelectVals = [configuredstreamSegmentId]; enumSegSelectVals = [configuredstreamSegmentId];
enumSegSelectTitleVals = ["Segment " + configuredstreamSegmentId]; enumSegSelectTitleVals = ["Segment " + configuredstreamSegmentId];
enumSegSelectDefaultVal = configuredstreamSegmentId; enumSegSelectDefaultVal = configuredstreamSegmentId;
} else { } else {
defaultSegmentId = "-1";
enumSegSelectVals.push(defaultSegmentId); enumSegSelectVals.push(defaultSegmentId);
enumSegSelectTitleVals.push($.i18n('edt_dev_spec_segments_disabled_title')); enumSegSelectTitleVals.push($.i18n('edt_dev_spec_segments_disabled_title'));
enumSegSelectDefaultVal = defaultSegmentId; enumSegSelectDefaultVal = defaultSegmentId;

4
libsrc/leddevice/dev_net/LedDeviceWled.cpp
View File

@ -301,7 +301,7 @@ bool LedDeviceWled::isReadyForSegmentStreaming(semver::version& version) const
} }
else else
{ {
Error(_log, "Version provided to test for streaming readiness is not valid "); Error(_log, "Version provided to test for segment streaming readiness is not valid ");
} }
return isReady; return isReady;
} }
@ -325,7 +325,7 @@ bool LedDeviceWled::isReadyForDDPStreaming(semver::version& version) const
} }
else else
{ {
Error(_log, "Version provided to test for streaming readiness is not valid "); Error(_log, "Version provided to test for DDP streaming readiness is not valid ");
} }
return isReady; return isReady;
} }