rusefi
/
ChibiOS
mirror of https://github.com/rusefi/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missed acquire bus in LSM303DLHC driver 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9754 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Rocco Marco Guglielmi 2016-08-31 17:28:13 +00:00
parent 7e20b9958a
commit f3e61d2cde
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32F207ZG-NUCLEO144/debug/RT-STM32F207ZG-NUCLEO144 (OpenOCD, Flash and Run).launch
View File

@ -39,7 +39,7 @@
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RT-STM32F207ZG-NUCLEO144"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.1984968159"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.114656749"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/RT-STM32F207ZG-NUCLEO144"/>
</listAttribute>

4
demos/STM32/RT-STM32F746ZG-NUCLEO144/debug/RT-STM32F746ZE-NUCLEO144 (OpenOCD, Flash and Run).launch
View File

@ -28,7 +28,7 @@
<stringAttribute key="org.eclipse.cdt.debug.mi.core.DEBUG_NAME" value="arm-none-eabi-gdb"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="Standard"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="true"/>
<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="arm-none-eabi-gdb"/>
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
@ -39,7 +39,7 @@
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RT-STM32F746ZG-NUCLEO144"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.114656749"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="0.603687198"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/RT-STM32F746ZG-NUCLEO144"/>
</listAttribute>

9
os/ex/ST/lsm303dlhc.c
View File

@ -472,6 +472,12 @@ static msg_t acc_set_full_scale(void *ip, lsm303dlhc_acc_fs_t fs) {
scale = newfs / ((LSM303DLHCDriver *)ip)->accfullscale;
((LSM303DLHCDriver *)ip)->accfullscale = newfs;
#if LSM303DLHC_SHARED_I2C
i2cAcquireBus(((LSM303DLHCDriver *)ip)->config->i2cp);
i2cStart(((LSM303DLHCDriver *)ip)->config->i2cp,
((LSM303DLHCDriver *)ip)->config->i2ccfg);
#endif /* LSM303DLHC_SHARED_I2C */
/* Updating register.*/
msg = lsm303dlhcI2CReadRegister(((LSM303DLHCDriver *)ip)->config->i2cp,
LSM303DLHC_SAD_ACC,
@ -486,6 +492,9 @@ static msg_t acc_set_full_scale(void *ip, lsm303dlhc_acc_fs_t fs) {
LSM303DLHC_SAD_ACC, buff, 1);
if(msg != MSG_OK)
return msg;
#if LSM303DLHC_SHARED_I2C
i2cReleaseBus(((LSM303DLHCDriver *)ip)->config->i2cp);
#endif /* LSM303DLHC_SHARED_I2C */
/* Scaling sensitivity and bias. Re-calibration is suggested anyway. */
for(i = 0; i < LSM303DLHC_ACC_NUMBER_OF_AXES; i++) {

20
os/ex/ST/lsm303dlhc.h
View File

@ -41,7 +41,7 @@
/**
* @brief LSM303DLHC driver version string.
*/
#define EX_LSM303DLHC_VERSION "1.0.0"
#define EX_LSM303DLHC_VERSION "1.0.1"
/**
* @brief LSM303DLHC driver version major number.
@ -56,7 +56,7 @@
/**
* @brief LSM303DLHC driver version patch number.
*/
#define EX_LSM303DLHC_PATCH 0
#define EX_LSM303DLHC_PATCH 1
/** @} */
/**
@ -176,14 +176,14 @@
* @{
*/
#define LSM303DLHC_CTRL_REG1_A_MASK 0xFF
#define LSM303DLHC_CTRL_REG1_A_XEN (1 << 0)
#define LSM303DLHC_CTRL_REG1_A_YEN (1 << 1)
#define LSM303DLHC_CTRL_REG1_A_ZEN (1 << 2)
#define LSM303DLHC_CTRL_REG1_A_LPEN (1 << 3)
#define LSM303DLHC_CTRL_REG1_A_ODR0 (1 << 4)
#define LSM303DLHC_CTRL_REG1_A_ODR1 (1 << 5)
#define LSM303DLHC_CTRL_REG1_A_ODR2 (1 << 6)
#define LSM303DLHC_CTRL_REG1_A_ODR3 (1 << 7)
#define LSM303DLHC_CTRL_REG1_A_XEN (1 << 0)
#define LSM303DLHC_CTRL_REG1_A_YEN (1 << 1)
#define LSM303DLHC_CTRL_REG1_A_ZEN (1 << 2)
#define LSM303DLHC_CTRL_REG1_A_LPEN (1 << 3)
#define LSM303DLHC_CTRL_REG1_A_ODR0 (1 << 4)
#define LSM303DLHC_CTRL_REG1_A_ODR1 (1 << 5)
#define LSM303DLHC_CTRL_REG1_A_ODR2 (1 << 6)
#define LSM303DLHC_CTRL_REG1_A_ODR3 (1 << 7)
/** @} */
/**