Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Nov 16, 2021. It is now read-only.

Commit 7f37089

Browse files
chrishammchrishamm
committed
Version 1.21.1-b2
Increased precision of the coordinates for the X+Y axes Bug fix: The content of the controllableFans field was not processed correctly Bug fix: Error messages were no longer shown in pop-up notifications
1 parent a0b0a18 commit 7f37089

6 files changed

Lines changed: 17 additions & 34 deletions

File tree

‎DuetWebControl-1.21.1-b1.zip‎

-550 KB
Binary file not shown.

‎DuetWebControl-1.21.1-b2.zip‎

550 KB
Binary file not shown.

‎core/js/comm.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ function updateStatus() {
319319
if (status.hasOwnProperty("controllableFans") && controllableFans != status.controllableFans) {
320320
controllableFans = status.controllableFans;
321321
for(var i = 0; i < maxFans; i++) {
322-
setFanVisibility(i, i & (1 << i));
322+
setFanVisibility(i, (controllableFans & (1 << i)) != 0);
323323
}
324324
}
325325

@@ -490,7 +490,7 @@ function updateStatus() {
490490
}
491491

492492
for(var i = 0; i < status.coords.xyz.length; i++) {
493-
$("td[data-axis='" + i + "']").html(status.coords.xyz[i].toFixed(axisNames[i] == 'Z' ? 2 : 1));
493+
$("td[data-axis='" + i + "']").html(status.coords.xyz[i].toFixed(2));
494494
}
495495

496496
if (geometry == "delta" && axisNames.indexOf("X") != -1 && !status.coords.axesHomed[axisNames.indexOf("X")]) {
@@ -667,7 +667,7 @@ function updateStatus() {
667667
if ((style == "success" && settings.showEmptyResponses) ||
668668
(style == "info" && settings.showInfoMessages) ||
669669
(style == "warning" && settings.showWarningMessages) ||
670-
(style == "error" && settings.showErrorMessages))
670+
(style == "danger" && settings.showErrorMessages))
671671
{
672672
if (response == "") {
673673
showMessage(style, "", "<strong>" + lastSentGCode + "</strong>");

‎core/js/files.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,16 @@ function getFileInfo(directory, filename, callback) {
4242
var path = directory + "/" + filename;
4343
var fileInfo = cachedFileInfo[path];
4444
if (fileInfo == undefined) {
45-
$.ajax(ajaxPrefix + "rr_fileinfo?name=" + encodeURIComponent(directory + "/" + filename), {
45+
// Fileinfo is not available, query it from the board
46+
$.ajax(ajaxPrefix + "rr_fileinfo?name=" + encodeURIComponent(path), {
4647
dataType: "json",
47-
dir: directory,
48-
file: filename,
49-
cb: callback,
48+
timeout: 0,
5049
success: function(response) {
5150
// Add response to cache list
52-
cachedFileInfo[this.dir + "/" + this.file] = response;
51+
cachedFileInfo[path] = response;
5352

5453
// We've got it
55-
this.cb(this.dir, this.file, response);
54+
callback(directory, filename, response);
5655
}
5756
});
5857
} else {

‎core/js/sliders.js‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,32 +78,16 @@ $('#slider_fan_print').slider({
7878
});
7979

8080
function setFanVisibility(fan, visible) {
81-
var visibleFans = $(".table-fan-control [data-fan]:not(.hidden)");
82-
83-
// update selection and check if the whole panel can be hidden
84-
var hideFanControl = false;
85-
if (!visible) {
86-
var firstVisibleFan;
87-
visibleFans.each(function() {
88-
if ($(this).data("fan") != fan) {
89-
firstVisibleFan = $(this);
90-
return false;
91-
}
92-
});
93-
94-
hideFanControl = (firstVisibleFan == undefined);
95-
}
81+
// set visibility of the corresponding control button
82+
$('.table-fan-control [data-fan="' + fan + '"]').toggleClass("hidden", !visible);
9683

97-
$(".fan-control").toggleClass("hidden", hideFanControl);
84+
/*$(".fan-control").toggleClass("hidden", hideFanControl);
9885
if (hideFanControl) {
9986
// Hide entire misc control panel if ATX control is hidden
10087
$("#panel_control_misc").toggleClass("hidden", !settings.showATXControl);
101-
}
102-
103-
// set visibility of control buttons
104-
$('.table-fan-control [data-fan="' + fan + '"]').toggleClass("hidden", !visible);
88+
}*/
10589

106-
// if this fan value is being enforced, undo it
90+
// if this fan's value was being enforced, undo it
10791
setFanOverride(fan, undefined);
10892
}
10993

‎core/reprap.htm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<!-- Duet Web Control v1.21.1-b1
2+
<!-- Duet Web Control v1.21.1-b2
33
44
written by Christian Hammacher
55
@@ -1223,7 +1223,7 @@ <h4 class="text-muted">Connect to your Duet to display Macro files</h4>
12231223
<span class="glyphicon glyphicon-pushpin"></span>
12241224
</button>
12251225
</td>
1226-
<td rowspan="3">
1226+
<td rowspan="9">
12271227
<div class="fan-slider" data-slideout-ignore>
12281228
<input id="slider_fan_control" type="text" title="Set current fan value (via M106)" disabled/>
12291229
</div>
@@ -1503,7 +1503,7 @@ <h4 class="text-muted">Connect to your Duet to display Macro files</h4>
15031503
<span class="glyphicon glyphicon-pushpin"></span>
15041504
</button>
15051505
</td>
1506-
<td rowspan="3">
1506+
<td rowspan="9">
15071507
<div class="fan-slider slider-container" data-slideout-ignore>
15081508
<input id="slider_fan_print" type="text" title="Set current fan value (via M106)" disabled/>
15091509
</div>
@@ -2013,7 +2013,7 @@ <h1 class="text-center text-muted">Connect to your Duet to display Filaments</h1
20132013
</tr>
20142014
<tr>
20152015
<th>Web Interface Version:</th>
2016-
<td id="dwc_version">1.21.1-b1</td>
2016+
<td id="dwc_version">1.21.1-b2</td>
20172017
</tr>
20182018
</table>
20192019
<span id="span_copyright">Web Interface by Christian Hammacher<br/>Licensed under the terms of the <a href="https://www.gnu.org/licenses/gpl-3.0" target="blank">GPL v3</a></span>

0 commit comments

Comments
 (0)