Skip to content

Commit 5061982

Browse files
committed
Fix double temperature output for Marlin_embedded
1 parent 1e14cea commit 5061982

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

index.html.gz

5 Bytes
Binary file not shown.

www/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
var target_firmware = "";
1111
</script>
1212
<script>
13-
var web_ui_version = "2.1b47";
13+
var web_ui_version = "2.1b48";
1414
</script>
1515
<script>
1616
var direct_sd = false;

www/js/app.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,9 @@ function startSocket() {
151151
if ((bytes[i] == 10) || (bytes[i] == 13)) {
152152
wsmsg += msg;
153153
Monitor_output_Update(wsmsg);
154+
//msg = wsmsg.replace("\n", "");
155+
//wsmsg = msg.replace("\r", "");
156+
//console.log(wsmsg);
154157
if ((target_firmware == "grbl-embedded") || (target_firmware == "marlin-embedded")) process_socket_response(msg);
155158
wsmsg = "";
156159
msg = "";

www/js/temperatures.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function get_Temperatures() {
127127
}
128128

129129
function process_Temperatures(response) {
130-
Monitor_output_Update(response);
130+
if (target_firmware != "marlin-embedded") Monitor_output_Update(response);
131131
var regex_temp = /(B|T(\d*)):\s*([+]?[0-9]*\.?[0-9]+)? (\/)([+]?[0-9]*\.?[0-9]+)?/gi;
132132
var result;
133133
var timedata = new Date().getTime();
@@ -224,4 +224,4 @@ function temperature_heatSet(target) {
224224
command += " " + target;
225225
}
226226
SendPrinterCommand(command, true, get_Temperatures);
227-
}
227+
}

0 commit comments

Comments
 (0)