Revision 3:a8a6b2456e93, committed 2018-09-29

Comitter:

joaomazza

Date:

Sat Sep 29 20:14:06 2018 +0000

Parent:

2:ed14e6196255

Commit message:

Tirei o que era in?til;

Changed in this revision

diff -r ed14e6196255 -r a8a6b2456e93 LSM6DS3.cpp
--- a/LSM6DS3.cpp	Tue Jun 21 20:51:25 2016 +0000
+++ b/LSM6DS3.cpp	Sat Sep 29 20:14:06 2018 +0000
@@ -147,30 +147,6 @@
     intr = (float)data[0];
 }
 
-void LSM6DS3::readTemp()
-{
-    // The data we are going to read from the temp
-    char data[2];
-
-    // Set addresses
-    char subAddressL = OUT_TEMP_L;
-    char subAddressH = OUT_TEMP_H;
-
-    // Write the address we are going to read from and don't end the transaction
-    i2c.write(xgAddress, &subAddressL, 1, true);
-    // Read in register containing the temperature data and alocated to the correct index
-    i2c.read(xgAddress, data, 1);
-    
-    i2c.write(xgAddress, &subAddressH, 1, true);
-    i2c.read(xgAddress, (data + 1), 1);
-
-    // Temperature is a 12-bit signed integer   
-    temperature_raw = data[0] | (data[1] << 8);
-
-    temperature_c = (float)temperature_raw / 16.0 + 25.0;
-    temperature_f = temperature_c * 1.8 + 32.0;
-}
-
 
 void LSM6DS3::readGyro()
 {

diff -r ed14e6196255 -r a8a6b2456e93 LSM6DS3.h
--- a/LSM6DS3.h	Tue Jun 21 20:51:25 2016 +0000
+++ b/LSM6DS3.h	Sat Sep 29 20:14:06 2018 +0000
@@ -160,12 +160,11 @@
     // These values are the RAW signed 16-bit readings from the sensors.
     int16_t gx_raw, gy_raw, gz_raw; // x, y, and z axis readings of the gyroscope
     int16_t ax_raw, ay_raw, az_raw; // x, y, and z axis readings of the accelerometer
-    int16_t temperature_raw;
+
 
     // floating-point values of scaled data in real-world units
     float gx, gy, gz;
     float ax, ay, az;
-    float temperature_c, temperature_f; // temperature in celcius and fahrenheit
     float intr;
 
     
@@ -218,7 +217,6 @@
     *  The combined readings are stored in the class' temperature variables. Read
     *  those _after_ calling readTemp().
     */
-    void readTemp();
     
     /** Read Interrupt **/
     void readIntr();