diff options
| author | Theodore Ateba <tf.ateba@gmail.com> | 2017-10-15 21:37:33 +0000 |
|---|---|---|
| committer | Theodore Ateba <tf.ateba@gmail.com> | 2017-10-15 21:37:33 +0000 |
| commit | 97442e7faaed76d0da347c96df3da2122e033bd1 (patch) | |
| tree | 661fb9f1825c862f19ca795e285961769fe52549 /testex | |
| parent | aada1a7ea622b4a6872051902af219092a9d169f (diff) | |
| download | ChibiOS-97442e7faaed76d0da347c96df3da2122e033bd1.tar.gz ChibiOS-97442e7faaed76d0da347c96df3da2122e033bd1.tar.bz2 ChibiOS-97442e7faaed76d0da347c96df3da2122e033bd1.zip | |
Update EX/BMP085 example according to the BMP085 driver modification.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10831 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testex')
| -rw-r--r-- | testex/STM32/STM32F4xx/I2C-BMP085/main.c | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/testex/STM32/STM32F4xx/I2C-BMP085/main.c b/testex/STM32/STM32F4xx/I2C-BMP085/main.c index fc9c4a8d3..5f2b657dc 100644 --- a/testex/STM32/STM32F4xx/I2C-BMP085/main.c +++ b/testex/STM32/STM32F4xx/I2C-BMP085/main.c @@ -31,9 +31,6 @@ /* Variables and Driver configuration for the demo. */
/*==========================================================================*/
-/* Use to write to the serial driver */
-//static BaseSequentialStream *chp = (BaseSequentialStream*) &SD2;
-
/* BMP085 Driver: This object represent an BMP085 instance. */
static BMP085Driver BMP085D1;
@@ -55,29 +52,20 @@ static const I2CConfig i2cConfig = { };
/**
- * @brief BMP085 Barometer configuration structure.
- */
-static const BMP085BaroConfig bmp085BaroConfig = {
- BMP085_BARO_CT_LOW, /* Pressure conversion time. */
- BMP085_BARO_MODE_LOW, /* BMP085 Mode. */
- BMP085_BARO_OSS_0 /* Oversempling setting. */
-};
-
-/**
- * @brief BMP085 Thermometeer configuration structure.
- */
-static const BMP085ThermoConfig bmp085ThermoConfig = {
- BMP085_THERMO_CT_LOW /* Temperature conversion time */
-};
-
-/**
* @brief BMP085 configuration structure.
*/
static const BMP085Config bmp085Config = {
&I2CD1, /* I2C Driver pointer. */
&i2cConfig, /* I2C Driver configuration. */
- &bmp085BaroConfig, /* BMP085 Baromether configuration. */
- &bmp085ThermoConfig /* BMP085 Thermometer configuration. */
+ NULL, /* Sensibility. */
+ NULL, /* bias. */
+ NULL, /* Output data rate. */
+#if BMP085_USE_ADVANCED || defined(__DOXYGEN__)
+ BMP085_BARO_CT_LOW, /* Pressure conversion time. */
+ BMP085_BARO_MODE_LOW, /* BMP085 Mode. */
+ BMP085_BARO_OSS_0, /* Oversempling setting. */
+ BMP085_THERMO_CT_LOW, /* Temperature conversion time */
+#endif
};
/*==========================================================================*/
|