Skip to content

Commit 72d99a1

Browse files
Lord-GreyLord-Grey
authored
Prep 2.0.12 Release (#1377)
* APA102 - Migrate ColorOrder to align with fix * Address LGTM findings * Updated Changelog with updates since last release
1 parent 7311c3e commit 72d99a1

File tree

5 files changed

+74
-27
lines changed

5 files changed

+74
-27
lines changed

‎CHANGELOG.md‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,32 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7-
## [Unreleased](https://github.com/hyperion-project/hyperion.ng/compare/2.0.0-alpha.11...HEAD)
7+
## [Unreleased](https://github.com/hyperion-project/hyperion.ng/compare/2.0.12...HEAD)
88

99
### Breaking
1010

1111
### Added
1212

13+
### Changed
14+
15+
### Fixed
16+
17+
## Removed
18+
19+
## [2.0.12](https://github.com/hyperion-project/hyperion.ng/releases/tag/2.0.12) - 2021-11-20
20+
Hyperion's November release brings you some new features, removed IPv6 address related limitations, as well as fixing a couple of issues.
21+
22+
Hyperion packages can be installed now under Ubuntu (x64) and Debian (amd64/armhf) (incl. Raspberry Pi OS) via our own APT server.
23+
Details about the installation can be found in the installation.md and at apt.hyperion-project.org.
24+
25+
### Added
26+
27+
- New LED-device type: Razor Chroma.
28+
Note: Due to Chroma Razer API limitations, only one device can be configured.
29+
- APA102 - Support setting maximum brightness level (1-31)
30+
- New installation method (Drag'n Drop) for macOS.
1331
- hyperion-remote & standalone grabbers: IPv6 support
14-
- New languages - Danish & Hungarian
32+
- New languages: Danish & Hungarian
1533

1634
### Changed
1735

@@ -24,9 +42,17 @@ Note: Existing configurations are migrated to new structures automatically
2442

2543
### Fixed
2644

45+
- Fixed API Subscription (e.g. as used by HomeAssistant) (#1351)
46+
- Fixed APA102 protocol aligning to the standard defined, removed Latch-Time as not required by APA102 protocol (#1352, #1132)
2747
- Fixed hyperion-remote when sending multiple Hex-Colors with "Set Color" option
48+
- UI: Fixed "Selected Hyperion instance isn't running" issue (#1357)
49+
- Fixed Database migration version handling
50+
- Fixed Python ModuleNotFoundError (#1109)
2851

29-
### Removed
52+
### Technical
53+
54+
- Added Qt6 support
55+
- Migrated to MBEDTSL 3
3056

3157
## [2.0.0-alpha.11](https://github.com/hyperion-project/hyperion.ng/releases/tag/2.0.0-alpha.11) - 2021-10-06
3258

‎assets/webconfig/js/content_leds.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1630,7 +1630,7 @@ function updateElements(ledType, key) {
16301630

16311631
if (ledProperties && ledProperties.leds && ledProperties.maxLedCount) {
16321632
hardwareLedCount = ledProperties.leds.count;
1633-
var maxLedCount = ledProperties.maxLedCount
1633+
var maxLedCount = ledProperties.maxLedCount;
16341634
if (hardwareLedCount > maxLedCount) {
16351635
showInfoDialog('warning', $.i18n("conf_leds_config_warning"), $.i18n('conf_leds_error_hwled_gt_maxled', hardwareLedCount, maxLedCount, maxLedCount));
16361636
hardwareLedCount = maxLedCount;
@@ -1661,7 +1661,7 @@ function updateElements(ledType, key) {
16611661

16621662
if (ledProperties && ledProperties.maxLedCount) {
16631663
hardwareLedCount = conf_editor.getEditor("root.generalOptions.hardwareLedCount").getValue();
1664-
var maxLedCount = ledProperties.maxLedCount
1664+
var maxLedCount = ledProperties.maxLedCount;
16651665
if (hardwareLedCount > maxLedCount) {
16661666
showInfoDialog('warning', $.i18n("conf_leds_config_warning"), $.i18n('conf_leds_error_hwled_gt_maxled', hardwareLedCount, maxLedCount, maxLedCount));
16671667
hardwareLedCount = maxLedCount;

‎assets/webconfig/js/content_network.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,35 @@ $(document).ready(function () {
1414

1515
if (window.showOptHelp) {
1616
//network
17-
$('#conf_cont').append(createRow('conf_cont_net'))
17+
$('#conf_cont').append(createRow('conf_cont_net'));
1818
$('#conf_cont_net').append(createOptPanel('fa-sitemap', $.i18n("edt_conf_net_heading_title"), 'editor_container_net', 'btn_submit_net', 'panel-system'));
1919
$('#conf_cont_net').append(createHelpTable(window.schema.network.properties, $.i18n("edt_conf_net_heading_title")));
2020

2121
//jsonserver
22-
$('#conf_cont').append(createRow('conf_cont_json'))
22+
$('#conf_cont').append(createRow('conf_cont_json'));
2323
$('#conf_cont_json').append(createOptPanel('fa-sitemap', $.i18n("edt_conf_js_heading_title"), 'editor_container_jsonserver', 'btn_submit_jsonserver', 'panel-system'));
2424
$('#conf_cont_json').append(createHelpTable(window.schema.jsonServer.properties, $.i18n("edt_conf_js_heading_title")));
2525

2626
//flatbufserver
27-
$('#conf_cont').append(createRow('conf_cont_flatbuf'))
27+
$('#conf_cont').append(createRow('conf_cont_flatbuf'));
2828
$('#conf_cont_flatbuf').append(createOptPanel('fa-sitemap', $.i18n("edt_conf_fbs_heading_title"), 'editor_container_fbserver', 'btn_submit_fbserver', 'panel-system'));
2929
$('#conf_cont_flatbuf').append(createHelpTable(window.schema.flatbufServer.properties, $.i18n("edt_conf_fbs_heading_title"), "flatbufServerHelpPanelId"));
3030

3131
//protoserver
32-
$('#conf_cont').append(createRow('conf_cont_proto'))
32+
$('#conf_cont').append(createRow('conf_cont_proto'));
3333
$('#conf_cont_proto').append(createOptPanel('fa-sitemap', $.i18n("edt_conf_pbs_heading_title"), 'editor_container_protoserver', 'btn_submit_protoserver', 'panel-system'));
3434
$('#conf_cont_proto').append(createHelpTable(window.schema.protoServer.properties, $.i18n("edt_conf_pbs_heading_title"), "protoServerHelpPanelId"));
3535

3636
//boblight
3737
if (BOBLIGHT_ENABLED) {
38-
$('#conf_cont').append(createRow('conf_cont_bobl'))
38+
$('#conf_cont').append(createRow('conf_cont_bobl'));
3939
$('#conf_cont_bobl').append(createOptPanel('fa-sitemap', $.i18n("edt_conf_bobls_heading_title"), 'editor_container_boblightserver', 'btn_submit_boblightserver', 'panel-system'));
4040
$('#conf_cont_bobl').append(createHelpTable(window.schema.boblightServer.properties, $.i18n("edt_conf_bobls_heading_title"), "boblightServerHelpPanelId"));
4141
}
4242

4343
//forwarder
4444
if (storedAccess != 'default') {
45-
$('#conf_cont').append(createRow('conf_cont_fw'))
45+
$('#conf_cont').append(createRow('conf_cont_fw'));
4646
$('#conf_cont_fw').append(createOptPanel('fa-sitemap', $.i18n("edt_conf_fw_heading_title"), 'editor_container_forwarder', 'btn_submit_forwarder', 'panel-system'));
4747
$('#conf_cont_fw').append(createHelpTable(window.schema.forwarder.properties, $.i18n("edt_conf_fw_heading_title"), "forwarderHelpPanelId"));
4848
}
@@ -243,7 +243,7 @@ $(document).ready(function () {
243243
$('#root_network_apiAuth').change(function () {
244244
var state = $(this).is(":checked");
245245
checkApiTokenState(state);
246-
})
246+
});
247247

248248
checkApiTokenState(window.serverConfig.network.apiAuth);
249249

‎libsrc/hyperion/SettingsManager.cpp‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,13 +570,30 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
570570
}
571571
migrated = true;
572572
}
573+
}
573574

574-
if (migrated)
575+
if (newDeviceConfig.contains("type"))
576+
{
577+
QString type = newDeviceConfig["type"].toString();
578+
if (type == "apa102")
575579
{
576-
config["device"] = newDeviceConfig;
577-
Debug(_log, "LED-Device records migrated");
580+
if (newDeviceConfig.contains("colorOrder"))
581+
{
582+
QString colorOrder = newDeviceConfig["colorOrder"].toString();
583+
if (colorOrder == "bgr")
584+
{
585+
newDeviceConfig["colorOrder"] = "rgb";
586+
migrated = true;
587+
}
588+
}
578589
}
579590
}
591+
592+
if (migrated)
593+
{
594+
config["device"] = newDeviceConfig;
595+
Debug(_log, "LED-Device records migrated");
596+
}
580597
}
581598

582599
// Have Hostname/IP-address separate from port for Forwarder

‎libsrc/utils/jsonschema/QJsonSchemaChecker.cpp‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -233,24 +233,28 @@ void QJsonSchemaChecker::checkProperties(const QJsonObject& value, const QJsonOb
233233
{
234234
validate(value[property], propertyValue.toObject());
235235
}
236-
else if (verifyDeps(property, value, schema))
236+
else if (!verifyDeps(property, value, schema))
237237
{
238-
}
239-
else if (required != propertyValue.toObject().end() && propertyValue.toObject().find("required").value().toBool() && !_ignoreRequired)
240-
{
241-
_error = true;
238+
if (required != propertyValue.toObject().end() && propertyValue.toObject().find("required").value().toBool() && !_ignoreRequired)
239+
{
240+
_error = true;
241+
242+
if (_correct == "create")
243+
{
244+
QJsonUtils::modify(_autoCorrected, _currentPath, QJsonUtils::create(propertyValue, _ignoreRequired), property);
245+
setMessage("Create property: " + property + " with value: " + QJsonUtils::getDefaultValue(propertyValue));
246+
}
242247

243-
if (_correct == "create")
248+
if (_correct == "")
249+
{
250+
setMessage("missing member");
251+
}
252+
}
253+
else if (_correct == "create" && _ignoreRequired)
244254
{
245255
QJsonUtils::modify(_autoCorrected, _currentPath, QJsonUtils::create(propertyValue, _ignoreRequired), property);
246-
setMessage("Create property: " + property + " with value: " + QJsonUtils::getDefaultValue(propertyValue));
247256
}
248-
249-
if (_correct == "")
250-
setMessage("missing member");
251257
}
252-
else if (_correct == "create" && _ignoreRequired)
253-
QJsonUtils::modify(_autoCorrected, _currentPath, QJsonUtils::create(propertyValue, _ignoreRequired), property);
254258

255259
_currentPath.removeLast();
256260
}

0 commit comments

Comments
 (0)