mirror
/
kilnController
kopia lustrzana https://github.com/botheredbybees/kilnController
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fixed progressbar regression when going idle

MAX31855-EH
chrono 2013-11-30 12:26:05 +01:00
rodzic f278cc6d51
commit bfa9d278fd
2 zmienionych plików z 13 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

11
public/assets/js/picoreflow.js
Wyświetl plik

@ -281,16 +281,23 @@ $(document).ready(function()
{
selected_profile_name = x.profile.name;
}
$.each(x.log, function(i,v) {
graph.live.data.push([v.runtime, v.temperature]);
graph.plot = $.plot("#graph_container", [ graph.profile, graph.live ] , getOptions());
});
}
if(state!="EDIT")
{
state = x.state;
if (state!=state_last)
{
if(state_last == "RUNNING")
updateProgress(0);
}
if(state=="RUNNING")
{
$("#nav_start").hide();
@ -321,6 +328,8 @@ $(document).ready(function()
$('#air').css("background-color", (x.air > 0.5 ? "rgba(240, 199, 67, 0.84)" : "rgba(46, 38, 12, 0.62)") );
$('#cool').css("background-color", (x.cool > 0.5 ? "rgba(74, 159, 255, 0.84)" : "rgba(12, 28, 46, 0.62)") );
state_last = state;
}
};

6
public/index.html
Wyświetl plik

@ -27,9 +27,9 @@
<div id="main_status">
<div class="pull-left" style="margin: 14px">
<span id="act_temp" class="display ds-num" style="color: #75890c">25 &deg;C</span>
<span id="target_temp" class="display ds-num">OFF</span>
<span id="state" class="display ds-num" style="text-align: center; padding-right:0">Idle</span>
<span id="act_temp" class="display ds-num">25 &deg;C</span>
<span id="target_temp" class="display ds-num" style="color: #75890c">OFF</span>
<span id="state" class="display ds-num" style="width: 110px; text-align: center; padding-right:0">Idle</span>
<span id="heat" class="display ds-led" style="width: 35px; background: rgba(46, 12, 12, 0.62)">&#110;</span>
<span id="air" class="display ds-led" style="width: 35px; background: rgba(46, 38, 12, 0.62)">&#116;</span>
<span id="cool" class="display ds-led" style="width: 35px; background: rgba(12, 28, 46, 0.62)">&#44;</span>