mirror of
https://github.com/amperka/TroykaMQ.git
synced 2025-03-15 04:27:34 +03:00
use base class methods
This commit is contained in:
parent
c19b668a63
commit
7bf7d9df09
@ -26,8 +26,7 @@ void BaseMQ::calibrate() {
|
|||||||
}
|
}
|
||||||
ro = ro/MQ_SAMPLE_TIMES;
|
ro = ro/MQ_SAMPLE_TIMES;
|
||||||
ro = ro/getRoInCleanAir();
|
ro = ro/getRoInCleanAir();
|
||||||
_ro = ro;
|
calibrate (ro);
|
||||||
_stateCalibrate = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void BaseMQ::heaterPwrHigh() {
|
void BaseMQ::heaterPwrHigh() {
|
||||||
@ -67,7 +66,7 @@ float BaseMQ::readRs() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int readScaled(float a, float b) {
|
int readScaled(float a, float b) {
|
||||||
float ratio = readRs()/_ro;
|
float ratio = readRatio();
|
||||||
return pow(M_E, (log(ratio)-b)/a);
|
return pow(M_E, (log(ratio)-b)/a);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +79,7 @@ bool BaseMQ::isCalibrated() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
float BaseMQ::readRatio() {
|
float BaseMQ::readRatio() {
|
||||||
return readRs()/_ro;
|
return readRs()/getRo();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool BaseMQ::heatingCompleted() {
|
bool BaseMQ::heatingCompleted() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user