X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fntc.c;h=8f03732e33ab1702e561c984dcc1dfe6270cf663;hb=41718ab2098bd5640da265c34f1ecb79a4123d39;hp=2469c88f00ac61514814a8ecdf250d32fa463733;hpb=791e167e053bdd9250d34a9a5ccae6ccde4d6679;p=bertos.git

diff --git a/bertos/drv/ntc.c b/bertos/drv/ntc.c
index 2469c88f..8f03732e 100644
--- a/bertos/drv/ntc.c
+++ b/bertos/drv/ntc.c
@@ -32,8 +32,6 @@
  *
  * \brief Driver for NTC (reads a temperature through an ADC)
  *
- * \version $Id$
- *
  * \author Giovanni Bajo <rasky@develer.com>
  * \author Francesco Sacchi <batt@develer.com>
  *
@@ -43,24 +41,19 @@
  *
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.2  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.1  2005/11/04 17:59:47  bernie
- *#* Import into DevLib.
- *#*
- *#* Revision 1.1  2005/05/24 09:17:58  batt
- *#* Move drivers to top-level.
- *#*/
+#include "hw/hw_ntc.h"
+#include "hw/ntc_map.h"
 
-#include <drv/ntc.h>
-#include <hw_ntc.h>
-#include <ntc_map.h>
+#include "cfg/cfg_ntc.h"
 
+// Define logging setting (for cfg/log.h module).
+#define LOG_LEVEL         CONFIG_NTC_LOG_LEVEL
+#define LOG_VERBOSITY     CONFIG_NTC_LOG_FORMAT
+#include <cfg/log.h>
 #include <cfg/debug.h>
 
+#include <drv/ntc.h>
+
 DB(bool ntc_initialized;)
 
 /**
@@ -113,9 +106,9 @@ deg_t ntc_read(NtcDev dev)
 	const NtcHwInfo* hw = ntc_hw_getInfo(dev);
 	const res_t* r = hw->resistances;
 
-	float rx;
+	res_t rx;
 	size_t i;
-	deg_t degrees;
+	deg_t degrees = 0;
 
 	rx = ntc_hw_read(dev);