Compare commits

..

No commits in common. "bc3a06c0a39bc4695e35f111d88cbe8dd2038aa4" and "86d6c283fb2835583a9f294a9d85801522d3af61" have entirely different histories.

5 changed files with 22 additions and 39 deletions

Binary file not shown.

View File

@ -2,7 +2,6 @@
#include <Wire.h> //Setup LCD #include <Wire.h> //Setup LCD
#include <LiquidCrystal_I2C.h> #include <LiquidCrystal_I2C.h>
LiquidCrystal_I2C lcd(0x3F,16,2); //0x3F = Adresse des Displays
#include "Truhe.h" #include "Truhe.h"
#include "Settings.h" #include "Settings.h"
@ -13,7 +12,7 @@ static unsigned long last_schalt_time = 0;
void setup_lcd() { void setup_lcd() {
//LCD //LCD
lcd.init(); lcd.begin(16, 2); //Starten des LCD, 16 Zeichen, 2 Zeilen
lcd.backlight(); //Beleuchtung des Displays einschalten lcd.backlight(); //Beleuchtung des Displays einschalten
lcd.blink(); lcd.blink();
lcd.clear(); lcd.clear();
@ -85,10 +84,6 @@ void loop() {
else if (truhen[i].getStat() == 0) { else if (truhen[i].getStat() == 0) {
lcd.print("O"); lcd.print("O");
} }
else if (truhen[i].getStat() == 2) {
lcd.setCursor(8, i);
lcd.print("Error");
}
if(truhen[i].getUpdLcd() == 0){ if(truhen[i].getUpdLcd() == 0){
lcd.setCursor(15, i); lcd.setCursor(15, i);
lcd.print(String("|")); lcd.print(String("|"));

Binary file not shown.

View File

@ -1,47 +1,37 @@
#include "Truhe.h" #include "Truhe.h"
Truhe::Truhe(String name, int relay, uint8_t sensorpin){ Truhe::Truhe(String name, int relay, uint8_t dhtpin): _dht(dhtpin, DHT22) {
_name = name; _name = name;
_relay = relay; _relay = relay;
_sensorpin = sensorpin; _dhtpin = dhtpin;
_oneWire = OneWire(sensorpin);
_sensors = DallasTemperature(&_oneWire);
}; };
void Truhe::setup() { void Truhe::setup() {
Serial.println("Setup " + _name); Serial.println("Setup " + _name);
Serial.println(_sensorpin); Serial.println(_dhtpin);
pinMode(_relay, OUTPUT); pinMode(_relay, OUTPUT);
digitalWrite(_relay, HIGH); digitalWrite(_relay, HIGH);
pinMode(_sensorpin, INPUT); pinMode(_dhtpin, INPUT);
_sensors.begin(); _dht.begin();
delay(2000);
} }
void Truhe::mess() { void Truhe::mess() {
Serial.println(String(_name) + " mess()"); Serial.println(String(_name) + " mess()");
_sensors.requestTemperatures(); //Serial.print("Minimum Sampling Period: ");
_cur_temp = _sensors.getTempCByIndex(0); //delay(_dht.getMinimumSamplingPeriod());
// Check if reading was successful _cur_temp = _dht.readTemperature();
if(_cur_temp != DEVICE_DISCONNECTED_C) Serial.println(String(_name) + "\t\t" + String((int)_cur_temp) + " grad gelesen");
{
Serial.println(String(_name) + "\t\t" + String((int)_cur_temp) + " grad gelesen");
}
else
{
Serial.println("Error: Could not read temperature data: "+ String(_name));
_cur_temp = 99; // Liewer warmes bier als garkenn bier
_stat = 2;
}
}; };
void Truhe::schalt(int oT, int uT) { void Truhe::schalt(int oT, int uT) {
Serial.print(String(_name) + " schalt() stat: " + String(_stat)); Serial.print(String(_name) + " schalt() stat: " + String(_stat));
if (_cur_temp >= oT && _stat != 1 && _stat != 2) { if (_cur_temp >= oT && _stat != 1) {
digitalWrite(_relay, LOW); digitalWrite(_relay, LOW);
_stat = 1; _stat = 1;
Serial.println("schalt " + _name + " zu " + String(_stat)); Serial.println("schalt " + _name + " zu " + String(_stat));
} }
else if (_cur_temp <= uT && _stat != 0 && _stat != 2) { else if (_cur_temp <= uT && _stat != 0) {
digitalWrite(_relay, HIGH); digitalWrite(_relay, HIGH);
_stat = 0; _stat = 0;
Serial.println("schalt " + _name + " zu " + String(_stat)); Serial.println("schalt " + _name + " zu " + String(_stat));
@ -50,7 +40,7 @@ void Truhe::schalt(int oT, int uT) {
int Truhe::getUpdLcd(){ return _updlcd;}; int Truhe::getUpdLcd(){ return _updlcd;};
void Truhe::setUpdLcd(int updlcd){ _updlcd = updlcd;}; void Truhe::setUpdLcd(int updlcd){ _updlcd = updlcd;};
int Truhe::getRelay(){ return _relay;}; int Truhe::getRelay(){ return _relay;};
int Truhe::getSensorPin(){return _sensorpin;}; int Truhe::getDhtPin(){return _dhtpin;};
int Truhe::getStat(){return _stat;}; int Truhe::getStat(){return _stat;};
int Truhe::getCurTemp(){return int(_cur_temp);}; float Truhe::getCurTemp(){return _cur_temp;};
String Truhe::getName(){return _name;}; String Truhe::getName(){return _name;};

12
Truhe.h
View File

@ -1,11 +1,9 @@
#include <OneWire.h> #include <DHT.h>
#include <DallasTemperature.h>
class Truhe { class Truhe {
private: private:
OneWire _oneWire; DHT _dht;
DallasTemperature _sensors;
int _relay; int _relay;
uint8_t _sensorpin; uint8_t _dhtpin;
int _stat = -1; int _stat = -1;
float _cur_temp = 0; float _cur_temp = 0;
int _updlcd = 0; int _updlcd = 0;
@ -18,8 +16,8 @@ class Truhe {
int getUpdLcd(); int getUpdLcd();
void setUpdLcd(int); void setUpdLcd(int);
int getRelay(); int getRelay();
int getSensorPin(); int getDhtPin();
int getStat(); int getStat();
int getCurTemp(); float getCurTemp();
String getName(); String getName();
}; };