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

Template for Collaboration

Browse source
This commit is contained in:
Cameron Bray 2020-05-16 18:03:48 +02:00
parent 25d5cfe796
commit 354f1d0a14
10 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorLuminosity.cpp
View file

@ -9,7 +9,7 @@ AnalogSensorLuminosity::AnalogSensorLuminosity(int temps):AnalogDevice(200, temp
void AnalogSensorLuminosity::run(){
while(1){
val = luminosite_environnement;
val = Board::luminosite_environnement;
if(ptrmem!=NULL){
*ptrmem = val;
}

14
OtherDevices/DigitalDevices/DigitalActuators/IntelligentDigitalActuatorLED.cpp
View file

@ -5,7 +5,7 @@
#include "../../../include/DigitalDevices/DigitalActuators/IntelligentDigitalActuatorLED.h"
// IntelligentDigitalActuatorLED //////////////////
IntelligentDigitalActuatorLED::IntelligentDigitalActuatorLED(int t):DigitalDevice(t){}
IntelligentDigitalActuatorLED::IntelligentDigitalActuatorLED(int t):DigitalActuator(t){}
void IntelligentDigitalActuatorLED::run(){
int previousState = LOW; //initialisee a eteint
@ -13,17 +13,17 @@ void IntelligentDigitalActuatorLED::run(){
if(ptrmem!=NULL) {
state = *ptrmem;
if (state == LOW) {
cout << "((((eteint))))\n";
if (state != previousState) {
luminosite_environnement -= 50;
cout << "((((eteint))))\n";
Board::luminosite_environnement -= 50;
previousState = state;
}
previousState = state;
} else { //state == HIGH
cout << "((((allume))))\n";
if (state != previousState) {
luminosite_environnement += 50;
cout << "((((allume))))\n";
Board::luminosite_environnement += 50;
previousState = state;
}
previousState = state;
}
}
sleep(temps);

2
OtherDevices/DigitalDevices/DigitalSensors/ExternalDigitalSensorButton.cpp
View file

@ -14,7 +14,7 @@ int ExternalDigitalSensorButton::getState(){
}
void ExternalDigitalSensorButton::setState() {
if (ifstream("D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\on.txt")){
if (ifstream ("D:\\Documents\\Etudes\\INSA\\4A\\BECpp\\Projet_VictorAvecUnK\\src\\on.txt")){
state = HIGH;
} else {
state = LOW;

1
core_simulation.cpp
View file

@ -89,6 +89,7 @@ bool* I2C::getVide(int addr){
}
// classe generique reprenstant un capteur/actionneur
int Board::luminosite_environnement = 200;
Device::Device(){
ptrtype=NULL;
ptrmem=NULL;

2
core_simulation.h
View file

@ -67,6 +67,7 @@ public:
// representation generique d'un capteur ou d'un actionneur numerique, analogique ou sur le bue I2C
class Device{
protected:
// lien avec la carte pour lire/ecrire une valeur
unsigned short *ptrmem;
@ -90,6 +91,7 @@ public:
// classe representant une carte arduino
class Board{
public:
static int luminosite_environnement;
// valeur sur les pin
unsigned short io[MAX_IO_PIN];
// pin d'entree ou de sortie

2
include/DigitalDevices/DigitalActuators/IntelligentDigitalActuatorLED.h
View file

@ -14,7 +14,7 @@
#include "../DigitalDevice.h"
class IntelligentDigitalActuatorLED: public DigitalDevice{
class IntelligentDigitalActuatorLED: public DigitalActuator{
public:
// initialisation du temps de rafraichiisement

5
mydevices.cpp
View file

@ -1,8 +1,11 @@
#include "mydevices.h"
//int luminosite_environnement = 200;
using namespace std;
// classe I2CActuatorScreen
I2CActuatorScreen::I2CActuatorScreen ():Device(){}

1
mydevices.h
View file

@ -8,7 +8,6 @@
#include <fstream>
#include "core_simulation.h"
static int luminosite_environnement = 200;
// exemple d'actionneur sur le bus I2C permettant d'echanger des tableaux de caracteres : un ecran, ne pas oublier d'heriter de Device
class I2CActuatorScreen : public Device{
protected:

0
on.txt.txt → on.txt
View file

35
sketch_ino.cpp
View file

@ -21,26 +21,27 @@ void Board::loop(){
static int bascule=0;
int i=0;
for(i=0;i<10;i++){
// lecture sur la pin 1 : capteur de temperature
val1=analogRead(1);
sprintf(buf,"temperature %d",val1);
Serial.println(buf);
if (i%3==0) {
// lecture sur la pin 1 : capteur de temperature
val1 = analogRead(1);
sprintf(buf, "temperature %d", val1);
Serial.println(buf);
// lecture sur la pin 2 : capteur de temperature
val=analogRead(2);
sprintf(buf,"luminosite %d",val);
Serial.println(buf);
// lecture sur la pin 2 : capteur de temperature
val = analogRead(2);
sprintf(buf, "luminosite %d", val);
Serial.println(buf);
}
if(cpt%5==0){
// tous les 5 fois on affiche sur l ecran la temperature
sprintf(buf,"%d",val1);
bus.write(1,buf,100);
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);
}
cpt++;
sleep(1);
}
// on eteint et on allume la LED
if(analogRead(4))