Skip to content

Einbau BME/BMP280 und Drucksensor AD Wandler, Taster für Display über IRS #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
addi-daddi wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Einbau BME/BMP280 und Drucksensor AD Wandler, Taster für Display über IRS #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe10308
feat: implementiere display taster per interrupt
addi-daddi Dec 26, 2025
0de63fc
Add files via upload
addi-daddi Feb 3, 2026
713cbc4
Delete zisterne.ino
addi-daddi Feb 3, 2026
e3ebf77
Add files via upload
addi-daddi Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
201 changes: 121 additions & 80 deletions zisterne/display.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
//LCD Setup
//***********************
void ladeLCDdisplay() {
Wire.begin(12, 13); //SDA-D6, SCL-D7 // LCD Setup (bei beiden LCD Displays gleich)
// Wire.begin(12, 13); //SDA-D6, SCL-D7 // LCD Setup (bei beiden LCD Displays gleich)

// *******************Boot mit LAN-Info für 1602 Display**************************
if (cfg.data_display ==1) {
timer.setInterval(1000);
lcd.begin();
// lcd.begin();
lcd.init();
lcd.backlight();
lcd.print(cfg.SSID);
lcd.setCursor(0, 1);
Expand All @@ -27,7 +28,7 @@
// *******************Boot mit LAN-Info für 1604 Display**************************
if (cfg.data_display ==2) {
timer.setInterval(1000);
lcd.begin();
lcd.init();
lcd.backlight();
lcd.setCursor(0, 0);
lcd.print("Ihre SSID:");
Expand All @@ -47,7 +48,8 @@
delay (5000);
lcd.noBacklight();
}
}
}


void ladeOLEDdisplay() {
//*******************************Initialisierung und DEBUG OLED************************************
Expand Down Expand Up @@ -97,101 +99,140 @@
//LCD mit Tastersteuerung für 1602 Display
//***********************
void loop1602() {
if ( millis() - displayMicros >= 5000 ) {
displayMicros = millis();
lcd.clear();
lcd.setCursor(0,0);
lcd.print(volumen);
lcd.print( " Liter,");
lcd.setCursor(0,1);
lcd.print(fuellstand);
lcd.print( " % voll");
if (millis() - displayMicros >= 5000 ) {
displayMicros = millis();
lcd.clear();
lcd.setCursor(0,0);
lcd.print(volumen);
lcd.print( " Liter,");
lcd.setCursor(0,1);
lcd.print(fuellstand);
lcd.print( " % voll");
}

if ((backlstatus == 0) && (digitalRead(taster) == HIGH)) {
lcd.backlight();
backlstatus = 1;
delay (300); //gegen Tastenprellen
}
unsigned long tasterMicros = millis();
if (tasterMicros - previousMicros >= 90000 ) {
previousMicros = tasterMicros;
lcd.noBacklight();
if ((tasterMicros - previousMicros >= 90000) && backlstatus) {
lcd.noBacklight();
backlstatus = false;
return;
}
if ((backlstatus == 1) && (digitalRead(taster) == HIGH)) {
lcd.noBacklight();
backlstatus = 0;
delay (300); //gegen Tastenprellen

if ((backlstatus == false) && (tasterHigh)) {
resetBacklightTaster();
lcd.backlight();
backlstatus = true;
previousMicros = millis();
return;
}

if (backlstatus && tasterHigh) {
resetBacklightTaster();
lcd.noBacklight();
backlstatus = false;
return;
}
}

}

//***********************
//LCD mit Tastersteuerung für 1604 Display
//***********************
void loop1604() {
void loop1604() {
if ( millis() - displayMicros >= 5000 ) {
displayMicros = millis();
lcd.clear();
lcd.setCursor(0,0);
lcd.print( "F\365llstand:"); // Ueberschrift
lcd.setCursor(0,1);
lcd.print(volumen);
lcd.print( " Liter,");
lcd.setCursor(0,3);
lcd.print(fuellstand);
lcd.print( " % voll");
displayMicros = millis();
lcd.clear();
lcd.setCursor(0,0);
lcd.print( "F\365llstand:"); // Ueberschrift
lcd.setCursor(0,1);
lcd.print(volumen);
lcd.print( " Liter,");
lcd.setCursor(0,3);
lcd.print(fuellstand);
lcd.print( " % voll");
}

if ((backlstatus == 0) && (digitalRead(taster) == HIGH)) {
lcd.backlight();
backlstatus = 1;
delay (300); //gegen Tastenprellen
}
unsigned long tasterMicros = millis();
if (tasterMicros - previousMicros >= 180000 ) {
previousMicros = tasterMicros;
lcd.noBacklight();
}
if ((backlstatus == 1) && (digitalRead(taster) == HIGH)) {
lcd.noBacklight();
backlstatus = 0;
delay (300); //gegen Tastenprellen
}
}
unsigned long tasterMicros = millis();
if ((tasterMicros - previousMicros >= 90000) && backlstatus) {
lcd.noBacklight();
backlstatus = false;
return;
}

if ((backlstatus == false) && (tasterHigh)) {
resetBacklightTaster();
lcd.backlight();
backlstatus = true;
previousMicros = millis();
return;
}

if (backlstatus && tasterHigh) {
resetBacklightTaster();
lcd.noBacklight();
backlstatus = false;
return;
}
}
//***********************
// OLED Display
//***********************

void loopOLED() {
if (((backlstatus == 0) && (digitalRead(taster) == HIGH)) || (backlstatus == 1)){
backlstatus = 1;
delay (300);
if ( millis() - displayMicros >= 5000 ) {
displayMicros = millis();

// setze Display-Timout zu 30 Sekunden
// prüfe wenn Display an ist, ob das letzte Einschalten mehr als 30sek in der Vergangenheit liegt
unsigned long oledTimeout = millis();
if ((oledTimeout - previousMicros >= 30000) && backlstatus ) {
oledFill(&ssoled, 0, 1);
char Volumen[10];
sprintf(Volumen,"%.2f l", volumen);
char Fuellstand[10];
sprintf(Fuellstand,"%.2f%%", fuellstand);
oledWriteString(&ssoled, 0,0,0,(char *)"Fuellstand:" , FONT_NORMAL, 0, 1);
oledWriteString(&ssoled, 0,60,3,Volumen, FONT_SMALL, 0, 1);
oledWriteString(&ssoled, 0,60,5,Fuellstand, FONT_SMALL, 0, 1);
//*********************Grafik **********************
rest = map(fuellstand, 0, 100, 62, 13); // Hoehe des Balkens ermitteln
oledRectangle(&ssoled, (1), (13), (45), (62), 1, 0); // aeussere Linie zeichnen
oledRectangle(&ssoled, (1), (rest), (45), (62), 1, 1); // Fuellbalken
oledDumpBuffer(&ssoled, NULL);
}
backlstatus = false;
return;
}

unsigned long tasterMicros = millis();
if (tasterMicros - previousMicros >= 180000 ) {
previousMicros = tasterMicros;
oledFill(&ssoled, 0, 1);
backlstatus = 0;
}
if ((backlstatus == 1) && (digitalRead(taster) == HIGH)) {

//if ((backlstatus == 1) && (digitalRead(taster) == HIGH)) {

// Schalte das Display aus, falls es an ist
// setze das Flag für den GPIO-Pin zurück
if (backlstatus && tasterHigh) {
resetBacklightTaster();
oledFill(&ssoled, 0, 1);
backlstatus = 0;
delay (300);
//delay (300); //gegen Tastenprellen
backlstatus = false;
return;
}

//if (((backlstatus == 0) && (digitalRead(taster) == HIGH)) || (backlstatus == 1)){
// if ((backlstatus == 0) && (digitalRead(taster) == HIGH)) {

// schalte Display ein, falls aus
// aktualisiere Display nach 5 sek falls an
// setze Flag für GPIO-Pin zurück und speichere Zeitpunkt des letzten Taster-Drucks in previousMicros
if (!backlstatus && tasterHigh) {
if (tasterHigh) {
previousMicros = millis();
}
// delay (300); //gegen Tastenprellen
backlstatus = true;
resetBacklightTaster();
}

if (backlstatus) {
// aktualisiere Display
if ( millis() - displayMicros >= 5000 ) {
displayMicros = millis();
oledFill(&ssoled, 0, 1);
char Volumen[10];
sprintf(Volumen,"%.2f l", volumen);
char Fuellstand[10];
sprintf(Fuellstand,"%.2f%%", fuellstand);
oledWriteString(&ssoled, 0,0,0,(char *)"Fuellstand:" , FONT_NORMAL, 0, 1);
oledWriteString(&ssoled, 0,60,3,Volumen, FONT_SMALL, 0, 1);
oledWriteString(&ssoled, 0,60,5,Fuellstand, FONT_SMALL, 0, 1);
//*********************Grafik **********************
rest = map(fuellstand, 0, 100, 62, 13); // Hoehe des Balkens ermitteln
oledRectangle(&ssoled, (1), (13), (45), (62), 1, 0); // aeussere Linie zeichnen
oledRectangle(&ssoled, (1), (rest), (45), (62), 1, 1); // Fuellbalken
oledDumpBuffer(&ssoled, NULL);
}
}
}
3 changes: 2 additions & 1 deletion zisterne/myTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ typedef struct {
//Sonstiges
int data_dezstellen_anzeige;
int data_anzeige_liter_check;

int data_height_over_NN;

//weitere MQTT
char data_mqtt_abstand_topic[51];
int data_mqtt_port;
Expand Down
4 changes: 2 additions & 2 deletions zisterne/ota.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ void checkForUpdates() {
Serial.println( fwVersionURL );

HTTPClient httpClient;
httpClient.begin( fwVersionURL );
// httpClient.begin( fwVersionURL );
int httpCode = httpClient.GET();
if( httpCode == 200 ) {
String newFWVersion = httpClient.getString();
Expand All @@ -37,7 +37,7 @@ void checkForUpdates() {

String fwImageURL = fwURL;
fwImageURL.concat( ".bin" );
t_httpUpdate_return ret = ESPhttpUpdate.update( fwImageURL );
t_httpUpdate_return ret = ESPhttpUpdate.update(httpClient, fwImageURL );

switch(ret) {
case HTTP_UPDATE_FAILED:
Expand Down
11 changes: 11 additions & 0 deletions zisterne/rechnen.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,17 @@ void looprechnen() {
delay(100);
}

//****************************************************
// Druck Sensor ADS1115
//****************************************************
if (cfg.data_zisterne_sensor == 4) {
adc0 = ads.getLastConversionResults();
//Serial.print("AIN0: "); Serial.println(adc0*0.02);
abstand=(cfg.data_abst_sen_boden-(adc0*0.02));
fuellhoehe=(adc0*0.02);
delay(100);
}

//abstand = 100; //nur testweise wenn kein Sensor dran haengt

//Fuellstand prozentual berechnen
Expand Down
2 changes: 1 addition & 1 deletion zisterne/relais.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//********************************************************
// Schaltet ein externes Relais an Ausgang D4 / Pin 2
// Schaltet ein externes Relais an Ausgang D3 / Pin 0
// in Abhaengigkeit von zwei Werten
//********************************************************
void relais() {
Expand Down
2 changes: 1 addition & 1 deletion zisterne/relais2.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//***********************************************************
// Schaltet ein zweites externes Relais an Ausgang D3 / Pin 2
// Schaltet ein zweites externes Relais an Ausgang D4 / Pin 2
// in Abhaengigkeit von zwei Werten
// NOCH NICHT IMPLEMENTIERT
//***********************************************************
Expand Down
Loading