PolyCraft/kiln-controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated display + target temp

Browse Source
This commit is contained in:
chrono 2013-11-24 18:54:23 +01:00
parent 117c0571ea
commit aca533ae80
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/assets/css/picoreflow.css
View File

@ -7,8 +7,9 @@
display: inline-block;
text-align: right;
padding-right: 10px;
font-size: 24px;
font-size: 20px;
height: 35px;
width: 80px;
vertical-align: middle;
color: #d8d3c5;
font-weight: normal;

13
public/index.html
View File

@ -23,8 +23,8 @@
<!-- Static navbar -->
<div class="navbar navbar-default" role="navigation">
<div class="pull-left" style="margin: 14px">
<span id="act_temp" class="display">- °C</span>
<span class="display">- °C</span>
<span id="act_temp" class="display" style="color: #75890c">25 &deg;C</span>
<span id="target_temp" class="display">OFF</span>
<span id="state" class="display">Idle</span>
<span class="display">-</span>
</div>
@ -536,7 +536,16 @@ $(function() {
$('#state').html(state);
updateProgress(parseInt(parseFloat(x.runtime)/parseFloat(x.totaltime)*100));
$('#act_temp').html(Highcharts.numberFormat(x.temperature, 0) + ' \xB0C');
if (x.target == 0)
{
$('#target_temp').html('OFF');
}
else
{
$('#target_temp').html(Highcharts.numberFormat(x.target, 0) + ' \xB0C');
}
//console.log (e.data);
//console.log('Percent finished:' + perc);