IMU LSM9DS1 Library
Fork of LSM9DS1_Library by
Revision 3:585984c4a4b1, committed 2016-07-19
- Comitter:
- afmiee
- Date:
- Tue Jul 19 20:53:34 2016 +0000
- Parent:
- 2:fbee92c6190d
- Child:
- 4:e1404cbaf2a9
- Commit message:
- Made some corrections to library
Changed in this revision
| LSM9DS1.cpp | Show annotated file Show diff for this revision Revisions of this file |
| LSM9DS1_Types.h | Show annotated file Show diff for this revision Revisions of this file |
--- a/LSM9DS1.cpp Fri Jul 15 22:37:51 2016 +0000
+++ b/LSM9DS1.cpp Tue Jul 19 20:53:34 2016 +0000
@@ -326,7 +326,7 @@
// is good practice.
void LSM9DS1::calibrate(bool autoCalc)
{
- uint8_t data[6] = {0, 0, 0, 0, 0, 0};
+ //uint8_t data[6] = {0, 0, 0, 0, 0, 0};
uint8_t samples = 0;
int ii;
int32_t aBiasRawTemp[3] = {0, 0, 0};
--- a/LSM9DS1_Types.h Fri Jul 15 22:37:51 2016 +0000
+++ b/LSM9DS1_Types.h Tue Jul 19 20:53:34 2016 +0000
@@ -113,14 +113,14 @@
enum interrupt_generators
{
- INT_DRDY_XL = (1<<0), // Accelerometer data ready (INT1 & INT2)
- INT_DRDY_G = (1<<1), // Gyroscope data ready (INT1 & INT2)
+ INT2_DRDY_XL = (1<<0), // Accelerometer data ready (INT1 & INT2)
+ INT2_DRDY_G = (1<<1), // Gyroscope data ready (INT1 & INT2)
INT1_BOOT = (1<<2), // Boot status (INT1)
INT2_DRDY_TEMP = (1<<2),// Temp data ready (INT2)
INT_FTH = (1<<3), // FIFO threshold interrupt (INT1 & INT2)
INT_OVR = (1<<4), // Overrun interrupt (INT1 & INT2)
INT_FSS5 = (1<<5), // FSS5 interrupt (INT1 & INT2)
- INT_IG_XL = (1<<6), // Accel interrupt generator (INT1)
+ INT1_IG_XL = (1<<6), // Accel interrupt generator (INT1)
INT1_IG_G = (1<<7), // Gyro interrupt enable (INT1)
INT2_INACT = (1<<7), // Inactivity interrupt output (INT2)
};
@@ -133,7 +133,8 @@
YHIE_XL = (1<<3),
ZLIE_XL = (1<<4),
ZHIE_XL = (1<<5),
- GEN_6D = (1<<6)
+ SIXD = (1<<6),
+ AOI_XL = (1<<7)
};
enum gyro_interrupt_generator
@@ -161,8 +162,8 @@
enum pp_od
{
- INT_PUSH_PULL,
- INT_OPEN_DRAIN
+ INT_OPEN_DRAIN,
+ INT_PUSH_PULL
};
enum fifoMode_type
