From ca90d0487bb59cf8f3deda2613fe0a83d2527286 Mon Sep 17 00:00:00 2001
From: bray <bray@etud.insa-toulouse.fr>
Date: Mon, 25 May 2020 14:12:48 +0200
Subject: [PATCH] Boutons 2.0

---
 .../DigitalSensors/ExternalDigitalSensorButton.cpp   |  4 ++--
 board.cpp                                            | 12 ++++++++++--
 .../DigitalSensors/ExternalDigitalSensorButton.h     |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp b/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
index 077d4de..5c5f286 100644
--- a/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
+++ b/OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
@@ -2,12 +2,12 @@
 // 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"
+//#define PATH "/Users/victorleroch/Documents/INSA/Année4/C++/Projet_VictorAvecUnK/on.txt"
 #include "../../../include/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.h"
 
 //ExternalDigDevice/////////////////////////
 
-ExternalDigitalSensorButton::ExternalDigitalSensorButton(int temps):DigitalSensor(temps) {}
+ExternalDigitalSensorButton::ExternalDigitalSensorButton(int temps, std::string PATH):DigitalSensor(temps), PATH(PATH){}
 
 int ExternalDigitalSensorButton::getState(){
     setState(); //determine if on.txt exists before getting state
diff --git a/board.cpp b/board.cpp
index 9725de5..08bfdd6 100644
--- a/board.cpp
+++ b/board.cpp
@@ -10,6 +10,11 @@
 #include "include/I2CDevices/Keyboard.h"
 
 int main(){
+    //std::string btnNextPath = "/Users/victorleroch/Documents/INSA/Année4/C++/Projet_VictorAvecUnK/on.txt";
+    std::string btnNextPath = "D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\on.txt";
+    std::string btnPrevPath;
+    std::string btnOkPath;
+    std::string btnBackPath;
   // creation d'une board
   Board esp8266;
   // achat des senseurs et actionneurs
@@ -19,7 +24,10 @@ int main(){
   Screen screen;
   Keyboard keyboard;
   AnalogSensorLuminosity luminosite(DELAY);
-  ExternalDigitalSensorButton button(DELAY);
+  ExternalDigitalSensorButton buttonNext(DELAY, btnNextPath);
+  ExternalDigitalSensorButton buttonPrev(DELAY, btnPrevPath);
+  ExternalDigitalSensorButton buttonOK(DELAY, btnOkPath);
+  ExternalDigitalSensorButton buttonBack(DELAY, btnBackPath);
   AnalogSensorManometre manometre(PRESSURE,DELAY);
   DigitalActuatorRadiator radiator(DELAY);
   DigitalActuatorElectrovanne electrovanne(DELAY);
@@ -29,7 +37,7 @@ int main(){
   esp8266.pin(1,temperature);
   //esp8266.pin(0,led1);
   esp8266.pin(2, electrovanne);
-  esp8266.pin(4, button);
+  esp8266.pin(4, buttonNext);
   esp8266.pin(5, manometre);
   esp8266.pin(0, radiator);
 
diff --git a/include/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.h b/include/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.h
index 3ee0be9..179c633 100644
--- a/include/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.h
+++ b/include/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.h
@@ -9,8 +9,10 @@
 #include "../DigitalDevice.h"
 
 class ExternalDigitalSensorButton : public DigitalSensor{
+private:
+    std::string PATH;
 public:
-    ExternalDigitalSensorButton(int temps);
+    ExternalDigitalSensorButton(int temps, std::string PATH);
 
     int getState();
     void setState();