From 9bafe2956f0607d6cd7ec6409cd9bb23a0ae7aed Mon Sep 17 00:00:00 2001
From: miguel5612 <miguelangelcu@ufps.edu.co>
Date: Fri, 24 May 2019 17:24:37 -0500
Subject: [PATCH] MQ lectures

---
 .../ipch/e30e48ba9e7cbd6a/mmap_address.bin    | Bin 0 -> 8 bytes
 src/MQUnifiedsensor.cpp                       |  26 ++++++++++++++----
 src/MQUnifiedsensor.h                         |   2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 .vscode/ipch/e30e48ba9e7cbd6a/mmap_address.bin

diff --git a/.vscode/ipch/e30e48ba9e7cbd6a/mmap_address.bin b/.vscode/ipch/e30e48ba9e7cbd6a/mmap_address.bin
new file mode 100644
index 0000000000000000000000000000000000000000..862b8428b9e068428b1a4e8a38f94019008d8940
GIT binary patch
literal 8
NcmZQzU~Ksh1ON<}1cCqn

literal 0
HcmV?d00001

diff --git a/src/MQUnifiedsensor.cpp b/src/MQUnifiedsensor.cpp
index 0e33764..e358948 100644
--- a/src/MQUnifiedsensor.cpp
+++ b/src/MQUnifiedsensor.cpp
@@ -72,15 +72,18 @@ void MQUnifiedsensor::inicializar()
 }
 int MQUnifiedsensor::readSensor(String nameLectureRequeired, bool print)
 {
-  setSensorCharacteristics(nameLectureRequeired);
+  setSensorCharacteristics(nameLectureRequeired, print);
   _PPM =readPPM(_m, _b);
   if(print)
   {
-    Serial.print("Medicion: ");
+    String nameLecture = getnameLecture();
+  
+    Serial.print("Medicion");
+    Serial.print("(" + nameLecture + "): ");
     Serial.println(_PPM);
     Serial.print("Slope: ");
     Serial.print(String(_m));
-    Serial.print("B point: ");
+    Serial.print(", B point: ");
     Serial.println(String(_b));
   }
   return _PPM;
@@ -89,8 +92,9 @@ String MQUnifiedsensor::getnameLecture()
 {
   return nameLecture[_lecturePosInArray];
 }
-void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired)
+void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired, bool print)
 {
+  //Defaults index
   if(nameLectureRequeired == "")
   {
     if(_type == 2)
@@ -144,6 +148,7 @@ void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired)
   }
   else 
   {
+    //Dinamic index search
     for (int i=0; i<lecturesAvailable; i++) {
         if (nameLectureRequeired = nameLecture[i]) {    //modified here
           _lecturePosInArray = i;
@@ -151,7 +156,18 @@ void MQUnifiedsensor::setSensorCharacteristics(String nameLectureRequeired)
         }
       }
   }
-    
+  //Serial debugging
+  if(print)
+  {
+    String nameLecture = getnameLecture();
+  
+    Serial.print("index in nameLectures: ");
+    Serial.println(_lecturePosInArray);
+    Serial.print("Slope index: ");
+    Serial.println(indexSlopeLectures[_lecturePosInArray]);
+    Serial.print("B point index: ");
+    Serial.println(indexBPointLectures[_lecturePosInArray]);
+  }
   _m = _MQ[indexSlopeLectures[_lecturePosInArray]];
   _b = _MQ[indexBPointLectures[_lecturePosInArray]];
 }
diff --git a/src/MQUnifiedsensor.h b/src/MQUnifiedsensor.h
index 580e65f..8f4304b 100644
--- a/src/MQUnifiedsensor.h
+++ b/src/MQUnifiedsensor.h
@@ -15,7 +15,7 @@ class MQUnifiedsensor
     MQUnifiedsensor(int pin, int type);
     void inicializar();
     void setR0(double R0);
-    void setSensorCharacteristics(String nameLectureReqeuired);
+    void setSensorCharacteristics(String nameLectureReqeuired, bool print);
     
     int readSensor(String nameLectureRequeired = "", bool print = false);
     int readPPM(int m, int b);