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

- show better estimation of time kiln elements are being heated

Browse Source 
in web client
This commit is contained in:
Jason Bruce 2021-03-29 19:22:35 -04:00
parent 85553ec9d6
commit eb4c212471
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/oven.py
View File

@ -151,6 +151,7 @@ class Oven(threading.Thread):
def run_profile(self, profile, startat=0):
log.info("Running schedule %s" % profile.name)
self.reset()
self.profile = profile
self.totaltime = profile.get_duration()
self.state = "RUNNING"
@ -285,7 +286,7 @@ class SimulatedOven(Oven):
# self.heat is for the front end to display if the heat is on
self.heat = 0.0
if heat_on > 0:
self.heat = 1.0
self.heat = heat_on
log.info("simulation: -> %dW heater: %.0f -> %dW oven: %.0f -> %dW env" % (int(self.p_heat * pid),
self.t_h,
@ -407,13 +408,10 @@ class PID():
if self.ki > 0:
self.iterm += (error * timeDelta * (1/self.ki))
#self.iterm = sorted([-1, self.iterm, 1])[1]
#self.iterm = sorted([-1 * window_size, self.iterm, window_size])[1]
#self.iterm = float(self.iterm / window_size)
dErr = (error - self.lastErr) / timeDelta
output = self.kp * error + self.iterm + self.kd * dErr
out4logs = output
output = sorted([-1 * window_size, output, window_size])[1]
self.lastErr = error
self.lastNow = now
@ -426,6 +424,11 @@ class PID():
# output = 1
output = float(output / window_size)
log.info("pid=%f p=%f i=%f d=%f" % (output,self.kp * error, self.iterm,self.kd * dErr))
if out4logs > 0:
log.info("pid percents pid=%0.2f p=%0.2f i=%0.2f d=%0.2f" % (out4logs,
((self.kp * error)/out4logs)*100,
(self.iterm/out4logs)*100,
((self.kd * dErr)/out4logs)*100))
return output

11
public/assets/js/picoreflow.js
View File

@ -555,8 +555,17 @@ $(document).ready(function()
}
$('#act_temp').html(parseInt(x.temperature));
if (x.heat > 0.5) { $('#heat').addClass("ds-led-heat-active"); } else { $('#heat').removeClass("ds-led-heat-active"); }
//if (x.heat > 0.5) { $('#heat').addClass("ds-led-heat-active"); } else { $('#heat').removeClass("ds-led-heat-active"); }
if (x.heat > 0.0) {
$('#heat').addClass("ds-led-heat-active")
setTimeout(function() { $('#heat').removeClass("ds-led-heat-active") }, (x.heat*1000.0)-50)
}
else {
$('#heat').removeClass("ds-led-heat-active")
}
if (x.cool > 0.5) { $('#cool').addClass("ds-led-cool-active"); } else { $('#cool').removeClass("ds-led-cool-active"); }
if (x.air > 0.5) { $('#air').addClass("ds-led-air-active"); } else { $('#air').removeClass("ds-led-air-active"); }
if (x.temperature > hazardTemp()) { $('#hazard').addClass("ds-led-hazard-active"); } else { $('#hazard').removeClass("ds-led-hazard-active"); }