Fix #1015 - Fix Lightpack / Remove Multi-Lightpack (#1049)

hyperion-project · Oct 18, 2020 · db1dae4 · db1dae4
1 parent 83b8a80
commit db1dae4
Show file tree

Hide file tree

Showing 8 changed files with 140 additions and 473 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,8 +15,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
  - Also allow an 8-LED configuration when using Karatelight
 
+- Fix Lightpack issue (#1015)
+
 ### Removed
 
+- Replace Multi-Lightpack by multi-instance Lightpack configuration
+
 ## [2.0.0-alpha.8](https://github.com/hyperion-project/hyperion.ng/releases/tag/2.0.0-alpha.8) - 2020-09-14
 ### Added
 - Add XCB grabber, a faster and safer alternative for X11 grabbing (#912)

diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js
@@ -572,7 +572,7 @@ $(document).ready(function() {
 	var devRPiPWM = ['ws281x'];
 	var devRPiGPIO = ['piblaster'];
 	var devNET = ['atmoorb', 'fadecandy', 'philipshue', 'nanoleaf', 'tinkerforge', 'tpm2net', 'udpe131', 'udpartnet', 'udph801', 'udpraw', 'wled', 'yeelight'];
-	var devUSB = ['adalight', 'dmx', 'atmo', 'hyperionusbasp', 'lightpack', 'multilightpack', 'paintpack', 'rawhid', 'sedu', 'tpm2', 'karate'];
+	var devUSB = ['adalight', 'dmx', 'atmo', 'hyperionusbasp', 'lightpack', 'paintpack', 'rawhid', 'sedu', 'tpm2', 'karate'];
 
 	var optArr = [[]];
 	optArr[1]=[];

diff --git a/libsrc/leddevice/LedDeviceSchemas.qrc b/libsrc/leddevice/LedDeviceSchemas.qrc
@@ -11,7 +11,6 @@
 		<file alias="schema-lightpack">schemas/schema-lightpack.json</file>
 		<file alias="schema-lpd6803">schemas/schema-lpd6803.json</file>
 		<file alias="schema-lpd8806">schemas/schema-lpd8806.json</file>
-		<file alias="schema-multilightpack">schemas/schema-multilightpack.json</file>
 		<file alias="schema-p9813">schemas/schema-p9813.json</file>
 		<file alias="schema-paintpack">schemas/schema-paintpack.json</file>
 		<file alias="schema-philipshue">schemas/schema-philipshue.json</file>