From 4ab22f4df3259f5bc7410ce3ce441eb63de3f7cf Mon Sep 17 00:00:00 2001
From: Victor Le Roch <victorleroch@Victors-MacBook-Pro.local>
Date: Mon, 18 May 2020 14:23:56 +0200
Subject: [PATCH] main avec radiator et manometre, test sans la boucle for

---
 OtherDevices/DigitalDevices/.DS_Store         | Bin 6148 -> 6148 bytes
 .../ExternalDigitalSensorButton.cpp           |   7 +++---
 board.cpp                                     |   3 ++-
 core_simulation.h                             |   2 ++
 include/.DS_Store                             | Bin 10244 -> 10244 bytes
 include/DigitalDevices/.DS_Store              | Bin 0 -> 6148 bytes
 sketch_ino.cpp                                |  20 ++++++++++--------
 7 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 include/DigitalDevices/.DS_Store

diff --git a/OtherDevices/DigitalDevices/.DS_Store b/OtherDevices/DigitalDevices/.DS_Store
index f459e15b060b4d7fca5a6cb9cb18dbaf569842a3..2b11151ab9aeaff472eede5268e81ef5e3cf6e80 100644
GIT binary patch
delta 79
zcmZoMXfc=|&e%S&P;8=}A|unp0PD#HA}ka8b;bD@To^JL(t)^yA(0`6A($bRA&;SW
i<0=#O&FmZk9E|N74}NE!%rBzL$gtT_<S_HZ1{MHNHx+&W

delta 57
zcmZoMXfc=|&e%4wP;8=}A|vC(0Ba!8W3ch568j`Z&CTo_0vwEO8$W($p3E<z%gV^W
Mz;Ix*t;k_!0QY1N=Kufz

diff --git a/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp b/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
index 203a5ac..077d4de 100644
--- a/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
+++ b/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
@@ -1,7 +1,8 @@
 //
 // Created by camer on 16/05/2020.
 //
-
+//#define PATH "D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\on.txt"
+#define PATH "/Users/victorleroch/Documents/INSA/Année4/C++/Projet_VictorAvecUnK/on.txt"
 #include "../../../include/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.h"
 
 //ExternalDigDevice/////////////////////////
@@ -14,7 +15,7 @@ int ExternalDigitalSensorButton::getState(){
 }
 
 void ExternalDigitalSensorButton::setState() {
-    if (ifstream ("D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\on.txt")){
+    if (ifstream (PATH)){
         state = HIGH;
     } else {
         state = LOW;
@@ -27,4 +28,4 @@ void ExternalDigitalSensorButton::run() {
         *ptrmem = this->getState();
         sleep(temps);
     }
-}
\ No newline at end of file
+}
diff --git a/board.cpp b/board.cpp
index d228dcf..6f6ee08 100644
--- a/board.cpp
+++ b/board.cpp
@@ -18,7 +18,7 @@ int main(){
   AnalogSensorLuminosity luminosite(DELAY);
   ExternalDigitalSensorButton button(DELAY);
   AnalogSensorManometre manometre(4,DELAY);
-  //DigitalActuatorRadiator radiator(
+  DigitalActuatorRadiator radiator(DELAY, THRESHOLDHIGH, THRESHOLDLOW);
 
   
   // branchement des capteurs actionneurs
@@ -28,6 +28,7 @@ int main(){
   esp8266.i2c(1,screen);
   esp8266.pin(4, button);
   esp8266.pin(5, manometre);
+  esp8266.pin(6, radiator);
   
   // allumage de la carte
   esp8266.run();
diff --git a/core_simulation.h b/core_simulation.h
index 58cc60b..4be9011 100644
--- a/core_simulation.h
+++ b/core_simulation.h
@@ -13,6 +13,8 @@
 #define MAX_I2C_DEVICES 4
 #define I2C_BUFFER_SIZE 1024
 #define MAX_IO_PIN 6
+#define THRESHOLDHIGH 25
+#define THRESHOLDLOW 15
 
 using namespace std;
 
diff --git a/include/.DS_Store b/include/.DS_Store
index a18ff607f6a17cbb216229a857d76fd8baf550a5..3ceb2d97ffe7f97ed712b1f51612b95b5c486987 100644
GIT binary patch
delta 69
zcmZn(XbG6$&nUDpU^hRb(BuGdxy@Pv>WoY#;b8U~iTzBQ4MciaCd&x&Ouix~J9&=;
X9~0+;$rt4mHouYh#I~7T;V(M?|GgJS

delta 74
zcmZn(XbG6$&nUPtU^hRb;N$>txy@Pv>WoardSJGw<bI~j1|mHy0y*i1!O8i#1q@)o
Y(KY#^wDM*N$@gp%8#FhwEBs{#02oXag8%>k

diff --git a/include/DigitalDevices/.DS_Store b/include/DigitalDevices/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f459e15b060b4d7fca5a6cb9cb18dbaf569842a3
GIT binary patch
literal 6148
zcmeHK%Sr=55Ukc50$%p$ael!+Si|}S{(zc*2n!1)x$i08<)>NwI2aZ|2wp-p^wdmG
z*9=pK?QH<IIqn{S4#1l3h?5UX^L_V)-BiSgbe?g*D@HtG%h}(|xg7?4;GO=Hf8<#Q
zO!&lpx8II$(=>XrObSQ=DIf);fE2h$fhwo#yNgZ{SqeyjYgE9$4~_2F7tV?C>EIA8
z0CB}|80XPT5Ss^xec_zQ2+fj8OsZ9jVM%AaRbF2>Cng<M&4<;^Rvn7P?L5ClI;>CB
zC<UazxdOMj?7aRz(SPax&q-QI0V!}*3fO9R9yWYZ)z-!1yw*1Q3*B?R=x&?`g+r8M
kVw7Vpyd2+0Qsy<EbH6W~6NAop(24pPa9w0l;J+3424}+;z5oCK

literal 0
HcmV?d00001

diff --git a/sketch_ino.cpp b/sketch_ino.cpp
index 49216cd..f8bf806 100644
--- a/sketch_ino.cpp
+++ b/sketch_ino.cpp
@@ -6,10 +6,12 @@ void Board::setup(){
   // on configure la vitesse de la liaison
   Serial.begin(9600);
 // on fixe les pin en entree et en sorite en fonction des capteurs/actionneurs mis sur la carte
-  pinMode(1,INPUT);
-  pinMode(0,OUTPUT);
-  pinMode(2,INPUT);
+  pinMode(1, INPUT);
+  pinMode(0, OUTPUT);
+  pinMode(2, INPUT);
   pinMode(4, INPUT);
+  pinMode(5, INPUT);
+  pinMode(6, OUTPUT);
 }
 
 // la boucle de controle arduino
@@ -20,8 +22,8 @@ void Board::loop(){
   static int cpt=0;
   static int bascule=0;
   int i=0;
-  for(i=0;i<10;i++){
-      if (i%3==0) {
+  //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);
@@ -31,18 +33,18 @@ void Board::loop(){
           val = analogRead(2);
           sprintf(buf, "luminosite %d", val);
           Serial.println(buf);
-      }
+    //  }
 
-        if(cpt%5==0){
+    //    if(cpt%5==0){
             // tous les 5 fois on affiche sur l ecran la temperature
           sprintf(buf,"%d",val1);
           bus.write(1,buf,100);
 
 
-        }
+      //  }
         cpt++;
         sleep(1);
-  }
+  //}
 // on eteint et on allume la LED
   if(analogRead(4))
       digitalWrite(0,HIGH);