Skip to content

Commit

Permalink
V1.08 Issue #6 Issue #7 + Diverse kleine Anpassungen
Browse files Browse the repository at this point in the history 
- Issue #6 bei fehlender Verbindung endlosschleife   
- Issue #7 Abbruch der Anzeige wenn OpenWeather einen Fehler zurückgibt
- Anpssung in der Wallboxdarstellung Verriegelung etc. wurde falsch 
angezeigt   
- Wallbox Solarstrom es wurde der letzte Wert nicht ausgeblendet    
- Darstellung der Ausgaben angepasst
  • Loading branch information
@nischram
nischram committed Mar 23, 2023
1 parent 4243b23 commit a374c59
Show file tree
Hide file tree
Showing 11 changed files with 1,273 additions and 449 deletions.
18 changes: 10 additions & 8 deletions EMD_1/EMD_1.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
#include <time.h>
#include <TimeLib.h>

#define SW_VERSION 1.07
#define SW_DATE "02.01.2023"
#define SW_VERSION 1.08
#define SW_DATE "23.03.2023"
#define TYPE "EMD-1 : "

#include "parameter.h"
Expand Down Expand Up @@ -66,7 +66,7 @@ void setup() {
firstReadMagicByte(mbIP_E3DC);
if(wifiTimeout == true || modbusTimeout == true)screenActive = SCREEN_REFRESH;
readPIR();
Serial.printf("Screen Save Time : %i\n", readScreenSave());
Serial.printf("Screen Save Time : %i\n", readScreenSave());
lastScreenMillis = millis();
delay(4000);
firstBoot = false;
Expand Down Expand Up @@ -145,19 +145,21 @@ void loop() {
tftPercentRect(92, 111, 22, 66, ILI9341_DARKGREY, ILI9341_WHITE, eigenverbrauch);
tftPercentRect(126, 111, 22, 66, ILI9341_DARKGREEN, ILI9341_WHITE, autarkie);
#ifdef EXT_LM_USE
overwriteLcdTextWorth(6, 194, 82, 12, ILI9341_DARKGREY, ILI9341_WHITE, FontMonospaced_bold_16,"W","%6d",extPower);
overwriteLcdTextWorth(6, 194, 82, 12, ILI9341_DARKGREY, ILI9341_WHITE, FontMonospaced_bold_16,"W","%6d",extPower * -1);
#endif
#ifdef EXT_WB_USE
overwriteLcdTextWorth(148, 194, 82, 12, ILI9341_DARKGREY, ILI9341_WHITE, FontMonospaced_bold_16,"W","%6d",wbAllPower);
if(wbSolarPower > 30)
overwriteLcdTextWorth(148, 208, 82, 12, ILI9341_ORANGE, ILI9341_WHITE, FontMonospaced_bold_16,"W","%6d",wbSolarPower);
if ((wbCtrl & WB_CONNECT) == WB_CONNECT)tft.drawRGBBitmap(168, 145, carConnect,52,28);
else if ((wbCtrl & WB_LOCKED) == WB_LOCKED)tft.drawRGBBitmap(168, 145, carLocked,52,28);
else if ((wbCtrl & WB_CHARGE) == WB_CHARGE){
else
tft.fillRect(148, 195, 82, 16, ILI9341_WHITE);
if ((wbCtrl & WB_CHARGE) == WB_CHARGE){
if (wbAllPower <= 200 && wbSolarPower >=200)tft.drawRGBBitmap(168, 145, carSun,52,28);
else if (wbAllPower >= 200 && wbSolarPower <=200)tft.drawRGBBitmap(168, 145, carGridRed,52,28);
else tft.drawRGBBitmap(168, 145, carMix,52,28);
}
else if ((wbCtrl & WB_LOCKED) == WB_LOCKED)tft.drawRGBBitmap(168, 145, carLocked,52,28);
else if ((wbCtrl & WB_CONNECT) == WB_CONNECT)tft.drawRGBBitmap(168, 145, carConnect,52,28);
else{
tft.drawRGBBitmap(168, 145, car,52,28);
}
Expand Down Expand Up @@ -486,7 +488,7 @@ void loop() {
screenSaveActiv = ON;
screenActive = SCREEN_SAVE;
drawScreen = NEW;
Serial.println("Screen Save : Aktiv");
Serial.println("Screen Save : Aktiv");
}
}

Expand Down
4 changes: 2 additions & 2 deletions EMD_1/dhttemp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
void serialPrintDHT(){
readDHT();

Serial.print("Temperatur : ");
Serial.print("Temperatur : ");
Serial.print(temp);
Serial.println(" °C");
Serial.print("Luftfeuchtigkeit : ");
Serial.print("Luftfeuchtigkeit : ");
Serial.print(hum);
Serial.println(" %");
}
Expand Down
6 changes: 3 additions & 3 deletions EMD_1/display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,12 @@ void drawBitmapRGB(int t, const uint16_t bitmap[], int16_t w, int16_t h) {
void initTouch(){
pinMode(TFT_LED, OUTPUT); // define as output for backlight control
backlightOFF();
Serial.print("Init TFT : ");
Serial.print("Init TFT : ");
tft.begin();
tft.setRotation(readRotation()); // landscape mode
Serial.print("TFT-X ="); Serial.print(tft.width());
Serial.print(" TFT-Y ="); Serial.println(tft.height());
Serial.print("Init Tuoch : ");
Serial.print("Init Tuoch : ");
touch.begin();
touch.setRotation(readRotation());
tft.fillRect(0, 0, 240, 320, ILI9341_DARKGREY);
Expand Down Expand Up @@ -189,7 +189,7 @@ bool checkTouch(){
if (Touch_Event()== true) {
X = p.x + TOUCH_OFFSET_X; Y = p.y + TOUCH_OFFSET_Y;
Touch_pressed = true;
Serial.print("Y ");Serial.print(Y);Serial.print(" X ");Serial.println(X); //Kontrolle Touch
//Serial.print("Y ");Serial.print(Y);Serial.print(" X ");Serial.println(X); //Kontrolle Touch
}
else {
Touch_pressed = false;
Expand Down
22 changes: 11 additions & 11 deletions EMD_1/funktion.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void drawScreenMain(){
if(!drawScreen){
delayTime = 20;
drawMainScreen();
Serial.println("Display Menü : Main");
Serial.println("Display Menü : Main");
drawBitmapRGB(Main_R1_S1, menuLeistung,80,80);
drawBitmapRGB(Main_R1_S2, menuPV,80,80);
drawBitmapRGB(Main_R2_S1, menuWetter,80,80);
Expand All @@ -67,7 +67,7 @@ void drawScreenSecond(){
if(!drawScreen){
delayTime = 20;
drawMainScreen();
Serial.println("Display Menü : Second");
Serial.println("Display Menü : Second");
drawBitmapRGB(Main_R1_S1, menuFree,80,80);
drawBitmapRGB(Main_R1_S2, menuFree,80,80);
drawBitmapRGB(Main_R2_S1, menuFree,80,80);
Expand All @@ -81,7 +81,7 @@ void drawScreenSecond(){
}
void drawScreenAktuel(){
if(!drawScreen){
Serial.println("Display Screen : Aktuell");
Serial.println("Display Screen : Aktuell");
tft.fillRect(0, 0, 240, 320, ILI9341_DARKGREY);
tft.fillRect(6, 6, 228, 308, ILI9341_WHITE);
drawBitmapRGB(Pos_Sym_PV, Sym_PV,60,60);
Expand All @@ -102,7 +102,7 @@ void drawScreenAktuel(){
void drawScreenPV(){
if(!drawScreen){
drawMainScreen();
Serial.println("Display Screen : PV");
Serial.println("Display Screen : PV");
tft.fillRect(6, 20, 228, 294, ILI9341_WHITE);
drawBitmapRGB(Pos_PV_Mitte, Sym_PV,60,60);
drawBitmapRGB(Pos_Modul_1, PV_Modul,60,52);
Expand All @@ -115,7 +115,7 @@ void drawScreenPV(){
}
void drawScreenWetter(){
if(!drawScreen){
Serial.println("Display Screen : Wetter");
Serial.println("Display Screen : Wetter");
tft.fillRect(0, 0, 240, 320, ILI9341_DARKGREY);
tft.fillRect(6, 6, 228, 308, ILI9341_WHITE);
drawBitmapRGB(Pos_Sym_Back, Sym_Back,32,21);
Expand All @@ -128,7 +128,7 @@ void drawScreenWetter(){
void drawScreenEinst(){
if(!drawScreen){
drawMainScreen();
Serial.println("Display Menü : Einstellungen");
Serial.println("Display Menü : Einstellungen");
tft.drawRect(touchXmin[Small_R1_S1]-1, touchYmin[Small_R1_S1]-1, 42, 42, ILI9341_GREEN);
tft.drawRect(touchXmin[Small_R1_S2]-1, touchYmin[Small_R1_S2]-1, 170, 42, ILI9341_GREEN);
tft.fillRect(touchXmin[Small_R1_S2], touchYmin[Small_R1_S2], 168, 40, ILI9341_WHITE);
Expand All @@ -151,7 +151,7 @@ void drawScreenEinst(){
void drawScreenRefresh(){
if(!drawScreen){
drawMainScreen();
Serial.println("Display Menü : Refresh");
Serial.println("Display Menü : Refresh");
tft.drawRect(touchXmin[Small_R1_S1]-1, touchYmin[Small_R1_S1]-1, 42, 42, ILI9341_GREEN);
tft.drawRect(touchXmin[Small_R1_S2]-1, touchYmin[Small_R1_S2]-1, 170, 42, ILI9341_GREEN);
tft.fillRect(touchXmin[Small_R1_S2], touchYmin[Small_R1_S2], 168, 40, ILI9341_WHITE);
Expand All @@ -170,7 +170,7 @@ void drawScreenRefresh(){
void drawScreenUpdate(){
if(!drawScreen){
drawMainScreen();
Serial.println("Display Menü : Update");
Serial.println("Display Menü : Update");
tft.drawRect(touchXmin[Small_R1_S1]-1, touchYmin[Small_R1_S1]-1, 42, 42, ILI9341_GREEN);
tft.drawRect(touchXmin[Small_R1_S2]-1, touchYmin[Small_R1_S2]-1, 170, 42, ILI9341_GREEN);
tft.fillRect(touchXmin[Small_R1_S2], touchYmin[Small_R1_S2], 168, 40, ILI9341_WHITE);
Expand All @@ -186,7 +186,7 @@ void drawScreenSave(){
if(!drawScreen){
backlightOFF();
drawMainScreen();
Serial.println("Display Menü : Screensaver");
Serial.println("Display Menü : Screensaver");
tft.fillRect(0, 0, 240, 320, ILI9341_DARKGREY);
tft.fillRect(6, 6, 228, 308, ILI9341_LIGHTGREY);
tft.fillRect(12, 12, 216, 296, ILI9341_WHITE);
Expand All @@ -201,7 +201,7 @@ void drawScreenSave(){
}
}
void drawScreenOTA(){
Serial.println("Display Screen : OTA");
Serial.println("Display Screen : OTA");
tft.fillRect(0, 0, 240, 320, ILI9341_DARKGREY);
tft.fillRect(6, 6, 228, 308, ILI9341_LIGHTGREY);
tft.fillRect(12, 12, 216, 296, ILI9341_WHITE);
Expand All @@ -222,7 +222,7 @@ void checkStartScreen(){
screenSaveActiv = OFF;
drawScreen = NEW;
backlightON();
Serial.println("Screen Save : Deaktiv");
Serial.println("Screen Save : Deaktiv");
}
}
#endif // __FUNKTION_H_
Loading

0 comments on commit a374c59

Please sign in to comment.