Added essential register values

Author: microbuilder

Adafruit_LSM9DS0.cpp

@@ -20,7 +20,6 @@
 // default
 Adafruit_LSM9DS0::Adafruit_LSM9DS0() {
   _i2c = true;
-
 }
 
 Adafruit_LSM9DS0::Adafruit_LSM9DS0(int8_t xmcs, int8_t gcs) {
@@ -45,7 +44,6 @@ bool Adafruit_LSM9DS0::begin()
 {
   if (_i2c) {
     Wire.begin();
-    
   } else if (_clk == -1) {
     // Hardware SPI
     pinMode(_csxm, OUTPUT);
@@ -75,7 +73,7 @@ bool Adafruit_LSM9DS0::begin()
   if (id != LSM9DS0_XM_ID) 
     return false;
 
-   id = read8(GYROTYPE, LSM9DS0_REGISTER_WHO_AM_I_G);
+  id = read8(GYROTYPE, LSM9DS0_REGISTER_WHO_AM_I_G);
   Serial.print ("G whoami: 0x");
   Serial.println(id, HEX);
   if (id != LSM9DS0_G_ID) 
@@ -177,7 +175,7 @@ void Adafruit_LSM9DS0::read()
   magData.orientation = 0.0;
 }
 
-void Adafruit_LSM9DS0::setMagGain(lsm9ds0MagGain gain)
+void Adafruit_LSM9DS0::setMagGain(lsm9ds0MagGain_t gain)
 {
 
 }

Adafruit_LSM9DS0.h

@@ -75,52 +75,88 @@ class Adafruit_LSM9DS0
       LSM9DS0_REGISTER_OUT_Z_L_A           = 0x2C,
       LSM9DS0_REGISTER_OUT_Z_H_A           = 0x2D,
     } lsm9ds0MagAccelRegisters_t;
+
+    typedef enum
+    {
+      LSM9DS0_ACCELRANGE_2G                = (0b000 << 3),
+      LSM9DS0_ACCELRANGE_4G                = (0b001 << 3),
+      LSM9DS0_ACCELRANGE_6G                = (0b010 << 3),
+      LSM9DS0_ACCELRANGE_8G                = (0b011 << 3),
+      LSM9DS0_ACCELRANGE_16G               = (0b100 << 3)
+    } lsm9ds0AccelRange_t;
+    
+    typedef enum
+    {
+      LSM9DS0_ACCELDATARATE_POWERDOWN      = (0b0000 << 4),
+      LSM9DS0_ACCELDATARATE_3_125HZ        = (0b0001 << 4),
+      LSM9DS0_ACCELDATARATE_6_25HZ         = (0b0010 << 4),
+      LSM9DS0_ACCELDATARATE_12_5HZ         = (0b0011 << 4),
+      LSM9DS0_ACCELDATARATE_25HZ           = (0b0100 << 4),
+      LSM9DS0_ACCELDATARATE_50HZ           = (0b0101 << 4),
+      LSM9DS0_ACCELDATARATE_100HZ          = (0b0110 << 4),
+      LSM9DS0_ACCELDATARATE_200HZ          = (0b0111 << 4),
+      LSM9DS0_ACCELDATARATE_400HZ          = (0b1000 << 4),
+      LSM9DS0_ACCELDATARATE_800HZ          = (0b1001 << 4),
+      LSM9DS0_ACCELDATARATE_1600HZ         = (0b1010 << 4)
+    } lm9ds0AccelDataRate_t;
 
     typedef enum
     {
-  	/*
-  	LSM9DS0_MAGGAIN_1_3                        = 0x20,  // +/- 1.3
-  	LSM9DS0_MAGGAIN_1_9                        = 0x40,  // +/- 1.9
-  	LSM9DS0_MAGGAIN_2_5                        = 0x60,  // +/- 2.5
-  	LSM9DS0_MAGGAIN_4_0                        = 0x80,  // +/- 4.0
-  	LSM9DS0_MAGGAIN_4_7                        = 0xA0,  // +/- 4.7
-  	LSM9DS0_MAGGAIN_5_6                        = 0xC0,  // +/- 5.6
-  	LSM9DS0_MAGGAIN_8_1                        = 0xE0   // +/- 8.1
-  	*/
-    } lsm9ds0MagGain;	
+      LSM9DS0_MAGGAIN_2GAUSS               = (0b00 << 5),  // +/- 2 gauss
+      LSM9DS0_MAGGAIN_4GAUSS               = (0b01 << 5),  // +/- 4 gauss
+      LSM9DS0_MAGGAIN_8GAUSS               = (0b10 << 5),  // +/- 8 gauss
+      LSM9DS0_MAGGAIN_12GAUSS              = (0b11 << 5)   // +/- 12 gauss
+    } lsm9ds0MagGain_t;
+    
+    typedef enum
+    {
+      LSM9DS0_MAGDATARATE_3_125HZ          = (0b000 << 2),
+      LSM9DS0_MAGDATARATE_6_25HZ           = (0b001 << 2),
+      LSM9DS0_MAGDATARATE_12_5HZ           = (0b010 << 2),
+      LSM9DS0_MAGDATARATE_25HZ             = (0b011 << 2),
+      LSM9DS0_MAGDATARATE_50HZ             = (0b100 << 2),
+      LSM9DS0_MAGDATARATE_100HZ            = (0b101 << 2)
+    } lsm9ds0MagDataRate_t;
+
+    typedef enum
+    {
+      LSM9DS0_GYROSCALE_245DPS             = (0b00 << 4),  // +/- 245 degrees per second rotation
+      LSM9DS0_GYROSCALE_500DPS             = (0b01 << 4),  // +/- 500 degrees per second rotation
+      LSM9DS0_GYROSCALE_2000DPS            = (0b10 << 4)   // +/- 2000 degrees per second rotation
+    } lsm9ds0GyroScale_t;
 
     typedef struct lsm9ds0AccelData_s
     {
       float x;
       float y;
       float z;
-    } lsm9ds0AccelData;
+    } lsm9ds0AccelData_t;
 
     typedef struct lsm9ds0GyroData_s
     {
       float x;
       float y;
       float z;
-    } lsm9ds0GyroData;
+    } lsm9ds0GyroData_t;
 
     typedef struct lsm9ds0MagData_s
     {
       float x;
       float y;
       float z;
       float orientation;
-    } lsm9ds0MagData;
+    } lsm9ds0MagData_t;
 
-    lsm9ds0AccelData accelData;    // Last read accelerometer data will be available here
-    lsm9ds0MagData   magData;      // Last read magnetometer data will be available here
-    lsm9ds0GyroData  gyroData;     // Last read gyroscope data will be available here
+    lsm9ds0AccelData_t accelData;    // Last read accelerometer data will be available here
+    lsm9ds0MagData_t   magData;      // Last read magnetometer data will be available here
+    lsm9ds0GyroData_t  gyroData;     // Last read gyroscope data will be available here
 
-    bool    begin ( void );
-    void    read ( void );
-    void    setMagGain ( lsm9ds0MagGain gain );
-    void    write8 ( boolean type, byte reg, byte value );
-    byte    read8 ( boolean type, byte reg );
-    uint8_t spixfer ( uint8_t data );
+    bool    begin      ( void );
+    void    read       ( void );
+    void    setMagGain ( lsm9ds0MagGain_t gain );
+    void    write8     ( boolean type, byte reg, byte value );
+    byte    read8      ( boolean type, byte reg );
+    uint8_t spixfer    ( uint8_t data );
 
   private:
     boolean _i2c;