Skip to content

Commit 778435f

Browse files
committed
Better initialization for temperature input
take / display target temperature so it is more easy for modification as cursor/input is the starting point Better factor for displaying temperature cursor (extruder and bed)
1 parent 999118f commit 778435f

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

esp8266/data/printer.tpl

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,14 @@ document.getElementById("status-text").innerHTML=status;
218218
}
219219
220220
function dispatchstatus(jsonresponse){
221+
var temp=0;
221222
if(jsonresponse.heater[0].active==1){
222223
document.getElementById("Extruder1").style.visibility="visible";
223224
document.getElementById("Extruder1").style.height="auto";
224225
document.getElementById("JogExtruder1-1").style.visibility="visible";
225226
document.getElementById("JogExtruder1-2").style.visibility="visible";
226227
document.getElementById("JogExtruder1-3").style.visibility="visible";
227-
displaytemp(jsonresponse.heater[0].temperature, jsonresponse.heater[0].target,"data_extruder1",1);
228+
displaytemp(jsonresponse.heater[0].temperature, jsonresponse.heater[0].target,"data_extruder1",1.03);
228229
Updaterange('1');}
229230
else {
230231
document.getElementById("Extruder1").style.visibility="hidden";
@@ -238,7 +239,7 @@ document.getElementById("Extruder2").style.height="auto";
238239
document.getElementById("JogExtruder2-1").style.visibility="visible";
239240
document.getElementById("JogExtruder2-2").style.visibility="visible";
240241
document.getElementById("JogExtruder2-3").style.visibility="visible";
241-
displaytemp(jsonresponse.heater[1].temperature, jsonresponse.heater[1].target,"data_extruder2",1);
242+
displaytemp(jsonresponse.heater[1].temperature, jsonresponse.heater[1].target,"data_extruder2",1.03);
242243
Updaterange('2');}
243244
else {
244245
document.getElementById("Extruder2").style.visibility="hidden";
@@ -249,7 +250,7 @@ document.getElementById("JogExtruder2-3").style.visibility="hidden";}
249250
if(jsonresponse.heater[2].active==1){
250251
document.getElementById("Bed").style.visibility="visible";
251252
document.getElementById("Bed").style.height="auto";
252-
displaytemp(jsonresponse.heater[2].temperature, jsonresponse.heater[2].target,"data_bed",2);
253+
displaytemp(jsonresponse.heater[2].temperature, jsonresponse.heater[2].target,"data_bed",2.15);
253254
Updaterange('bed');}
254255
else {
255256
document.getElementById("Bed").style.visibility="hidden";
@@ -283,6 +284,21 @@ document.getElementById("numberinputspeed").value=jsonresponse.speed;
283284
Updaterange('speed');
284285
document.getElementById("numberinputflow").value=jsonresponse.flow;
285286
Updaterange('flow');
287+
if(jsonresponse.heater[0].active==1){
288+
if (jsonresponse.heater[0].target.length==0)temp=0;
289+
else temp = parseInt(jsonresponse.heater[0].target);
290+
document.getElementById("numberinput1").value= temp;
291+
Updaterange('1');}
292+
if(jsonresponse.heater[1].active==1){
293+
if (jsonresponse.heater[1].target.length==0)temp=0;
294+
else temp = parseInt(jsonresponse.heater[1].target);
295+
document.getElementById("numberinput2").value=temp;
296+
Updaterange('2');}
297+
if(jsonresponse.heater[2].active==1){
298+
if (jsonresponse.heater[2].target.length==0)temp=0;
299+
else temp = parseInt(jsonresponse.heater[2].target);
300+
document.getElementById("numberinputbed").value=temp;
301+
Updaterange('bed');}
286302
initialization_done=true;}
287303
document.getElementById("currentspeed").innerHTML=jsonresponse.speed + "%";
288304
document.getElementById("currentflow").innerHTML=jsonresponse.flow + "%";

0 commit comments

Comments
 (0)