From 03cebb5a82385f3018ac393428e188c098bc7fc4 Mon Sep 17 00:00:00 2001 From: Sergey Batalov Date: Tue, 10 May 2011 14:10:56 +1000 Subject: [PATCH] TEMP_RESIDENCY now in units of 10ms rather than next_read_time Signed-off-by: Michael Moon --- temp.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/temp.c b/temp.c index 6a9578b..48923e1 100644 --- a/temp.c +++ b/temp.c @@ -271,18 +271,17 @@ void temp_sensor_tick() { break; } temp_sensors_runtime[i].last_read_temp = temp; + } + if (labs((int16_t)(temp_sensors_runtime[i].last_read_temp - temp_sensors_runtime[i].target_temp)) < (TEMP_HYSTERESIS*4)) { + if (temp_sensors_runtime[i].temp_residency < (TEMP_RESIDENCY_TIME*100)) + temp_sensors_runtime[i].temp_residency++; + } + else { + temp_sensors_runtime[i].temp_residency = 0; + } - if (labs((int16_t)(temp - temp_sensors_runtime[i].target_temp)) < (TEMP_HYSTERESIS*4)) { - if (temp_sensors_runtime[i].temp_residency < (TEMP_RESIDENCY_TIME*100)) - temp_sensors_runtime[i].temp_residency++; - } - else { - temp_sensors_runtime[i].temp_residency = 0; - } - - if (temp_sensors[i].heater < NUM_HEATERS) { - heater_tick(temp_sensors[i].heater, i, temp_sensors_runtime[i].last_read_temp, temp_sensors_runtime[i].target_temp); - } + if (temp_sensors[i].heater < NUM_HEATERS) { + heater_tick(temp_sensors[i].heater, i, temp_sensors_runtime[i].last_read_temp, temp_sensors_runtime[i].target_temp); } } }