diff --git a/assets/firmware/arduino/mega_pwm_led_driver.fzz b/assets/firmware/arduino/mega_pwm_led_driver.fzz new file mode 100644 index 00000000..c1a97cbe Binary files /dev/null and b/assets/firmware/arduino/mega_pwm_led_driver.fzz differ diff --git a/assets/webconfig/content/conf_leds.html b/assets/webconfig/content/conf_leds.html index 517214c5..4c3cad92 100644 --- a/assets/webconfig/content/conf_leds.html +++ b/assets/webconfig/content/conf_leds.html @@ -286,6 +286,7 @@

+

diff --git a/assets/webconfig/i18n/de.json b/assets/webconfig/i18n/de.json index 671bfea3..1f360256 100644 --- a/assets/webconfig/i18n/de.json +++ b/assets/webconfig/i18n/de.json @@ -104,10 +104,10 @@ "conf_leds_optgroup_usb" : "USB", "conf_leds_optgroup_debug" : "Debug", "conf_leds_layout_btn_checklist" : "Zeige Checkliste", - "conf_leds_leyout_checkp1" : "Die schwarze eingefärbte LED ist die erste LED. Das ist der Punkt, an dem die Daten eingespeist werden.", - "conf_leds_leyout_checkp2" : "Das Layout ist die Ansicht vor dem Fernseher stehend, nicht dahinter.", - "conf_leds_leyout_checkp3" : "Stelle sicher, dass die Richtung richtig eingestellt ist, dazu ist die zweite und dritte LED grau markiert um den Datenfluss anzuzeigen.", - "conf_leds_leyout_checkp4" : "Vorgang Lücke: Solltest du eine Lücke benötigen, ignoriere diese bei der LED Angabe Oben/Unten/Rechts/Links und gebe anschließend unter Lückenlänge an, wieviel LEDs du abziehen möchtest. Verändere jetzt die Lückenposition, um die Lücke an die richtige Stelle zu rücken.", + "conf_leds_layout_checkp1" : "Die schwarze eingefärbte LED ist die erste LED. Das ist der Punkt, an dem die Daten eingespeist werden.", + "conf_leds_layout_checkp2" : "Das Layout ist die Ansicht vor dem Fernseher stehend, nicht dahinter.", + "conf_leds_layout_checkp3" : "Stelle sicher, dass die Richtung richtig eingestellt ist, dazu ist die zweite und dritte LED grau markiert um den Datenfluss anzuzeigen.", + "conf_leds_layout_checkp4" : "Vorgang Lücke: Solltest du eine Lücke benötigen, ignoriere diese bei der LED Angabe Oben/Unten/Rechts/Links und gebe anschließend unter Lückenlänge an, wieviel LEDs du abziehen möchtest. Verändere jetzt die Lückenposition, um die Lücke an die richtige Stelle zu rücken.", "conf_leds_layout_frame" : "Klassisches Layout (Rahmen)", "conf_leds_layout_matrix" : "Matrix Layout (LED Wand)", "conf_leds_layout_generatedconf" : "Generierte/Aktuelle LED Konfiguration", @@ -119,6 +119,7 @@ "conf_leds_layout_preview_originTEXT" : "Erstellt von: Textfeld", "conf_leds_layout_preview_originMA" : "Erstellt von: Matrix Layout (LED Wand)", "conf_leds_layout_preview_totalleds" : "LEDs gesamt: $1", + "conf_leds_layout_preview_ledpower" : "Max. Stromstärke: $1 A", "conf_leds_layout_preview_l1" : "Das ist die erste LED (Einspeisung)", "conf_leds_layout_preview_l2" : "Das visualisiert die Richtung des Datenstroms (zweite/dritte LED)", "conf_leds_layout_cl_top" : "Oben", diff --git a/assets/webconfig/i18n/en.json b/assets/webconfig/i18n/en.json index 753dbfc7..24a26ea1 100644 --- a/assets/webconfig/i18n/en.json +++ b/assets/webconfig/i18n/en.json @@ -104,10 +104,10 @@ "conf_leds_optgroup_usb" : "USB", "conf_leds_optgroup_debug" : "Debug", "conf_leds_layout_btn_checklist" : "Show checklist", - "conf_leds_leyout_checkp1" : "The black led is your first led, the first led is the point where you input your data signal.", - "conf_leds_leyout_checkp2" : "The layout is always the front view of your TV, never the back view.", - "conf_leds_leyout_checkp3" : "Make sure the direction is right. The grey leds indicate led number 2 and 3 to visualize the data direction.", - "conf_leds_leyout_checkp4" : "Case Gap: To create a gap, ignore it first when you define Top/Bottom/Left/Right and set afterwards your gap length to remove a amount of leds. Modify the gap position until it matches.", + "conf_leds_layout_checkp1" : "The black led is your first led, the first led is the point where you input your data signal.", + "conf_leds_layout_checkp2" : "The layout is always the front view of your TV, never the back view.", + "conf_leds_layout_checkp3" : "Make sure the direction is right. The grey leds indicate led number 2 and 3 to visualize the data direction.", + "conf_leds_layout_checkp4" : "Case Gap: To create a gap, ignore it first when you define Top/Bottom/Left/Right and set afterwards your gap length to remove a amount of leds. Modify the gap position until it matches.", "conf_leds_layout_frame" : "Classic Layout (LED Frame)", "conf_leds_layout_matrix" : "Matrix Layout (LED Wall)", "conf_leds_layout_generatedconf" : "Generated/Current LED Configuration", @@ -118,7 +118,8 @@ "conf_leds_layout_preview_originCL" : "Created from: Classic Layout (LED Frame)", "conf_leds_layout_preview_originTEXT" : "Created from: Textfield", "conf_leds_layout_preview_originMA" : "Created from: Matrix Layout(LED wall)", - "conf_leds_layout_preview_totalleds" : "Totel LEDs: $1", + "conf_leds_layout_preview_totalleds" : "Amount of LEDs: $1", + "conf_leds_layout_preview_ledpower" : "Max. power consumption: $1 A", "conf_leds_layout_preview_l1" : "This is your first led (input position)", "conf_leds_layout_preview_l2" : "This visualizes the data direction (second/third led)", "conf_leds_layout_cl_top" : "Top", diff --git a/assets/webconfig/i18n/es.json b/assets/webconfig/i18n/es.json index 86f14d7e..1947a352 100644 --- a/assets/webconfig/i18n/es.json +++ b/assets/webconfig/i18n/es.json @@ -94,10 +94,10 @@ "conf_leds_optgroup_usb": "USB", "conf_leds_optgroup_debug": "Depurar", "conf_leds_layout_btn_checklist": "Mostrar lista", - "conf_leds_leyout_checkp1": "El led negro es tu primer led, el primer led es el punto donde introduces tu señal de datos.", - "conf_leds_leyout_checkp2": "La disposición es siempre la vista delantera de tu TV, nunca la visión posterior.", - "conf_leds_leyout_checkp3": "Asegúrate de que la dirección es correcta. Los leds grises indican los led números 2 y 3 para visualizar la dirección de los datos.", - "conf_leds_leyout_checkp4": "Caso Hueco: Para crear un hueco, ignóralo primero cuando definas Superior/Inferior/Izquieda/Derecha y ajusta después su longitud de hueco para eliminar una cantidad de leds. Modifica la posición del hueco hasta que coincida.", + "conf_leds_layout_checkp1": "El led negro es tu primer led, el primer led es el punto donde introduces tu señal de datos.", + "conf_leds_layout_checkp2": "La disposición es siempre la vista delantera de tu TV, nunca la visión posterior.", + "conf_leds_layout_checkp3": "Asegúrate de que la dirección es correcta. Los leds grises indican los led números 2 y 3 para visualizar la dirección de los datos.", + "conf_leds_layout_checkp4": "Caso Hueco: Para crear un hueco, ignóralo primero cuando definas Superior/Inferior/Izquieda/Derecha y ajusta después su longitud de hueco para eliminar una cantidad de leds. Modifica la posición del hueco hasta que coincida.", "conf_leds_layout_frame": "Disposición Clásica (Marco LED)", "conf_leds_layout_matrix": "Disposición de Matriz (Pared LED)", "conf_leds_layout_generatedconf": "Configuración LED Generada/Actual", @@ -109,6 +109,7 @@ "conf_leds_layout_preview_originTEXT": "Creado a partir de: Cuadro de texto", "conf_leds_layout_preview_originMA": "Creado a partir de: Disposición en Matriz (Pared LED)", "conf_leds_layout_preview_totalleds": "Total de LEDs:$1", + "conf_leds_layout_preview_ledpower" : "Máximo consumo de energía: $1 A", "conf_leds_layout_preview_l1": "Este es tu primer led (posición de entrada)", "conf_leds_layout_preview_l2": "Esto visualiza la dirección de datos (segundo/tercer led)", "conf_leds_layout_cl_top": "Superior", diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js index 4175458d..2cc1001f 100644 --- a/assets/webconfig/js/content_leds.js +++ b/assets/webconfig/js/content_leds.js @@ -35,6 +35,7 @@ function createLedPreview(leds, origin){ } $('#previewledcount').html($.i18n('conf_leds_layout_preview_totalleds', leds.length)); + $('#previewledpower').html($.i18n('conf_leds_layout_preview_ledpower', (leds.length * 0.06).toFixed(1))); $('.st_helper').css("border", "8px solid grey"); @@ -498,7 +499,7 @@ $(document).ready(function() { // open checklist $('#leds_prev_checklist').off().on("click", function() { - var liList = [$.i18n('conf_leds_leyout_checkp1'),$.i18n('conf_leds_leyout_checkp3'),$.i18n('conf_leds_leyout_checkp2'),$.i18n('conf_leds_leyout_checkp4')]; + var liList = [$.i18n('conf_leds_layout_checkp1'),$.i18n('conf_leds_layout_checkp3'),$.i18n('conf_leds_layout_checkp2'),$.i18n('conf_leds_layout_checkp4')]; var ul = document.createElement("ul"); ul.className = "checklist"