removed X-NUCLEO-COMMON and ST-INTERFACES
Dependents: unh-hackathon-example unh-hackathon-example-raw
Fork of X_NUCLEO_IKS01A1 by
Revision 79:b8233a6518f2, committed 2015-08-31
- Comitter:
- Wolfgang Betz
- Date:
- Mon Aug 31 12:07:22 2015 +0200
- Parent:
- 78:d6f1f7054b91
- Child:
- 80:f6797ece194f
- Commit message:
- Rename 'pressure_sensor' in 'pt_sensor'
Changed in this revision
x_nucleo_iks01a1.cpp | Show annotated file Show diff for this revision Revisions of this file |
x_nucleo_iks01a1.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/x_nucleo_iks01a1.cpp Mon Aug 17 09:05:00 2015 +0200 +++ b/x_nucleo_iks01a1.cpp Mon Aug 31 12:07:22 2015 +0200 @@ -50,7 +50,7 @@ X_NUCLEO_IKS01A1::X_NUCLEO_IKS01A1(DevI2C *ext_i2c) : dev_i2c(ext_i2c), ht_sensor(new HTS221(*dev_i2c)), magnetometer(new LIS3MDL(*dev_i2c)), - pressure_sensor(new LPS25H(*dev_i2c)), + pt_sensor(new LPS25H(*dev_i2c)), gyro_lsm6ds0(new LSM6DS0(*dev_i2c)), gyro_lsm6ds3(new LSM6DS3(*dev_i2c, IKS01A1_PIN_FF)) { @@ -156,11 +156,11 @@ PRESSURE_InitTypeDef InitStructure; /* Check presence */ - if((pressure_sensor->ReadID(&p_id) != PRESSURE_OK) || + if((pt_sensor->ReadID(&p_id) != PRESSURE_OK) || (p_id != I_AM_LPS25H)) { - delete pressure_sensor; - pressure_sensor = NULL; + delete pt_sensor; + pt_sensor = NULL; return true; } @@ -172,7 +172,7 @@ InitStructure.PressureResolution = LPS25H_P_RES_AVG_32; InitStructure.TemperatureResolution = LPS25H_T_RES_AVG_16; - if(pressure_sensor->Init(&InitStructure) != PRESSURE_OK) + if(pt_sensor->Init(&InitStructure) != PRESSURE_OK) { return false; }
--- a/x_nucleo_iks01a1.h Mon Aug 17 09:05:00 2015 +0200 +++ b/x_nucleo_iks01a1.h Mon Aug 31 12:07:22 2015 +0200 @@ -63,7 +63,7 @@ * The expansion board is featuring basically four IPs:\n * -# a HTS221 Relative Humidity and Temperature Sensor\n * -# a LIS3MDL 3-Axis Magnetometer\n - * -# a LPS25H MEMS Pressure Sensor\n + * -# a LPS25H MEMS Pressure Sensor (and Temperature Sensor)\n * -# and a LSM6DS0 3D Acceleromenter and 3D Gyroscope\n * * The expansion board features also a DIL 24-pin socket which makes it possible @@ -121,7 +121,7 @@ HTS221 *ht_sensor; LIS3MDL *magnetometer; - LPS25H *pressure_sensor; + LPS25H *pt_sensor; GyroSensor *GetGyroscope(void) { return ((gyro_lsm6ds3 == NULL) ?