From 36360fdb88bf243af28fe9fe80d7777fdf1ac014 Mon Sep 17 00:00:00 2001
From: victorleroch <leroch@etud.insa-toulouse.fr>
Date: Wed, 20 May 2020 10:30:24 +0200
Subject: [PATCH] =?UTF-8?q?main=20compl=C3=A9t=C3=A9=20avec=20terarium,=20?=
 =?UTF-8?q?build=20and=20run=20ok?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/TerrariumParameter.cpp |  2 +-
 sketch_ino.cpp                 | 28 +++++++++++++++++++++-------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/src/TerrariumParameter.cpp b/app/src/TerrariumParameter.cpp
index 49dd201..b8d15df 100644
--- a/app/src/TerrariumParameter.cpp
+++ b/app/src/TerrariumParameter.cpp
@@ -5,7 +5,7 @@
 #include "../include/TerrariumParameter.h"
 //Constructor
 TerrariumParameter::TerrariumParameter(int thresholdHigh, int thresholdLow) : thresholdHigh(thresholdHigh),
-                                                                              thresholdLow(thresholdLow) {}
+                                                                              thresholdLow(thresholdLow){}
 
 //Getters Setters
 float TerrariumParameter::getValue() const {
diff --git a/sketch_ino.cpp b/sketch_ino.cpp
index 07afe13..3130dcc 100644
--- a/sketch_ino.cpp
+++ b/sketch_ino.cpp
@@ -1,7 +1,16 @@
 #include <unistd.h>
 #include "core_simulation.h"
+#include "app/include/Terrarium.h"
+#include "app/include/TerrariumParameter.h"
+
+
+Terrarium terrarium(1);
+TerrariumParameter temperature(25, 20);
+TerrariumParameter pressure(3000,2990);
+TerrariumParameter ph(8,6);
+
+
 
-static int radState = LOW;
 // la fonction d'initialisation d'arduino
 void Board::setup(){
   // on configure la vitesse de la liaison
@@ -13,6 +22,11 @@ void Board::setup(){
   pinMode(4, INPUT);
   pinMode(5, INPUT);
 
+
+
+
+
+
   digitalWrite(0,LOW);
   //pinMode(6, OUTPUT);
 }
@@ -28,17 +42,17 @@ void Board::loop(){
   //for(i=0;i<10;i++){
   //    if (i%3==0) {
           // lecture sur la pin 1 : capteur de temperature
-          val1 = analogRead(1);
-          sprintf(buf, "temperature %d", val1);
+          temperature.setValue(analogRead(1));
+          sprintf(buf, "temperature %f", temperature.getValue());
           Serial.println(buf);
 
-          if ((val1 < THRESHOLDLOW)&&(radState == LOW)) {
+          if ((temperature.is2Low()) && (terrarium.getRadState() == LOW)) {
               digitalWrite(0, HIGH);
-              radState = HIGH;
+              terrarium.setRadState(HIGH);
           }
-          else if ((val1 > THRESHOLDHIGH)&&(radState == HIGH)) {
+          else if ((temperature.is2High() ) && (terrarium.getRadState() == HIGH)) {
               digitalWrite(0, LOW);
-              radState = LOW;
+              terrarium.setRadState(LOW);
           }