- changed hazard led temp to 1300

- removed old logging code in oven.py
pull/1/head
jbruce 2018-11-23 18:04:56 -05:00
rodzic 37a58818bb
commit 9d5beab15f
3 zmienionych plików z 5 dodań i 7 usunięć

Wyświetl plik

@ -52,7 +52,7 @@ gpio_sensor_data = 17
spi_sensor_chip_id = 0
### amount of time, in seconds, to wait between reads of the thermocouple
sensor_time_wait = 1
sensor_time_wait = 2
########################################################################
@ -70,7 +70,7 @@ pid_kp = 0.5 # Proportional
sim_t_env = 25.0 # deg C
sim_c_heat = 100.0 # J/K heat capacity of heat element
sim_c_oven = 2000.0 # J/K heat capacity of oven
sim_c_oven = 5000.0 # J/K heat capacity of oven
sim_p_heat = 9450.0 # W heating power of oven
sim_R_o_nocool = 1.0 # K/W thermal resistance oven -> environment
sim_R_o_cool = 0.05 # K/W " with cooling

Wyświetl plik

@ -109,7 +109,6 @@ class Oven (threading.Thread):
else:
runtime_delta = datetime.datetime.now() - self.start_time
self.runtime = runtime_delta.total_seconds()
#log.info("running at %.1f deg C (Target: %.1f) , heat %.2f, (%.1fs/%.0f)" % (self.temp_sensor.temperature, self.target, self.heat, self.runtime, self.totaltime))
self.target = self.profile.get_target_temperature(self.runtime)
pid = self.pid.compute(self.target, self.temp_sensor.temperature)
@ -121,8 +120,6 @@ class Oven (threading.Thread):
heat_off = float(self.time_step * (1 - pid))
time_left = self.totaltime - self.runtime
#import pdb; pdb.set_trace()
log.info("temp=%.1f, target=%.1f, pid=%.3f, heat_on=%.2f, heat_off=%.2f, run_time=%.1f, total_time=%.1f, time_left=%.1f" %
(self.temp_sensor.temperature,
self.target,

Wyświetl plik

@ -175,11 +175,12 @@ function formatDPS(val) {
}
function hazardTemp(){
if (temp_scale == "f") {
return (45 * 9 / 5) + 32
return (1500 * 9 / 5) + 32
}
else {
return 45
return 1500
}
}