Gandalf/OctoPrint-Enclosure
1
0
Fork 0
Code Issues 156 Pull Requests 6 Actions Packages Projects Releases 28 Wiki Activity

handling undefined inputs, correcting autoshut down UI and spelling

Browse Source
This commit is contained in:
de Miranda Henrique
2018-03-01 14:36:53 -06:00
parent dfcc04c864
commit 8fa2bb31af
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
octoprint_enclosure/static/js/enclosure.js
View File

@@ -58,13 +58,15 @@ $(function () {
self.isRegularOutput = function(index_id){
return_value = false;
self.settingsViewModel.settings.plugins.enclosure.rpi_outputs().forEach(function (output) {
if (output.index_id() == index_id && output.output_type() == "regular") {
return_value = true;
return false;
}
});
return return_value;
if (typeof index_id != 'undefined'){
self.settingsViewModel.settings.plugins.enclosure.rpi_outputs().forEach(function (output) {
if (output.index_id() == index_id && output.output_type() == "regular") {
return_value = true;
return false;
}
});
}
return return_value;
};
self.linkedTemperatureControl = function(sensor_index){

6
octoprint_enclosure/templates/enclosure_settings.jinja2
View File

@@ -96,7 +96,7 @@
<input type="checkbox" data-bind="checked: pwm_temperature_linked"> {{ _('Link PWM to Temperature') }}
</label>
<span class="help-inline">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 automatomatically start when a print starts and will default to the default dutu cycle when print is complete.
This output will automatomatically start when a print starts and will default to the default duty cycle when print is complete.
</span>
</div>
</div>
@@ -159,7 +159,7 @@
<!-- /ko -->
<!-- ko if: ($data.output_type() == "pwm" && !$data.pwm_temperature_linked()) -->
<!-- ko ifnot: ($data.output_type() == "pwm" && $data.pwm_temperature_linked()) -->
<!-- ko ifnot: (($data.output_type() == "regular" || $data.output_type() == "pwm") && $data.toggle_timer()) -->
<!-- ko ifnot: ($data.output_type() == "gcode_output" || $data.output_type() == "temperature_alarm" ) -->
<div class="control-group">
@@ -604,7 +604,7 @@
<span class="help-inline">When the event happen, you want control which OUTPUT?</span>
</div>
</div>
<!-- ko if: ($root.isRegularOutput($data.controlled_io())) -->
<!-- ko if: ($root.isRegularOutput($data.controlled_io)) -->
<div class="control-group">
<label class="control-label">Set Controlled IO Value</label>
<div class="controls">

2
octoprint_enclosure/templates/enclosure_tab.jinja2
View File

@@ -189,7 +189,7 @@
</h4>
<!-- /ko -->
<!-- ko if: ($data.output_type() == "pwm" && !$data.pwm_temperature_linked()) -->
<!-- ko ifnot: ($data.output_type() == "pwm" && $data.pwm_temperature_linked()) -->
<!-- ko ifnot: (($data.output_type() == "regular" || $data.output_type() == "pwm") && $data.toggle_timer()) -->
<!-- ko ifnot: ($data.output_type() == "gcode_output" || $data.output_type() == "temperature_alarm") -->
<div>