From ab281e0a65844d893bfcc5cece88acc1c067d87c Mon Sep 17 00:00:00 2001 From: Vitor Henrique Date: Sat, 2 Jan 2021 15:23:36 -0600 Subject: [PATCH] setting up output box --- .../templates/enclosure_settings.jinja2 | 88 +++++++++---------- .../output_editor/gcode_output.jinja2 | 12 ++- .../output_editor/general_info.jinja2 | 4 +- .../templates/output_editor/io_output.jinja2 | 5 +- .../output_editor/main_screen.jinja2 | 4 +- .../output_editor/neopixel_output.jinja2 | 22 ++++- .../output_editor/other_config.jinja2 | 21 +++++ .../templates/output_editor/pwm_output.jinja2 | 50 +++++++++++ .../output_editor/rgb_strip_output.jinja2 | 19 ++++ .../output_editor/schedule_config.jinja2 | 86 ++++++++++++++++++ .../output_editor/shell_script_output.jinja2 | 9 +- .../output_editor/temp_alarm_output.jinja2 | 31 ++++++- .../output_editor/temp_sensor_output.jinja2 | 60 +++++++++++++ 13 files changed, 353 insertions(+), 58 deletions(-) create mode 100644 octoprint_enclosure/templates/output_editor/other_config.jinja2 create mode 100644 octoprint_enclosure/templates/output_editor/schedule_config.jinja2 diff --git a/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2 b/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2 index b5eb478..7ec0d7a 100644 --- a/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2 +++ b/octoprint_enclosure/old_stuff/templates/enclosure_settings.jinja2 @@ -83,13 +83,13 @@ --> -
+ @@ -111,7 +111,7 @@ -
+ -
+ -
+ -
+ @@ -184,7 +184,7 @@ -
+ -
+ -
+ -
+ @@ -264,30 +264,30 @@ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+
@@ -413,7 +413,7 @@
-
+ -
+ -
+
diff --git a/octoprint_enclosure/templates/output_editor/gcode_output.jinja2 b/octoprint_enclosure/templates/output_editor/gcode_output.jinja2 index 4e2fccc..e4852a9 100644 --- a/octoprint_enclosure/templates/output_editor/gcode_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/gcode_output.jinja2 @@ -1,4 +1,12 @@
+ +
+ +
+ + GCODE that will be sent to the printer. You should add + ENTER on the end of every line sent to the printer +
+
- -
+ \ No newline at end of file diff --git a/octoprint_enclosure/templates/output_editor/general_info.jinja2 b/octoprint_enclosure/templates/output_editor/general_info.jinja2 index 4da1e95..189c60b 100644 --- a/octoprint_enclosure/templates/output_editor/general_info.jinja2 +++ b/octoprint_enclosure/templates/output_editor/general_info.jinja2 @@ -64,7 +64,5 @@
- - - + diff --git a/octoprint_enclosure/templates/output_editor/io_output.jinja2 b/octoprint_enclosure/templates/output_editor/io_output.jinja2 index c646d90..1fa4a78 100644 --- a/octoprint_enclosure/templates/output_editor/io_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/io_output.jinja2 @@ -8,14 +8,13 @@
- - +
diff --git a/octoprint_enclosure/templates/output_editor/main_screen.jinja2 b/octoprint_enclosure/templates/output_editor/main_screen.jinja2 index 63c8815..a42746f 100644 --- a/octoprint_enclosure/templates/output_editor/main_screen.jinja2 +++ b/octoprint_enclosure/templates/output_editor/main_screen.jinja2 @@ -17,11 +17,11 @@
- {% include "general_info.jinja2" %} + {% include "output_editor/general_info.jinja2" %}
- {% include "io_output.jinja2" %} + {% include "output_editor/io_output.jinja2" %}
diff --git a/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2 b/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2 index 00afc80..05e6187 100644 --- a/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/neopixel_output.jinja2 @@ -1,5 +1,25 @@
- +
+ +
+ + Number of led's on strip +
+
+
+ +
+ + Value between 0 and 255 +
+
+
+ +
+ + Value needs to follow the format rgb(value_red,value_green,value_blue) where values should be between 0 and 255 +
+
diff --git a/octoprint_enclosure/templates/output_editor/other_config.jinja2 b/octoprint_enclosure/templates/output_editor/other_config.jinja2 new file mode 100644 index 0000000..2bcefb1 --- /dev/null +++ b/octoprint_enclosure/templates/output_editor/other_config.jinja2 @@ -0,0 +1,21 @@ +
+ +
+
+ + If you plan to use a physical button (INPUT) and want to hide the button from enclosure tab check this. +
+
+ +
+
+ + Add shortcut on navbar to toggle output +
+
+ +
\ No newline at end of file diff --git a/octoprint_enclosure/templates/output_editor/pwm_output.jinja2 b/octoprint_enclosure/templates/output_editor/pwm_output.jinja2 index 4e2fccc..aa1731e 100644 --- a/octoprint_enclosure/templates/output_editor/pwm_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/pwm_output.jinja2 @@ -1,4 +1,54 @@
+
+
+ + Link PWM ouput to temperature. PWM output will be interpolated between the point from duty A, temperature A -> duty + B, temperature B. This output will automatically start when a print starts and will default to the default + duty cycle when print is complete. + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + Value is in Hz +
+
+
+ +
+ + Value is in percentage, between 0 and 100 +
+
+
diff --git a/octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2 b/octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2 index 4e2fccc..8049f62 100644 --- a/octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/rgb_strip_output.jinja2 @@ -1,4 +1,23 @@
+
+ +
+ + Choose any GPIO pin to provide the Clock signal +
+ +
+ + Choose any GPIO pin to provide the Data +
+
+
+ +
+ + Value needs to follow the format rgb(value_red,value_green,value_blue) where values should be between 0 and 255 +
+
diff --git a/octoprint_enclosure/templates/output_editor/schedule_config.jinja2 b/octoprint_enclosure/templates/output_editor/schedule_config.jinja2 new file mode 100644 index 0000000..683171a --- /dev/null +++ b/octoprint_enclosure/templates/output_editor/schedule_config.jinja2 @@ -0,0 +1,86 @@ +
+ +
+
+ + Toggle output every amount of seconds. It will start when the print starts and stop when + print is complete. For + PWM pins it will use the default PWM value when ON. + +
+
+ +
+ +
+ + Time in seconds that the GPIO will remain ON +
+
+
+ +
+ + Time in seconds that the GPIO will remain when OFF +
+
+ +
+
+ + Choose if output should turn on automatically when OctoPrint starts +
+
+
+
+ + Choose if output should turn on automatically when print starts +
+
+ +
+
+ +
+ + Time delay in seconds to turn on GPIO when print starts +
+
+
+ +
+
+ + Choose if output should turn off automatically when print finishes +
+
+ +
+
+ + Choose if output should turn off automatically when print is canceled or fails +
+
+ +
+
+ +
+ + Time delay in seconds to turn on GPIO when print finishes. + Attention +
+
+
+ +
\ No newline at end of file diff --git a/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2 b/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2 index 4e2fccc..baf2a4e 100644 --- a/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/shell_script_output.jinja2 @@ -1,4 +1,11 @@
+
+ +
+ + Shell script to be executed +
+
-
+ \ No newline at end of file diff --git a/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2 b/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2 index 00afc80..987a201 100644 --- a/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/temp_alarm_output.jinja2 @@ -1,5 +1,32 @@
+
+
+ +
+ + Set temperature that will trigger the event +
+
+
+ +
+ + When the event happen, you want control which IO? +
+
+
+ +
+ + When the event happen, you want to turn the controlled IO HIGH or LOW? +
+
+
- -
+ \ No newline at end of file diff --git a/octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2 b/octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2 index d5e38cf..f83de96 100644 --- a/octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2 +++ b/octoprint_enclosure/templates/output_editor/temp_sensor_output.jinja2 @@ -1,3 +1,63 @@
+
+ +
+ + Temperature sensor responsible for geting the value to be used. Configured on the input side of the plugin. +
+
+ +
+ +
+ + Temperature sensor responsible for getting the value to be used. Configured on the input side of the plugin. +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+ +
+ + Default temperature / humidity that temperature control will be set when the print starts or the server starts. +
+
+ +
+ +
+ + Allowable drift on temperature / humidity control. Set it to zero to disable. +
+
+ +
+ +
+ + Maximum temperature that the enclosure should reach, if this temperature is hit, the heater will be disabled until + it's set temperature is set again. +
+