From dd70b1e3ed0aacd244b384de60b76caa0f360d86 Mon Sep 17 00:00:00 2001 From: Paulchen Panther Date: Sun, 2 Dec 2018 13:05:47 +0100 Subject: [PATCH 1/4] Removed ColorOrder from schema because it exists in the general area --- libsrc/leddevice/schemas/schema-aurora.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libsrc/leddevice/schemas/schema-aurora.json b/libsrc/leddevice/schemas/schema-aurora.json index b79c560b2..a116149f4 100644 --- a/libsrc/leddevice/schemas/schema-aurora.json +++ b/libsrc/leddevice/schemas/schema-aurora.json @@ -11,12 +11,6 @@ "type": "string", "title":"edt_dev_auth_key_title", "propertyOrder" : 2 - }, - "colorOrder": { - "type": "string", - "title":"edt_dev_color_order_title", - "default": "rgb", - "propertyOrder" : 3 } }, "additionalProperties": true From 011c5d7c1a5e67029f2546e4fa8e754ac3bb2747 Mon Sep 17 00:00:00 2001 From: Paulchen Panther Date: Sun, 2 Dec 2018 13:07:12 +0100 Subject: [PATCH 2/4] Added aurora schema to internal resource file --- libsrc/leddevice/LedDeviceSchemas.qrc | 1 + 1 file changed, 1 insertion(+) diff --git a/libsrc/leddevice/LedDeviceSchemas.qrc b/libsrc/leddevice/LedDeviceSchemas.qrc index 9536835f7..db9100aa6 100644 --- a/libsrc/leddevice/LedDeviceSchemas.qrc +++ b/libsrc/leddevice/LedDeviceSchemas.qrc @@ -32,5 +32,6 @@ schemas/schema-apa104.json schemas/schema-ws281x.json schemas/schema-karate.json + schemas/schema-aurora.json From 0a2494d0f30a547c6f53abc59122fee79deefe82 Mon Sep 17 00:00:00 2001 From: Paulchen Panther Date: Sun, 2 Dec 2018 13:12:18 +0100 Subject: [PATCH 3/4] Moved aurora device from "Debug" to "Network" category in drop-down menu --- assets/webconfig/js/content_leds.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js index 2cf7e07bc..81d02e643 100644 --- a/assets/webconfig/js/content_leds.js +++ b/assets/webconfig/js/content_leds.js @@ -473,7 +473,7 @@ $(document).ready(function() { devRPiSPI = ['apa102', 'apa104', 'ws2801', 'lpd6803', 'lpd8806', 'p9813', 'sk6812spi', 'sk6822spi', 'ws2812spi']; devRPiPWM = ['ws281x']; devRPiGPIO = ['piblaster']; - devNET = ['atmoorb', 'fadecandy', 'philipshue', 'tinkerforge', 'tpm2net', 'udpe131', 'udpartnet', 'udph801', 'udpraw']; + devNET = ['atmoorb', 'fadecandy', 'philipshue', 'aurora', 'tinkerforge', 'tpm2net', 'udpe131', 'udpartnet', 'udph801', 'udpraw']; devUSB = ['adalight', 'dmx', 'atmo', 'hyperionusbasp', 'lightpack', 'multilightpack', 'paintpack', 'rawhid', 'sedu', 'tpm2', 'karate']; var optArr = [[]]; From 2763789f0625163db8f6dc934031f31a785a1123 Mon Sep 17 00:00:00 2001 From: Paulchen Panther Date: Sun, 2 Dec 2018 13:15:10 +0100 Subject: [PATCH 4/4] Added missing "API Key" String from aurora --- assets/webconfig/i18n/en.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index f7fd7102f..afa9905a7 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -57,7 +57,7 @@ "dashboard_componentbox_label_comp" : "Component", "dashboard_componentbox_label_status" : "Status", "dashboard_newsbox_label_title" : "Hyperion-Blog", - "dashboard_newsbox_visitblog" : "Visit Hyperion-Blog", + "dashboard_newsbox_visitblog" : "Visit Hyperion-Blog", "dashboard_newsbox_noconn" : "Can't connect to Hyperion Server to retrieve latest posts, does your internet connection work?", "dashboard_newsbox_readmore" : "Read more", "dashboard_alert_message_confedit_t" : "Configuration modified", @@ -341,6 +341,7 @@ "wiz_cc_morethanone" : "You have more than one profile, please choose the profile you want to calibrate.", "wiz_cc_btn_stop" : "Stop video", "wiz_cc_summary" : "A conclusion of your settings. During video playback, you could change or test values again. If you are done, click on save.", + "edt_dev_auth_key_title" : "Aurora API Key", "edt_dev_enum_subtract_minimum" : "Substract minimum", "edt_dev_enum_sub_min_warm_adjust" : "Min warm adjust", "edt_dev_enum_white_off" : "White off",