Skip to content

Commit 999118f

Browse files
committed
Change scale for bed for temperature
porting json missed this change
1 parent 6b317cc commit 999118f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

esp8266/data/printer.tpl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Updaterange('speed');
170170
Updaterange('flow');
171171
var pulse=true;
172172
var initialization_done = false;
173-
function displaytemp(temperature, target,item){
173+
function displaytemp(temperature, target,item,factor){
174174
var displaypicture = "<svg height=\"30px \" width=\"300px \" xmlns=\"http://wwww.w3.org/2000/svg\">\n<linearGradient id=\"gradient\">\n";
175175
var description = String (temperature) + "/";
176176
if (target>0)description += String (target);
@@ -180,21 +180,21 @@ displaypicture+="<stop class=\"middle\" style=\"stop-color:yellow;\" offset=\"10
180180
displaypicture+="<stop class=\"middle\" style=\"stop-color:yellow;\" offset=\"0%\"/>\n<stop class=\"end\" style=\"stop-color:red;\" offset=\"100%\"/>\n";
181181
displaypicture+="</linearGradient>\n<rect x=\"10\" y=\"4\" width=\"24\" height=\"21\" style=\"fill:url(#gradient)\" />\n";
182182
displaypicture+="<rect x=\"34\" y=\"4\" width=\"280\" height=\"21\" style=\"fill:url(#gradient2)\" />\n<line x1=\"";
183-
displaypicture+=String(parseFloat(target)+10);
183+
displaypicture+=String(parseFloat(target)*factor+10);
184184
displaypicture+="\" y1=\"4\" x2=\"";
185-
displaypicture+=String(parseFloat(target)+10);
185+
displaypicture+=String(parseFloat(target)*factor+10);
186186
displaypicture+="\" y2=\"25\" style=\"stroke:rgb(255,255,255);stroke-width:1\" />\n<path d=\"M";
187-
displaypicture+=String(parseFloat(temperature)+5);
187+
displaypicture+=String(parseFloat(temperature)*factor+5);
188188
displaypicture+=" 0 L";
189-
displaypicture+=String(parseFloat(temperature)+15);
189+
displaypicture+=String(parseFloat(temperature)*factor+15);
190190
displaypicture+=" 0 L";
191-
displaypicture+=String(parseFloat(temperature)+10);
191+
displaypicture+=String(parseFloat(temperature)*factor+10);
192192
displaypicture+=" 8 Z\" stroke=\"white\" stroke-width=\"1\" />\n<path d=\"M";
193-
displaypicture+=String(parseFloat(temperature)+5);
193+
displaypicture+=String(parseFloat(temperature)*factor+5);
194194
displaypicture+=" 30 L";
195-
displaypicture+=String(parseFloat(temperature)+15);
195+
displaypicture+=String(parseFloat(temperature)*factor+15);
196196
displaypicture+=" 30 L";
197-
displaypicture+=String(parseFloat(temperature)+10);
197+
displaypicture+=String(parseFloat(temperature)*factor+10);
198198
displaypicture+=" 22 Z\" stroke=\"white\" stroke-width=\"1\"/>\n<text x=\"30\" y=\"19\" fill=\"black\" style=\"font-family: calibri; font-size:10pt;\">\n";
199199
displaypicture+=description;
200200
displaypicture+=" &#176;C</text>\n</svg>";
@@ -224,7 +224,7 @@ document.getElementById("Extruder1").style.height="auto";
224224
document.getElementById("JogExtruder1-1").style.visibility="visible";
225225
document.getElementById("JogExtruder1-2").style.visibility="visible";
226226
document.getElementById("JogExtruder1-3").style.visibility="visible";
227-
displaytemp(jsonresponse.heater[0].temperature, jsonresponse.heater[0].target,"data_extruder1");
227+
displaytemp(jsonresponse.heater[0].temperature, jsonresponse.heater[0].target,"data_extruder1",1);
228228
Updaterange('1');}
229229
else {
230230
document.getElementById("Extruder1").style.visibility="hidden";
@@ -238,7 +238,7 @@ document.getElementById("Extruder2").style.height="auto";
238238
document.getElementById("JogExtruder2-1").style.visibility="visible";
239239
document.getElementById("JogExtruder2-2").style.visibility="visible";
240240
document.getElementById("JogExtruder2-3").style.visibility="visible";
241-
displaytemp(jsonresponse.heater[1].temperature, jsonresponse.heater[1].target,"data_extruder2");
241+
displaytemp(jsonresponse.heater[1].temperature, jsonresponse.heater[1].target,"data_extruder2",1);
242242
Updaterange('2');}
243243
else {
244244
document.getElementById("Extruder2").style.visibility="hidden";
@@ -249,7 +249,7 @@ document.getElementById("JogExtruder2-3").style.visibility="hidden";}
249249
if(jsonresponse.heater[2].active==1){
250250
document.getElementById("Bed").style.visibility="visible";
251251
document.getElementById("Bed").style.height="auto";
252-
displaytemp(jsonresponse.heater[2].temperature, jsonresponse.heater[2].target,"data_bed");
252+
displaytemp(jsonresponse.heater[2].temperature, jsonresponse.heater[2].target,"data_bed",2);
253253
Updaterange('bed');}
254254
else {
255255
document.getElementById("Bed").style.visibility="hidden";

0 commit comments

Comments
 (0)