Diff: Adafruit_ADS1015.cpp

Revision:

6:71b44421e736

Parent:

4:6445a678d458

--- a/Adafruit_ADS1015.cpp	Sat Oct 11 08:45:17 2014 +0000
+++ b/Adafruit_ADS1015.cpp	Thu Sep 01 13:13:35 2016 +0000
@@ -81,6 +81,7 @@
     m_bitShift = 0;
     m_gain = GAIN_TWOTHIRDS; /* +/- 6.144V range (limited to VDD +0.3V max!) */
     m_i2c = i2c;
+    m_i2c->frequency(400000);//1000000
 }
 
 /**************************************************************************/
@@ -167,11 +168,14 @@
 {
     // Start with default values
     uint16_t config = ADS1015_REG_CONFIG_CQUE_NONE    | // Disable the comparator (default val)
-                      ADS1015_REG_CONFIG_CLAT_NONLAT  | // Non-latching (default val)
+                      //ADS1015_REG_CONFIG_CLAT_NONLAT  | // Non-latching (default val)
+                      ADS1015_REG_CONFIG_CLAT_LATCH   |
                       ADS1015_REG_CONFIG_CPOL_ACTVLOW | // Alert/Rdy active low   (default val)
                       ADS1015_REG_CONFIG_CMODE_TRAD   | // Traditional comparator (default val)
-                      ADS1015_REG_CONFIG_DR_1600SPS   | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
-                      ADS1015_REG_CONFIG_MODE_SINGLE;   // Single-shot mode (default)
+                      //ADS1015_REG_CONFIG_DR_1600SPS   | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
+                      ADS1015_REG_CONFIG_DR_3300SPS   |  //3300 or 860(ADS1115)
+                      ADS1015_REG_CONFIG_MODE_CONTIN;
+                      //ADS1015_REG_CONFIG_MODE_SINGLE;   // Single-shot mode (default)
 
     // Set PGA/voltage range
     config |= m_gain;
@@ -267,7 +271,7 @@
                       ADS1015_REG_CONFIG_CLAT_LATCH   | // Latching mode
                       ADS1015_REG_CONFIG_CPOL_ACTVLOW | // Alert/Rdy active low   (default val)
                       ADS1015_REG_CONFIG_CMODE_TRAD   | // Traditional comparator (default val)
-                      ADS1015_REG_CONFIG_DR_1600SPS   | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
+                      ADS1015_REG_CONFIG_DR_3300SPS   | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
                       ADS1015_REG_CONFIG_MODE_CONTIN  | // Continuous conversion mode
                       ADS1015_REG_CONFIG_MODE_CONTIN;   // Continuous conversion mode
 
@@ -323,4 +327,10 @@
         }
         return (int16_t)res;
     }
+}
+
+void Adafruit_ADS1015::user(){
+    
+    writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG , 0b0000001011101111);// 
+  
 }
\ No newline at end of file