From 0856b5762c5bf9fffd3e1453ad6c8b35a59d0ad2 Mon Sep 17 00:00:00 2001
From: victorleroch <leroch@etud.insa-toulouse.fr>
Date: Tue, 26 May 2020 17:38:24 +0200
Subject: [PATCH] if apple else windows

---
 app/include/Tortue.h |  2 +-
 app/src/Tortue.cpp   |  3 +--
 board.cpp            |  9 ++++++++-
 sketch_ino.cpp       | 12 ++++++------
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/include/Tortue.h b/app/include/Tortue.h
index 0ae77dc..118caa4 100644
--- a/app/include/Tortue.h
+++ b/app/include/Tortue.h
@@ -18,7 +18,7 @@ private:
 public:
     Tortue();
 
-    Tortue(const std::string &nom, const std::string &sexe);
+    Tortue(const std::string &nom, const std::string &naissance, const std::string &sexe);
 
     const std::string &getNom() const;
 
diff --git a/app/src/Tortue.cpp b/app/src/Tortue.cpp
index 5d597b0..8f3c2f0 100644
--- a/app/src/Tortue.cpp
+++ b/app/src/Tortue.cpp
@@ -9,8 +9,7 @@
 
 Tortue::Tortue() {}
 
-Tortue::Tortue(const string &nom, const string &sexe) : nom(nom), sexe(sexe) {
-    naissance = std::time(nullptr);
+Tortue::Tortue(const string &nom, const std::string &naissance, const string &sexe) : nom(nom), sexe(sexe), naissance(naissance) {
     nbTortue ++;
 }
 
diff --git a/board.cpp b/board.cpp
index 005bd05..5dd2a08 100644
--- a/board.cpp
+++ b/board.cpp
@@ -10,11 +10,18 @@
 #include "include/I2CDevices/Keyboard.h"
 
 int main(){
-    //std::string btnNextPath = "/Users/victorleroch/Documents/INSA/Année4/C++/Projet_VictorAvecUnK/on.txt";
+
+#if __APPLE__
+    std::string btnNextPath = "/Users/victorleroch/Desktop/boutons/next.txt";
+    std::string btnPrevPath = "/Users/victorleroch/Desktop/boutons/prev.txt";
+    std::string btnOkPath = "/Users/victorleroch/Desktop/boutons/ok.txt";
+    std::string btnBackPath = "/Users/victorleroch/Desktop/boutons/back.txt";
+#else //!___unix___
     std::string btnNextPath = "D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\next.txt";
     std::string btnPrevPath = "D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\prev.txt";
     std::string btnOkPath = "D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\ok.txt";
     std::string btnBackPath = "D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\back.txt";
+#endif
   // creation d'une board
   Board esp8266;
   // achat des senseurs et actionneurs
diff --git a/sketch_ino.cpp b/sketch_ino.cpp
index d53209e..5df52fd 100644
--- a/sketch_ino.cpp
+++ b/sketch_ino.cpp
@@ -40,10 +40,10 @@ void Board::setup(){
 
   digitalWrite(0,LOW);
   //pinMode(6, OUTPUT);
-  tortues.push_back(*(new Tortue("Marvin","male")));
-  tortues.push_back(*(new Tortue("Clara","female")));
-  tortues.push_back(*(new Tortue("Camille","non binary")));
-  tortues.push_back(*(new Tortue("Clarisse","danseuse")));
+  tortues.push_back(*(new Tortue("Marvin","03/09/1996","male")));
+  tortues.push_back(*(new Tortue("Clara","03/09/2008", "female")));
+  tortues.push_back(*(new Tortue("Camille","03/09/2017", "non binary")));
+  tortues.push_back(*(new Tortue("Clarisse","03/05/1843", "danseuse")));
 
 }
 
@@ -126,10 +126,10 @@ void Board::loop() {
 
         if (menu->getId() == 5){
             Tortue * newTortue = new Tortue();
-            while (1){
+            /*while (1){
                 bus.requestFrom(2,inputBuf,150);
 
-            }
+            }*/
             cin >> input;
             newTortue->setNom(input);
             tortues.push_back(*newTortue);