From 7bf7d9df09856676305f8e3214add695dad4838d Mon Sep 17 00:00:00 2001 From: CAHEK7 Date: Fri, 26 Aug 2016 14:06:39 +0300 Subject: [PATCH] use base class methods --- BaseMQ.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/BaseMQ.cpp b/BaseMQ.cpp index 3ac2fad..5c91101 100644 --- a/BaseMQ.cpp +++ b/BaseMQ.cpp @@ -26,8 +26,7 @@ void BaseMQ::calibrate() { } ro = ro/MQ_SAMPLE_TIMES; ro = ro/getRoInCleanAir(); - _ro = ro; - _stateCalibrate = true; + calibrate (ro); } void BaseMQ::heaterPwrHigh() { @@ -67,7 +66,7 @@ float BaseMQ::readRs() { } int readScaled(float a, float b) { - float ratio = readRs()/_ro; + float ratio = readRatio(); return pow(M_E, (log(ratio)-b)/a); } @@ -80,7 +79,7 @@ bool BaseMQ::isCalibrated() { } float BaseMQ::readRatio() { - return readRs()/_ro; + return readRs()/getRo(); } bool BaseMQ::heatingCompleted() {