BAP TUDelft / ADS1015

Library for the ADS1015 and ADS1115 ADCS

Fork of ADS1015 by Momo-Medical

Diff: Adafruit_ADS1015.cpp

Revision:
6:e6fecdc96fb1
Parent:
4:6445a678d458
Child:
8:bf2e64504294
--- a/Adafruit_ADS1015.cpp	Sat Oct 11 08:45:17 2014 +0000
+++ b/Adafruit_ADS1015.cpp	Mon May 22 22:12:44 2017 +0000
@@ -119,7 +119,7 @@
                       ADS1015_REG_CONFIG_CLAT_NONLAT  | // Non-latching (default val)
                       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   | // 860(ADS1115) samples per second
                       ADS1015_REG_CONFIG_MODE_SINGLE;   // Single-shot mode (default)
 
     // Set PGA/voltage range
@@ -148,7 +148,7 @@
     writeRegister(m_i2cAddress, ADS1015_REG_POINTER_CONFIG, config);
 
     // Wait for the conversion to complete
-    wait_ms(m_conversionDelay);
+    wait_us(m_conversionDelay);
 
     // Read the conversion results
     // Shift 12-bit results right 4 bits for the ADS1015