bray/Projet_VictorAvecUnK
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

if apple else windows

Browse source
This commit is contained in:
Victor Le Roch 2020-05-26 17:38:24 +02:00
parent 9dd4721d1d
commit 0856b5762c
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/include/Tortue.h
View file

@ -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;

3
app/src/Tortue.cpp
View file

@ -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 ++;
}

9
board.cpp
View file

@ -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

12
sketch_ino.cpp
View file

@ -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);