David k / ADS1115

Berhasil

Dependents:   ADS1115_IR Test_all

Files at this revision

API Documentation at this revision

Revision 6:441bc773778a, committed 2019-02-25

Comitter:
adavidkhowantolim
Date:
Mon Feb 25 15:50:05 2019 +0000
Parent:
5:aa277517f0ad
Commit message:
FIX;

Changed in this revision

Adafruit_ADS1015.cpp Show annotated file Show diff for this revision Revisions of this file
Adafruit_ADS1015.h Show annotated file Show diff for this revision Revisions of this file 
diff -r aa277517f0ad -r 441bc773778a Adafruit_ADS1015.cpp
--- a/Adafruit_ADS1015.cpp	Sat Oct 11 08:45:17 2014 +0000
+++ b/Adafruit_ADS1015.cpp	Mon Feb 25 15:50:05 2019 +0000
@@ -65,6 +65,7 @@
     m_conversionDelay = ADS1015_CONVERSIONDELAY;
     m_bitShift = 4;
     m_gain = GAIN_TWOTHIRDS; /* +/- 6.144V range (limited to VDD +0.3V max!) */
+//    m_gain = GAIN_TWO; /* +/- 2.048V range (limited to VDD +0.3V max!) */
     m_i2c = i2c;
 }
 
@@ -80,6 +81,7 @@
     m_conversionDelay = ADS1115_CONVERSIONDELAY;
     m_bitShift = 0;
     m_gain = GAIN_TWOTHIRDS; /* +/- 6.144V range (limited to VDD +0.3V max!) */
+//    m_gain = GAIN_TWO; /* +/- 2.048V range (limited to VDD +0.3V max!) */
     m_i2c = i2c;
 }
 

diff -r aa277517f0ad -r 441bc773778a Adafruit_ADS1015.h
--- a/Adafruit_ADS1015.h	Sat Oct 11 08:45:17 2014 +0000
+++ b/Adafruit_ADS1015.h	Mon Feb 25 15:50:05 2019 +0000
@@ -93,7 +93,7 @@
     #define ADS1015_REG_CONFIG_CPOL_ACTVLOW (0x0000)  // ALERT/RDY pin is low when active (default)
     #define ADS1015_REG_CONFIG_CPOL_ACTVHI  (0x0008)  // ALERT/RDY pin is high when active
 
-    #define ADS1015_REG_CONFIG_CLAT_MASK    (0x0004)  // Determines if ALERT/RDY pin latches once asserted
+    #define ADS1015_REG_CONFIG_CLAT_MASK    (0x0004)  // Determines if ALERT/RDY pin latches once asser
     #define ADS1015_REG_CONFIG_CLAT_NONLAT  (0x0000)  // Non-latching comparator (default)
     #define ADS1015_REG_CONFIG_CLAT_LATCH   (0x0004)  // Latching comparator