X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fthermo.c;h=37a1a02a2977bccea5fe5f9537d18819d590404e;hb=ce5ddc07440aeb1357c7133beac6959b90d21885;hp=cfc1014f2211000002e4277df1ab3c9bbc2a2572;hpb=f58b90fce4022247d31d68ba1c0d3a620a9071d8;p=bertos.git

diff --git a/bertos/drv/thermo.c b/bertos/drv/thermo.c
index cfc1014f..37a1a02a 100644
--- a/bertos/drv/thermo.c
+++ b/bertos/drv/thermo.c
@@ -38,8 +38,10 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include "thermo_map.h"
-#include "hw_thermo.h"
+#include "hw/thermo_map.h"
+#include "hw/hw_thermo.h"
+
+#include "cfg/cfg_thermo.h"
 
 #include <cfg/module.h>
 #include <cfg/macros.h>
@@ -51,18 +53,13 @@
 
 
 
-/** Interval at which thermo control is performed. */
-#define THERMO_INTERVAL_MS      100
-
-/** Number of different samples we interpolate over to get the hifi temperature. */
-#define THERMO_HIFI_NUM_SAMPLES 10
 
 /** Timer for thermo-regulation. */
 static Timer thermo_timer;
 
 typedef struct ThermoControlDev
 {
-	deg_t          hifi_samples[THERMO_HIFI_NUM_SAMPLES];
+	deg_t          hifi_samples[CONFIG_THERMO_HIFI_NUM_SAMPLES];
 	deg_t          cur_hifi_sample;
 	deg_t          target;
 	thermostatus_t status;
@@ -95,7 +92,7 @@ static void thermo_do(ThermoDev index)
 
 	// Store the sample into the hifi FIFO buffer for later interpolation
 	dev->hifi_samples[dev->cur_hifi_sample] = cur_temp;
-	if (++dev->cur_hifi_sample == THERMO_HIFI_NUM_SAMPLES)
+	if (++dev->cur_hifi_sample == CONFIG_THERMO_HIFI_NUM_SAMPLES)
 		dev->cur_hifi_sample = 0;
 
 	cur_temp = thermo_readTemperature(index);
@@ -197,7 +194,7 @@ void thermo_start(ThermoDev dev)
 
 	/* Initialize the hifi FIFO with a constant value (the current temperature) */
 	temp = thermo_hw_read(dev);
-	for (i = 0; i < THERMO_HIFI_NUM_SAMPLES; ++i)
+	for (i = 0; i < CONFIG_THERMO_HIFI_NUM_SAMPLES; ++i)
 		devs[dev].hifi_samples[i] = temp;
 	devs[dev].cur_hifi_sample = 0;
 
@@ -237,10 +234,10 @@ deg_t thermo_readTemperature(ThermoDev dev)
 
 	MOD_CHECK(thermo);
 
-	for (i = 0; i < THERMO_HIFI_NUM_SAMPLES; i++)
+	for (i = 0; i < CONFIG_THERMO_HIFI_NUM_SAMPLES; i++)
 		accum += devs[dev].hifi_samples[i];
 
-	return (deg_t)(accum / THERMO_HIFI_NUM_SAMPLES);
+	return (deg_t)(accum / CONFIG_THERMO_HIFI_NUM_SAMPLES);
 }
 
 MOD_DEFINE(thermo)
@@ -258,7 +255,7 @@ void thermo_init(void)
 
 	MOD_INIT(thermo);
 
-	timer_setDelay(&thermo_timer, ms_to_ticks(THERMO_INTERVAL_MS));
-	timer_set_event_softint(&thermo_timer, (Hook)thermo_softint, 0);
+	timer_setDelay(&thermo_timer, ms_to_ticks(CONFIG_THERMO_INTERVAL_MS));
+	timer_setSoftint(&thermo_timer, (Hook)thermo_softint, 0);
 	timer_add(&thermo_timer);
 }