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

PHmetre class fini, a integrer dans main

Browse source
This commit is contained in:
Cameron Bray 2020-05-18 16:12:57 +02:00
parent e5593747cf
commit fddef32cb0
6 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorManometre.cpp
View file

@ -12,6 +12,7 @@ void AnalogSensorManometre::run(){
if(ptrmem!=NULL){
if(cpt == 5){
*ptrmem = val - alea;
val = val - alea;
cpt = 0;
}
}

15
OtherDevices/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.cpp
View file

@ -3,3 +3,18 @@
//
#include "../../../include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h"
AnalogSensorPHmetre::AnalogSensorPHmetre(float val, int temps) : AnalogSensor(val, temps) {}
int AnalogSensorPHmetre::alea = 1;
void AnalogSensorPHmetre::run() {
int cpt = 0;
while (ptrmem!=NULL){
if (cpt == 3){
*ptrmem = val - alea;
val = val - alea;
cpt = 0;
}
sleep(temps);
cpt ++;
}
}

4
core_simulation.h
View file

@ -13,8 +13,8 @@
#define MAX_I2C_DEVICES 4
#define I2C_BUFFER_SIZE 1024
#define MAX_IO_PIN 6
#define THRESHOLDHIGH 17
#define THRESHOLDLOW 15
#define THRESHOLDHIGH 25
#define THRESHOLDLOW 20
using namespace std;

10
include/AnalogDevices/AnalogSensors/AnalogSensorManometre.h
View file

@ -4,11 +4,11 @@
#ifndef PROJET_VICTORAVECUNK_ANALOGSENSORMANOMETRE_H
#define PROJET_VICTORAVECUNK_ANALOGSENSORMANOMETRE_H
#include <iostream>
#include <thread>
#include <unistd.h>
#include <string.h>
#include <fstream>
//#include <iostream>
//#include <thread>
//#include <unistd.h>
//#include <string.h>
//#include <fstream>
#include "../AnalogDevice.h"
class AnalogSensorManometre : public AnalogSensor{

7
include/AnalogDevices/AnalogSensors/AnalogSensorPHmetre.h
View file

@ -5,9 +5,14 @@
#ifndef PROJET_VICTORAVECUNK_ANALOGSENSORPHMETRE_H
#define PROJET_VICTORAVECUNK_ANALOGSENSORPHMETRE_H
#include "../AnalogDevice.h"
class AnalogSensorPHmetre {
class AnalogSensorPHmetre : public AnalogSensor {
public:
static int alea;
AnalogSensorPHmetre(float val, int temps);
virtual void run();
};

8
sketch_ino.cpp
View file

@ -31,7 +31,7 @@ void Board::loop(){
val1 = analogRead(1);
sprintf(buf, "temperature %d", val1);
Serial.println(buf);
// Activation or not of the radiator
if ((val1 < THRESHOLDLOW)&&(radState == LOW)) {
digitalWrite(0, HIGH);
radState = HIGH;
@ -41,10 +41,8 @@ void Board::loop(){
radState = LOW;
}
// lecture sur la pin 2 : capteur de temperature
val = analogRead(2);
sprintf(buf, "luminosite %d", val);
val1 = analogRead(5);
sprintf(buf, "pressure %d", val1);
Serial.println(buf);
// }