alexey.zholtikov/TroykaMQ
1
0
Fork 0
mirror of https://github.com/amperka/TroykaMQ.git synced 2025-03-24 17:00:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

use base class methods

Browse Source
This commit is contained in:
CAHEK7 2016-08-26 14:06:39 +03:00
parent c19b668a63
commit 7bf7d9df09
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BaseMQ.cpp
View File

@ -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() {