alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.5.0 ADS1x15

Browse Source
This commit is contained in:
Rob Tillaart 2024-08-21 15:10:06 +02:00
parent 6a8bad8500
commit 87bbcb00bb
8 changed files with 245 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/ADS1x15/ADS1X15.cpp
View File

@ -1,7 +1,7 @@
//
// FILE: ADS1X15.cpp
// AUTHOR: Rob Tillaart
// VERSION: 0.4.5
// VERSION: 0.5.0
// DATE: 2013-03-24
// PURPOSE: Arduino library for ADS1015 and ADS1115
// URL: https://github.com/RobTillaart/ADS1X15
@ -342,7 +342,7 @@ uint8_t ADS1X15::getComparatorMode()
void ADS1X15::setComparatorPolarity(uint8_t pol)
{
_compPol = pol ? 0 : 1;
_compPol = pol == 0 ? 0 : 1;
}
@ -354,7 +354,7 @@ uint8_t ADS1X15::getComparatorPolarity()
void ADS1X15::setComparatorLatch(uint8_t latch)
{
_compLatch = latch ? 0 : 1;
_compLatch = latch == 0 ? 0 : 1;
}

4
libraries/ADS1x15/ADS1X15.h
View File

@ -2,7 +2,7 @@
//
// FILE: ADS1X15.h
// AUTHOR: Rob Tillaart
// VERSION: 0.4.5
// VERSION: 0.5.0
// DATE: 2013-03-24
// PURPOSE: Arduino library for ADS1015 and ADS1115
// URL: https://github.com/RobTillaart/ADS1X15
@ -12,7 +12,7 @@
#include "Arduino.h"
#include "Wire.h"
#define ADS1X15_LIB_VERSION (F("0.4.5"))
#define ADS1X15_LIB_VERSION (F("0.5.0"))
// allow compile time default address
// address in { 0x48, 0x49, 0x4A, 0x4B }, no test...

7
libraries/ADS1x15/CHANGELOG.md
View File

@ -5,6 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
## [0.5.0] - 2024-08-20
- Fix #80, setComparatorPolarity() and setComparatorLatch() inverting.
- add test example to test parameters.
- add unit tests to test parameters.
----
## [0.4.5] - 2024-07-03
- Fix #78, prevent infinite loop. (Thanks to devmirek).
- Fix #76 (again), update readme.md Comparator Polarity.

6
libraries/ADS1x15/README.md
View File

@ -55,6 +55,12 @@ This pin can be used both for interrupts or polling, see table of examples below
| ADS_read_RDY.ino | polling |
### 0.5.0 Breaking change
Fixed #80, setComparatorPolarity() and setComparatorLatch() as these inverted
the setting.
### 0.4.0 Breaking change
Version 0.4.0 introduced a breaking change.

95
libraries/ADS1x15/examples/ADS_test_config/ADS_test_config.ino Normal file
View File

@ -0,0 +1,95 @@
//
// FILE: ADS_test_config.ino
// AUTHOR: Rob.Tillaart
// PURPOSE: test config flags
// URL: https://github.com/RobTillaart/ADS1X15
// triggered by issue 80
#include "ADS1X15.h"
ADS1115 ADS(0x48);
void setup()
{
Serial.begin(115200);
Serial.println(__FILE__);
Serial.print("ADS1X15_LIB_VERSION: ");
Serial.println(ADS1X15_LIB_VERSION);
Wire.begin();
ADS.begin();
Serial.println("\nTEST GAIN");
int gain = 16;
for (int i = 0; i < 6; i++)
{
Serial.print(gain);
ADS.setGain(gain);
if (ADS.getGain() == gain) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\nTEST DATARATE");
for (int i = 0; i < 7; i++)
{
Serial.print(i);
ADS.setDataRate(i);
if (ADS.getDataRate() == i) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\nTEST MODE");
for (int i = 0; i < 2; i++)
{
Serial.print(i);
ADS.setMode(i);
if (ADS.getMode() == i) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\nTEST COMP MODE");
for (int i = 0; i < 2; i++)
{
Serial.print(i);
ADS.setComparatorMode(i);
if (ADS.getComparatorMode() == i) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\nTEST COMP POLARITY");
for (int i = 0; i < 2; i++)
{
Serial.print(i);
ADS.setComparatorPolarity(i);
if (ADS.getComparatorPolarity() == i) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\nTEST COMP LATCH");
for (int i = 0; i < 2; i++)
{
Serial.print(i);
ADS.setComparatorLatch(i);
if (ADS.getComparatorLatch() == i) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\nTEST COMP QUECONVERT");
for (int i = 0; i < 2; i++)
{
Serial.print(i);
ADS.setComparatorQueConvert(i);
if (ADS.getComparatorQueConvert() == i) Serial.println("\tOK");
else Serial.println("\tFAIL");
}
Serial.println("\ndone...");
}
void loop()
{
}
// -- END OF FILE --

2
libraries/ADS1x15/library.json
View File

@ -15,7 +15,7 @@
"type": "git",
"url": "https://github.com/RobTillaart/ADS1X15"
},
"version": "0.4.5",
"version": "0.5.0",
"license": "MIT",
"frameworks": "*",
"platforms": "*",

2
libraries/ADS1x15/library.properties
View File

@ -1,5 +1,5 @@
name=ADS1X15
version=0.4.5
version=0.5.0
author=Rob Tillaart <rob.tillaart@gmail.com>
maintainer=Rob Tillaart <rob.tillaart@gmail.com>
sentence=Arduino library for ADS1015 - I2C 12 bit ADC and ADS1115 I2C 16 bit ADC

130
libraries/ADS1x15/test/unit_test_001.cpp
View File

@ -35,12 +35,15 @@ unittest_teardown()
}
unittest(test_constants)
unittest(test_constants_I)
{
assertEqual(0x48, ADS1015_ADDRESS);
assertEqual(0x48, ADS1115_ADDRESS);
assertEqual( 0, ADS1X15_OK);
assertEqual(-100, ADS1X15_INVALID_VOLTAGE);
assertEqual(-101, ADS1X15_ERROR_TIMEOUT);
assertEqual(-102, ADS1X15_ERROR_I2C);
assertEqual(0xFF, ADS1X15_INVALID_GAIN);
assertEqual(0xFE, ADS1X15_INVALID_MODE);
}
@ -103,7 +106,7 @@ unittest(test_gain_ADS1113)
}
unittest(test_Voltage)
unittest(test_voltage)
{
ADS1115 ADS(0x48);
@ -144,6 +147,129 @@ unittest(test_Voltage)
}
unittest(test_mode)
{
ADS1115 ADS(0x48);
Wire.begin();
assertTrue(ADS.begin());
// test default
assertEqual(1, ADS.getMode());
// test valid values
ADS.setMode(0);
assertEqual(0, ADS.getMode());
ADS.setMode(1);
assertEqual(1, ADS.getMode());
// test out of range
ADS.setMode(2);
assertEqual(1, ADS.getMode());
}
unittest(test_datarate)
{
ADS1115 ADS(0x48);
Wire.begin();
assertTrue(ADS.begin());
// test default
assertEqual(4, ADS.getDataRate());
// test valid values
for (int i = 0; i < 8; i++)
{
ADS.setDataRate(i);
assertEqual(i, ADS.getDataRate());
}
// test out of range
ADS.setDataRate(8);
assertEqual(4, ADS.getDataRate());
}
unittest(test_comparator_mode)
{
ADS1115 ADS(0x48);
Wire.begin();
assertTrue(ADS.begin());
// test default
assertEqual(0, ADS.getComparatorMode());
// test valid values
ADS.setComparatorMode(0);
assertEqual(0, ADS.getComparatorMode());
ADS.setComparatorMode(1);
assertEqual(1, ADS.getComparatorMode());
// test out of range
ADS.setComparatorMode(2);
assertEqual(1, ADS.getComparatorMode());
}
unittest(test_comparator_polarity)
{
ADS1115 ADS(0x48);
Wire.begin();
assertTrue(ADS.begin());
// test default
assertEqual(1, ADS.getComparatorPolarity());
// test valid values
ADS.setComparatorPolarity(0);
assertEqual(0, ADS.getComparatorPolarity());
ADS.setComparatorPolarity(1);
assertEqual(1, ADS.getComparatorPolarity());
// test out of range
ADS.setComparatorPolarity(2);
assertEqual(1, ADS.getComparatorPolarity());
}
unittest(test_comparator_latch)
{
ADS1115 ADS(0x48);
Wire.begin();
assertTrue(ADS.begin());
// test default
assertEqual(0, ADS.getComparatorLatch());
// test valid values
ADS.setComparatorLatch(0);
assertEqual(0, ADS.getComparatorLatch());
ADS.setComparatorLatch(1);
assertEqual(1, ADS.getComparatorLatch());
// test out of range
ADS.setComparatorLatch(2);
assertEqual(1, ADS.getComparatorLatch());
}
unittest(test_comparator_que_convert)
{
ADS1115 ADS(0x48);
Wire.begin();
assertTrue(ADS.begin());
// test default
assertEqual(3, ADS.getComparatorQueConvert());
// test valid values
for (int i = 0; i < 4; i++)
{
ADS.setComparatorQueConvert(i);
assertEqual(i, ADS.getComparatorQueConvert());
}
// test out of range
ADS.setComparatorQueConvert(4);
assertEqual(3, ADS.getComparatorQueConvert());
}
unittest_main()