Kyuto Furutachi / ads1115_test

readADC_Differential_0_1()のconfigの値の設定を readADC_Differential_2_3()のconfigの値と同じにしました

Fork of ads1115_test by Gaku Matsumoto

Files at this revision

API Documentation at this revision

Revision 2:68c4863a39cd, committed 2017-02-22

Comitter:
PQUTO
Date:
Wed Feb 22 18:22:42 2017 +0000
Parent:
1:2e07c1aa1375
Commit message:
readADC_Differential_0_1()?config??????readADC_Differential_2_3()?config?????????????

Changed in this revision

Adafruit_ADS1015.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Adafruit_ADS1015.cpp	Tue Feb 21 16:10:57 2017 +0000
+++ b/Adafruit_ADS1015.cpp	Wed Feb 22 18:22:42 2017 +0000
@@ -195,12 +195,24 @@
 int16_t Adafruit_ADS1015::readADC_Differential_2_3()
 {
     // Start with default values
-    uint16_t config = ADS1015_REG_CONFIG_CQUE_NONE    | // Disable the comparator (default val)
+   /* 
+        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_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_860SPS   | // 1600(ADS1015) or 250(ADS1115) samples per second (default)
                       ADS1015_REG_CONFIG_MODE_SINGLE;   // Single-shot mode (default)
+*/
+
+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_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_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;