q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow switching off the heaters via the profiles again 

Closes #240
(cherry picked from commit f6173e7)
master
Gina Häußge 2013-08-29 20:25:32 +02:00
parent 4ab3e5424e
commit 7155661259
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
octoprint/static/js/app/viewmodels/temperature.js
View File

@ -154,6 +154,10 @@ function TemperatureViewModel(loginStateViewModel, settingsViewModel) {
self._updateTemperature(self.newTemp(), "temp", function(){self.targetTemp(self.newTemp()); self.newTemp("");});
};
self.setTempToZero = function() {
self._updateTemperature(0, "temp", function(){self.targetTemp(0); self.newTemp("");});
}
self.setBedTempFromProfile = function(profile) {
self._updateTemperature(profile.bed, "bedTemp");
}
@ -162,6 +166,10 @@ function TemperatureViewModel(loginStateViewModel, settingsViewModel) {
self._updateTemperature(self.newBedTemp(), "bedTemp", function() {self.bedTargetTemp(self.newBedTemp()); self.newBedTemp("");});
};
self.setBedTempToZero = function() {
self._updateTemperature(0, "bedTemp", function() {self.bedTargetTemp(0); self.newBedTemp("");});
}
self._updateTemperature = function(temp, type, callback) {
var data = {};
data[type] = temp;

4
octoprint/templates/index.jinja2
View File

@ -275,7 +275,7 @@
<!-- /ko -->
<li class="divider"></li>
<li>
<a href="#" data-bind="click: function() { $root.setTemp(0); }">Off</a>
<a href="#" data-bind="click: function() { $root.setTempToZero(); }">Off</a>
</li>
</ul>
</div>
@ -307,7 +307,7 @@
<!-- /ko -->
<li class="divider"></li>
<li>
<a href="#" data-bind="click: function(){ $root.setBedTemp(0); }">Off</a>
<a href="#" data-bind="click: function(){ $root.setBedTempToZero(); }">Off</a>
</li>
</ul>
</div>