BAP TUDelft / ADS1015_v2

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Diff: ADS1015.cpp

Revision:
3:6ee79a02cf4c
Parent:
2:2bf91fd23a1a
Child:
4:4edb1d9173db
--- a/ADS1015.cpp	Mon Jul 02 08:42:39 2018 +0000
+++ b/ADS1015.cpp	Mon Jul 02 10:18:02 2018 +0000
@@ -1,24 +1,24 @@
 #include "mbed.h"
 #include "ADS1015.h"
 
-#define CONFIG 0x81E3
+#define ADS1015_CONFIG_DEFAULT 0x81E3
 
-double getDifSample(I2C* i2c_plate, uint8_t ADC_address, uint16_t sensor_address)
+double getDifSample(I2C* i2c_plate, uint8_t ADC_address, uint16_t channel)
 {
-    sensor_address = CONFIG | sensor_address | AD1015_CONFIG_FSR_4096;
-    
-    startSingleShotConversion(i2c_plate, ADC_address, sensor_address);
-    wait_ms(0.1);
-    startSingleShotConversion(i2c_plate, ADC_address, sensor_address);
-    wait_ms(0.3);    
-    
-    return readConversionResult(i2c_plate, ADC_address, sensor_address);
+    uint16_t config = ADS1015_CONFIG_DEFAULT | channel | AD1015_CONFIG_FSR_4096;
+
+    startSingleShotConversion(i2c_plate, ADC_address, config);
+    wait_ms(0.4);
+    //startSingleShotConversion(i2c_plate, ADC_address, config);
+    //wait_ms(0.3);
+
+    return readConversionResult(i2c_plate, ADC_address, config);
 }
 
 double getSingleSample(I2C* i2c_plate, uint8_t ADC_address, uint16_t channel)
-{    
-    uint16_t config = CONFIG | ADS1015_REG_CONFIG_OS_SINGLE | AD1015_CONFIG_FSR_6144;
-    
+{
+    uint16_t config = ADS1015_CONFIG_DEFAULT | AD1015_CONFIG_FSR_6144;
+
     switch (channel) {
         case (0):
             config |= ADS1015_REG_CONFIG_MUX_SINGLE_0;
@@ -33,12 +33,12 @@
             config |= ADS1015_REG_CONFIG_MUX_SINGLE_3;
             break;
     }
-    
+
     startSingleShotConversion(i2c_plate, ADC_address, config);
-    wait_ms(0.1);
-    startSingleShotConversion(i2c_plate, ADC_address, config);
-    wait_ms(0.3);    
-    
+    wait_ms(0.4);
+    //startSingleShotConversion(i2c_plate, ADC_address, config);
+    //wait_ms(0.3);
+
     return readConversionResult(i2c_plate, ADC_address, config);
 }