diff options
| author | Wolfgang (Wolle) Ewald <wolfgang.ewald@wolles-elektronikkiste.de> | 2020-07-03 00:14:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-03 00:14:29 +0200 |
| commit | db1df148f0cd514396064d82d1499a0d85150794 (patch) | |
| tree | e4b8a69987fdb115f54701ef563437f4d4114a60 /src/ADS1115_WE.cpp | |
| parent | Update Alert_Window_Mode.ino (diff) | |
| download | ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.tar ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.tar.gz ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.tar.bz2 ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.tar.lz ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.tar.xz ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.tar.zst ADS1115_WE-db1df148f0cd514396064d82d1499a0d85150794.zip | |
Diffstat (limited to 'src/ADS1115_WE.cpp')
| -rw-r--r-- | src/ADS1115_WE.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/ADS1115_WE.cpp b/src/ADS1115_WE.cpp index b7f3918..d7f5b8a 100644 --- a/src/ADS1115_WE.cpp +++ b/src/ADS1115_WE.cpp @@ -91,6 +91,11 @@ void ADS1115_WE::setMeasureMode(ADS1115_MEASURE_MODE mode){ void ADS1115_WE::setVoltageRange_mV(ADS1115_RANGE range){
uint16_t currentVoltageRange = voltageRange;
+ uint16_t currentConfReg = readRegister(ADS1115_CONFIG_REG);
+ uint16_t currentRange = (currentConfReg >> 9) & 7;
+ uint16_t currentAlertPinMode = currentConfReg & 3;
+
+ setMeasureMode(ADS1115_SINGLE);
switch(range){
case ADS1115_RANGE_6144:
@@ -113,15 +118,6 @@ void ADS1115_WE::setVoltageRange_mV(ADS1115_RANGE range){ break;
}
- uint16_t currentConfReg = readRegister(ADS1115_CONFIG_REG);
- uint16_t currentRange = (currentConfReg >> 9) & 7;
- uint16_t currentAlertPinMode = currentConfReg & 3;
- uint16_t currentCompMode = (currentConfReg>>4) & 1;
-
- currentConfReg &= ~(0x0E00);
- currentConfReg |= range;
- writeRegister(ADS1115_CONFIG_REG, currentConfReg);
-
if ((currentRange != range) && (currentAlertPinMode != ADS1115_DISABLE_ALERT)){
int16_t alertLimit = readRegister(ADS1115_HI_THRESH_REG);
alertLimit = alertLimit * (currentVoltageRange * 1.0 / voltageRange);
@@ -131,7 +127,10 @@ void ADS1115_WE::setVoltageRange_mV(ADS1115_RANGE range){ alertLimit = alertLimit * (currentVoltageRange * 1.0 / voltageRange);
writeRegister(ADS1115_LO_THRESH_REG, alertLimit);
}
-
+
+ currentConfReg &= ~(0x0E00);
+ currentConfReg |= range;
+ writeRegister(ADS1115_CONFIG_REG, currentConfReg);
}
void ADS1115_WE::setCompareChannels(ADS1115_MUX mux){
|