First set up your Philips LED lamps using the Philips mobile app: during setup, select the ENTERTAINMENT group for your lamps (you should get the ID of this group). Otherwise, communication performance using the old json API will be very bad!
Remember that using other home automation systems connected to lamps can cause various side effects when running HyperHDR.", "select_wled_intro" : "Select WLED", "select_wled_rescan" : "Rescan network", + "wledBrightnessOverride" : "Override WLED brightness", + "wledCustomBrightnessLevel" : "Custom WLED brightness level", "edt_conf_mqtt_heading_title" : "MQTT client", "conf_network_mqtt_intro" : "Registration of HyperHDR services with the MQTT broker", "edt_conf_mqtt_ip_title" : "Hostname", diff --git a/assets/webconfig/js/content_huebridge.js b/assets/webconfig/js/content_huebridge.js deleted file mode 100644 index 7f9001fce..000000000 --- a/assets/webconfig/js/content_huebridge.js +++ /dev/null @@ -1,52 +0,0 @@ -$(document).ready( function() { - - $("#create_user").on("click", function() { - var connectionRetries = 15; - var data = {"devicetype":"hyperhdr#"+Date.now()}; - var UserInterval = setInterval(function(){ - $.ajax({ - type: "POST", - url: 'http://'+$("#ip").val()+'/api', - processData: false, - timeout: 1000, - contentType: 'application/json', - data: JSON.stringify(data), - success: function(r) { - connectionRetries--; - $("#connectionTime").html(connectionRetries); - if(connectionRetries == 0) { - abortConnection(UserInterval); - } - else - { - $("#abortConnection").hide(); - $('#pairmodal').modal('show'); - $("#ip_alert").hide(); - if (typeof r[0].error != 'undefined') { - console.log("link not pressed"); - } - if (typeof r[0].success != 'undefined') { - $('#pairmodal').modal('hide'); - $('#user').val(r[0].success.username); - - $( "#hue_lights" ).empty(); - get_hue_lights(); - clearInterval(UserInterval); - } - } - }, - error: function(XMLHttpRequest, textStatus, errorThrown) { - $("#ip_alert").show(); - clearInterval(UserInterval); - } - }); - },1000); -}); - -function abortConnection(UserInterval){ - clearInterval(UserInterval); - $("#abortConnection").show(); - $('#pairmodal').modal('hide'); -} - -}); diff --git a/sources/leddevice/dev_net/LedDeviceWled.cpp b/sources/leddevice/dev_net/LedDeviceWled.cpp index 047a01747..a0538f4d6 100644 --- a/sources/leddevice/dev_net/LedDeviceWled.cpp +++ b/sources/leddevice/dev_net/LedDeviceWled.cpp @@ -32,6 +32,9 @@ LedDeviceWled::LedDeviceWled(const QJsonObject& deviceConfig) : ProviderUdp(deviceConfig) , _restApi(nullptr) , _apiPort(API_DEFAULT_PORT) + , _overrideBrightness(true) + , _brightnessLevel(255) + , _restoreConfig(false) { } @@ -47,20 +50,32 @@ LedDevice* LedDeviceWled::construct(const QJsonObject& deviceConfig) } bool LedDeviceWled::init(const QJsonObject& deviceConfig) -{ - Debug(_log, ""); +{ bool isInitOK = false; + Debug(_log, "Initializing WLED"); + + _configBackup = QJsonDocument(); + // Initialise LedDevice sub-class, ProviderUdp::init will be executed later, if connectivity is defined if (LedDevice::init(deviceConfig)) { // Initialise LedDevice configuration and execution environment int configuredLedCount = this->getLedCount(); - Debug(_log, "DeviceType : %s", QSTRING_CSTR(this->getActiveDeviceType())); - Debug(_log, "LedCount : %d", configuredLedCount); + Debug(_log, "DeviceType : %s", QSTRING_CSTR(this->getActiveDeviceType())); + Debug(_log, "LedCount : %d", configuredLedCount); + + _overrideBrightness = deviceConfig["brightnessMax"].toBool(true); + Debug(_log, "Override brightness : %s", (_overrideBrightness) ? "true" : "false"); + + _brightnessLevel = deviceConfig["brightnessMaxLevel"].toInt(255); + Debug(_log, "Set brightness level: %i", _brightnessLevel); + + _restoreConfig = deviceConfig["restoreOriginalState"].toBool(false); + Debug(_log, "Restore WLED : %s", (_restoreConfig) ? "true" : "false"); _maxRetry = deviceConfig["maxRetry"].toInt(60); - Debug(_log, "Max retry : %d", _maxRetry); + Debug(_log, "Max retry : %d", _maxRetry); //Set hostname as per configuration QString address = deviceConfig[CONFIG_ADDRESS].toString(); @@ -119,21 +134,45 @@ bool LedDeviceWled::initRestAPI(const QString& hostname, int port) QString LedDeviceWled::getOnOffRequest(bool isOn) const { - QString state = isOn ? STATE_VALUE_TRUE : STATE_VALUE_FALSE; - return QString("{\"on\":%1,\"live\":%1}").arg(state); + if (!isOn && _restoreConfig && !_configBackup.isEmpty()) + { + return QString(_configBackup.toJson(QJsonDocument::Compact)); + } + else + { + QString state = isOn ? STATE_VALUE_TRUE : STATE_VALUE_FALSE; + QString bri = (_overrideBrightness && isOn) ? QString(",\"bri\":%1").arg(_brightnessLevel) : ""; + return QString("{\"on\":%1,\"live\":%1%2}").arg(state).arg(bri); + } } bool LedDeviceWled::powerOn() { Debug(_log, ""); bool on = false; - auto current = QDateTime::currentMSecsSinceEpoch(); if (!_retryMode) { //Power-on WLED device _restApi->setPath(API_PATH_STATE); - httpResponse response = _restApi->put(getOnOffRequest(true)); + + bool readConfig = _restoreConfig && _configBackup.isEmpty(); + httpResponse response = (readConfig) ? _restApi->get() : _restApi->put(getOnOffRequest(true)); + + if (readConfig && !response.error()) + { + _configBackup = response.getBody(); + + if (_configBackup.isObject()) + { + auto copy = _configBackup.object(); + copy["live"] = false; + _configBackup.setObject(copy); + } + + response = _restApi->put(getOnOffRequest(true)); + } + if (response.error()) { this->setInError(response.getErrorReason()); @@ -152,15 +191,10 @@ bool LedDeviceWled::powerOn() else Error(_log, "The WLED device is not ready... give up."); - - auto delta = QDateTime::currentMSecsSinceEpoch() - current; - - delta = qMin(qMax(1000ll - delta, 50ll), 1000ll); - if (_currentRetry > 0) { _retryMode = true; - QTimer::singleShot(delta, [this]() { _retryMode = false; if (_currentRetry > 0) enableDevice(true); }); + QTimer::singleShot(1000, [this]() { _retryMode = false; if (_currentRetry > 0) enableDevice(true); }); } } } @@ -271,45 +305,6 @@ QJsonObject LedDeviceWled::getProperties(const QJsonObject& params) return properties; } -void LedDeviceWled::identify(const QJsonObject& /*params*/) -{ -#if 0 - Debug(_log, "params: [%s]", QString(QJsonDocument(params).toJson(QJsonDocument::Compact)).toUtf8().constData()); - - QString host = params["host"].toString(""); - if (!host.isEmpty()) - { - // Resolve hostname and port (or use default API port) - QStringList addressparts = QStringUtils::split(host, ":", QStringUtils::SplitBehavior::SkipEmptyParts); - QString apiHost = addressparts[0]; - int apiPort; - - if (addressparts.size() > 1) - apiPort = addressparts[1].toInt(); - else - apiPort = API_DEFAULT_PORT; - - // TODO: WLED::identify - Replace with valid identification code - - // initRestAPI(apiHost, apiPort); - - // QString resource = QString("%1/%2/%3").arg( API_LIGHTS ).arg( lightId ).arg( API_STATE); - // _restApi->setPath(resource); - - // QString stateCmd; - // stateCmd += QString("\"%1\":%2,").arg( API_STATE_ON ).arg( API_STATE_VALUE_TRUE ); - // stateCmd += QString("\"%1\":\"%2\"").arg( "alert" ).arg( "select" ); - // stateCmd = "{" + stateCmd + "}"; - - // // Perform request - // httpResponse response = _restApi->put(stateCmd); - // if ( response.error() ) - // { - // Warning (_log, "%s identification failed with error: '%s'", QSTRING_CSTR(_activeDeviceType), QSTRING_CSTR(response.getErrorReason())); - // } - } -#endif -} int LedDeviceWled::write(const std::vector