deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed mbxxx platform

Browse source
This commit is contained in:
stefano pascali 2013-07-11 17:50:15 +02:00 • committed by ismb-pert
parent 10f64c0ce8
commit fcb09d5d30
107 changed files with 2018 additions and 2760 deletions
Download patch file Download diff file Expand all files Collapse all files

20
platform/mbxxx/dev/acc-sensor.c
View file

@ -1,3 +1,8 @@
/**
* \addtogroup mbxxx-platform
*
* @{
*/
/*
* Copyright (c) 2010, STMicroelectronics.
* All rights reserved.
@ -51,7 +56,7 @@
static int
active(void)
{
int8u reg;
uint8_t reg;
if(!i2c_read_reg (kLIS3L02DQ_SLAVE_ADDR,CTRL_REG1, &reg, 1))
return FALSE;
@ -62,8 +67,8 @@ static int
value(int type)
{
int8s i2c_data = 0;
int8u reg_addr;
int8_t i2c_data = 0;
uint8_t reg_addr;
switch(type) {
case ACC_X_AXIS:
@ -82,13 +87,13 @@ value(int type)
return 0;
}
i2c_read_reg(kLIS3L02DQ_SLAVE_ADDR, reg_addr, (int8u *)&i2c_data, 1);
i2c_read_reg(kLIS3L02DQ_SLAVE_ADDR, reg_addr, (uint8_t *)&i2c_data, 1);
if(MEMS_GetFullScale()==ACC_HIGH_RANGE){
return ((int16s)i2c_data)*HIGH_RANGE_SENSITIVITY;
return ((int16_t)i2c_data)*HIGH_RANGE_SENSITIVITY;
}
else {
return ((int16s)i2c_data)*LOW_RANGE_SENSITIVITY;
return ((int16_t)i2c_data)*LOW_RANGE_SENSITIVITY;
}
}
@ -117,7 +122,7 @@ configure(int type, int value)
case ACC_HPF:
if(value < ACC_HPF_DISABLE){
return i2c_write_reg(kLIS3L02DQ_SLAVE_ADDR, CTRL_REG2, (1<<4) | (int8u)value);
return i2c_write_reg(kLIS3L02DQ_SLAVE_ADDR, CTRL_REG2, (1<<4) | (uint8_t)value);
}
else {
return i2c_write_reg(kLIS3L02DQ_SLAVE_ADDR, CTRL_REG2, 0x00);
@ -144,3 +149,4 @@ SENSORS_SENSOR(acc_sensor, ACC_SENSOR,
/** @} */