alexey.zholtikov/MQSensorsLib
1
0
Fork 0
mirror of https://github.com/miguel5612/MQSensorsLib.git synced 2025-10-30 22:54:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added parenthesis to make clear the operation

Browse Source
This commit is contained in:
miguel5612
2020-04-04 10:16:15 -05:00
parent edd573ba0f
commit 39b4449899
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MQUnifiedsensor.cpp
View File

@@ -27,7 +27,7 @@ void MQUnifiedsensor::setRL(float RL) {
} }
void MQUnifiedsensor::setADC(int value) void MQUnifiedsensor::setADC(int value)
{ {
this-> _sensor_volt = (value) * _VOLT_RESOLUTION / (pow(2, _ADC_Bit_Resolution) - 1); this-> _sensor_volt = (value) * _VOLT_RESOLUTION / ((pow(2, _ADC_Bit_Resolution)) - 1);
this-> _adc = value; this-> _adc = value;
} }
void MQUnifiedsensor::setVoltResolution(float voltage_resolution) void MQUnifiedsensor::setVoltResolution(float voltage_resolution)
@@ -95,7 +95,7 @@ void MQUnifiedsensor::serialDebug(bool onSetup)
} }
else else
{ {
Serial.print("|"); Serial.print(_adc); Serial.print("| v = ADC*"); Serial.print(_VOLT_RESOLUTION); Serial.print("/"); Serial.print(pow(2, _ADC_Bit_Resolution) - 1); Serial.print(" | "); Serial.print(_sensor_volt); Serial.print("|"); Serial.print(_adc); Serial.print("| v = ADC*"); Serial.print(_VOLT_RESOLUTION); Serial.print("/"); Serial.print((pow(2, _ADC_Bit_Resolution)) - 1); Serial.print(" | "); Serial.print(_sensor_volt);
Serial.print(" | RS = ((" ); Serial.print(_VOLT_RESOLUTION ); Serial.print("*RL)/Voltage) - RL| "); Serial.print(_RS_Calc); Serial.print(" | Ratio = RS/R0| "); Serial.print(" | RS = ((" ); Serial.print(_VOLT_RESOLUTION ); Serial.print("*RL)/Voltage) - RL| "); Serial.print(_RS_Calc); Serial.print(" | Ratio = RS/R0| ");
Serial.print(_ratio); Serial.print( " | "); Serial.print(_ratio); Serial.print( " | ");
if(_regressionMethod == 1) Serial.print("ratio*a + b"); if(_regressionMethod == 1) Serial.print("ratio*a + b");
@@ -174,7 +174,7 @@ float MQUnifiedsensor::getVoltage(int read) {
avg += _adc; avg += _adc;
delay(retry_interval); delay(retry_interval);
} }
voltage = (avg/ retries) * _VOLT_RESOLUTION / (pow(2, _ADC_Bit_Resolution) - 1); voltage = (avg/ retries) * _VOLT_RESOLUTION / ((pow(2, _ADC_Bit_Resolution)) - 1);
} }
else else
{ {