projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lm3s1968: improve the example with GUI enhancements, keypad driver and menu.
[bertos.git]
/
bertos
/
drv
/
lm75.c
diff --git
a/bertos/drv/lm75.c
b/bertos/drv/lm75.c
index 845fa3a49c3941545cb87c485406e830104b7ff7..db8f8a9420c04755668c35bb07eb988cb604e556 100644
(file)
--- a/
bertos/drv/lm75.c
+++ b/
bertos/drv/lm75.c
@@
-43,6
+43,7
@@
#include "cfg/cfg_lm75.h"
#include <cfg/debug.h>
#include "cfg/cfg_lm75.h"
#include <cfg/debug.h>
+#include <cfg/module.h>
// Define logging setting (for cfg/log.h module).
#define LOG_LEVEL LM75_LOG_LEVEL
// Define logging setting (for cfg/log.h module).
#define LOG_LEVEL LM75_LOG_LEVEL
@@
-51,10
+52,11
@@
#include <cfg/log.h>
#include <drv/i2c.h>
#include <cfg/log.h>
#include <drv/i2c.h>
+#include <drv/ntc.h> // Macro and data type to manage celsius degree
#define SELECT_ADDRESS(addr) LM75_ADDRESS_BYTE | (addr << 1)
#define SELECT_ADDRESS(addr) LM75_ADDRESS_BYTE | (addr << 1)
-de
ci_celsius_t lm75_read(addr
_t sens_addr)
+de
g_t lm75_read(uint8
_t sens_addr)
{
uint8_t data[2];
int16_t degree;
{
uint8_t data[2];
int16_t degree;
@@
-63,10
+65,10
@@
deci_celsius_t lm75_read(addr_t sens_addr)
i2c_start_w(SELECT_ADDRESS(sens_addr));
i2c_put(LM75_PAD_BYTE);
i2c_start_r(SELECT_ADDRESS(sens_addr));
i2c_start_w(SELECT_ADDRESS(sens_addr));
i2c_put(LM75_PAD_BYTE);
i2c_start_r(SELECT_ADDRESS(sens_addr));
- i2c_recv(
&
data, sizeof(data));
+ i2c_recv(data, sizeof(data));
- degree = (
u
int16_t)data[0];
- deci_degree = (
u
int16_t)(((data[1] >> 7) & 1 ) * 5);
+ degree = (int16_t)data[0];
+ deci_degree = (int16_t)(((data[1] >> 7) & 1 ) * 5);
LOG_INFO("[%d.%d C]\n", degree, deci_degree);
LOG_INFO("[%d.%d C]\n", degree, deci_degree);
@@
-75,9
+77,8
@@
deci_celsius_t lm75_read(addr_t sens_addr)
void lm75_init(void)
{
void lm75_init(void)
{
- i2c_init();
- LOG_INFO("Init I2C module.\n");
-
+ // Check dependence
+ MOD_CHECK(i2c);
LM75_HW_INIT();
}
LM75_HW_INIT();
}