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

Fixed references

Browse Source
This commit is contained in:
miguel5612 2019-05-24 22:14:34 -05:00
parent 081f57beca
commit 33156f76f0
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/MQUnifiedsensor.cpp
View File

@ -90,14 +90,14 @@ int MQUnifiedsensor::readSensor(String nameLectureRequeired, bool print)
} }
String MQUnifiedsensor::getnameLecture() String MQUnifiedsensor::getnameLecture()
{ {
return nameLecture[_lecturePosInArray]; return __nameLectureRequeired;
} }
void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired, bool print) void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired, bool print)
{ {
//Defaults index //Defaults index
if(nameLectureRequeired == "") if(nameLectureRequeired == "")
{ {
nameLectureRequeired = __nameLectureRequeired;
} }
//Dinamic index search //Dinamic index search
@ -126,6 +126,8 @@ void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired, bool
} }
_m = stringToDouble(_MQ[_lecturePosInArray+1]); _m = stringToDouble(_MQ[_lecturePosInArray+1]);
_b = stringToDouble(_MQ[_lecturePosInArray+2]); _b = stringToDouble(_MQ[_lecturePosInArray+2]);
//Save the name for future calls
nameLectureRequeired = __nameLectureRequeired;
} }
int MQUnifiedsensor::readPPM(int m, int b) { int MQUnifiedsensor::readPPM(int m, int b) {
/** /**
@ -172,54 +174,54 @@ void MQUnifiedsensor::setDefaultGas()
Serial.println("Carga de los gases por defecto"); Serial.println("Carga de los gases por defecto");
if(_type == 2) if(_type == 2)
{ {
nameLectureRequeired = defaultMQ2; _nameLectureRequeired = defaultMQ2;
} }
else if(_type == 3) else if(_type == 3)
{ {
nameLectureRequeired = defaultMQ3; _nameLectureRequeired = defaultMQ3;
} }
else if(_type == 4) else if(_type == 4)
{ {
nameLectureRequeired = defaultMQ4; _nameLectureRequeired = defaultMQ4;
} }
else if(_type == 5) else if(_type == 5)
{ {
nameLectureRequeired = defaultMQ5; _nameLectureRequeired = defaultMQ5;
} }
else if(_type == 6) else if(_type == 6)
{ {
nameLectureRequeired = defaultMQ6; _nameLectureRequeired = defaultMQ6;
} }
else if(_type == 7) else if(_type == 7)
{ {
nameLectureRequeired = defaultMQ7; _nameLectureRequeired = defaultMQ7;
} }
else if(_type == 8) else if(_type == 8)
{ {
nameLectureRequeired = defaultMQ8; _nameLectureRequeired = defaultMQ8;
} }
else if(_type == 9) else if(_type == 9)
{ {
nameLectureRequeired = defaultMQ9; _nameLectureRequeired = defaultMQ9;
} }
else if(_type == 131) else if(_type == 131)
{ {
nameLectureRequeired = defaultMQ131; _nameLectureRequeired = defaultMQ131;
} }
else if(_type == 135) else if(_type == 135)
{ {
nameLectureRequeired = defaultMQ135; _nameLectureRequeired = defaultMQ135;
} }
else if(_type == 303) else if(_type == 303)
{ {
nameLectureRequeired = defaultMQ303; _nameLectureRequeired = defaultMQ303;
} }
else if(_type == 309) else if(_type == 309)
{ {
nameLectureRequeired = defaultMQ309; _nameLectureRequeired = defaultMQ309;
} }
} }
double MQUnifiedsensor::stringToDouble(String & str) <-- notice the "&" double MQUnifiedsensor::stringToDouble(String & str)
{ {
return atof( str.c_str() ); return atof( str.c_str() );
} }

4
src/MQUnifiedsensor.h
View File

@ -44,7 +44,7 @@ class MQUnifiedsensor
//Values consolidated //Values consolidated
/* Gas, Value of m (Slope) and b (Cut on x axis) points */ /* Gas, Value of m (Slope) and b (Cut on x axis) points */
const String MQ2[18] = {"H2","-2.2459","2.9845","LPG","-2.2879","2.7901","CO","-2.6208","3.6075","Alcohol","-3.1157","4.5134","Propane","-2.7028","3.5595","Benzene","-2.2879","2.7901"}; const String MQ2[18] = {"H2","-2.2459","2.9845","LPG","-2.2879","2.7901","CO","-2.6208","3.6075","Alcohol","-3.1157","4.5134","Propane","-2.7028","3.5595","Benzene","-2.2879","2.7901"};
const String MQ3[12] = {"LPG","-3.1851","4.7048","CH4","-17.531","28.785","CO","-4.339","6.4432","Alcohol","-1.435","0.4103","Benzene","-2.7009","0.632","Hexane","-2.7268","3.6299"}; const String MQ3[18] = {"LPG","-3.1851","4.7048","CH4","-17.531","28.785","CO","-4.339","6.4432","Alcohol","-1.435","0.4103","Benzene","-2.7009","0.632","Hexane","-2.7268","3.6299"};
const String MQ4[15] = {"LPG","-2.5818","3.6303","CH4","0.9873","2.6386","CO","-5.5945","5.6693","Alcohol","-11.89","9.0375","smoke","-11.189","9.0375"}; const String MQ4[15] = {"LPG","-2.5818","3.6303","CH4","0.9873","2.6386","CO","-5.5945","5.6693","Alcohol","-11.89","9.0375","smoke","-11.189","9.0375"};
const String MQ5[15] = {"H2","-4.368","2.9667","LPG","-2.5723","1.8943","CH4","-2.4438","2.3044","CO","-4.8188","5.2023","Alcohol","-4.419","4.8044"}; const String MQ5[15] = {"H2","-4.368","2.9667","LPG","-2.5723","1.8943","CH4","-2.4438","2.3044","CO","-4.8188","5.2023","Alcohol","-4.419","4.8044"};
const String MQ6[15] = {"H2","-3.6775","5.0286","LPG","-1.6567","2.8775","CH4","-1","3.301","CO","-12.791","14.523","Alcohol","-5.8057","7.5292"}; const String MQ6[15] = {"H2","-3.6775","5.0286","LPG","-1.6567","2.8775","CH4","-1","3.301","CO","-12.791","14.523","Alcohol","-5.8057","7.5292"};
@ -59,7 +59,7 @@ class MQUnifiedsensor
private: private:
int _pin, _type, _PPM, _lecturePosInArray; int _pin, _type, _PPM, _lecturePosInArray;
double _R0, _m, _b; double _R0, _m, _b;
String _MQ[19]; String _MQ[19], __nameLectureRequeired;
const float VOLT_RESOLUTION = 5.0; // if 3.3v use 3.3 const float VOLT_RESOLUTION = 5.0; // if 3.3v use 3.3
const int ADC_RESOLUTION = 10; // for 10bit analog to digital converter. const int ADC_RESOLUTION = 10; // for 10bit analog to digital converter.
const int retries = 50; const int retries = 50;