From a3fc02d73e321008310a2a279c8d8f8ca9d30fee Mon Sep 17 00:00:00 2001 From: hans-jurgen Date: Sun, 2 Aug 2026 12:25:47 +0200 Subject: [PATCH] 2026-08-0200 --- platformio.ini | 36 ++++++++++++++++++++++++++++++------ src/main.cpp | 6 +++--- 2 files changed, 33 insertions(+), 9 deletions(-) diff --git a/platformio.ini b/platformio.ini index d8bc13e..1fac50d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,17 +9,17 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -extra_configs = ../../../../media/hans-jurgen/Transport/secrets.ini +extra_configs = ../secrets.ini [env] platform = espressif32 board = nodemcu-32s framework = arduino ; -monitor_port = /dev/ttyUSB0 +monitor_port = /dev/ttyACM0 monitor_speed = 115200 monitor_filters = time -upload_port = /dev/ttyUSB0 +upload_port = /dev/ttyACM0 build_flags = -DDEBUG=1 @@ -45,10 +45,10 @@ build_flags = ${env.build_flags} -DHW5=1 ;Neue Hardware 5.03 2025-04 ;-DDisplayTest=1 -DDISPLAY64_64=1 - -DHOSTNAME=\"SCHLAFZIMMER-DISPLAY\" - -DNAME=\"DISPLAY3\" + -DHOSTNAME=\"BORIS-DISPLAY\" + -DNAME=\"DISPLAY4\" -DGRENZWERT=3.70 - -DMYIP=\"192.168.127.109\" + -DMYIP=\"192.168.127.41\" -DInnenTemp=\"hjk/WOHNZIMMER/env\" -DStation=\"hjk/WETTERSTATION-SULZFELD/env\" -DCO2Wert=\"hjk/devices/257923/telemetry/co2\" @@ -92,5 +92,29 @@ build_flags = ${env.build_flags} -DBME_KorrekturFeuchte=0.00 -DAKKU_GREZWERT=2.950 +[env:boris] ; Entwicklungssystem +build_flags = ${env.build_flags} + ${secrets_hjk.build_flags} + ${secrets_mqtt.build_flags} + -DHW5=1 ;Neue Hardware 5.03 2025-04 + ;-DDisplayTest=1 + -DDISPLAY64_64=1 + -DWEISS=1 + -DHOSTNAME=\"BORIS-DISPLAY\" + -DNAME=\"DISPLAY4\" + -DGRENZWERT=3.70 + -DMYIP=\"192.168.127.41\" + -DInnenTemp=\"hjk/WOHNZIMMER/env\" + -DStation=\"hjk/WETTERSTATION-SULZFELD/env\" + -DCO2Wert=\"hjk/devices/257923/telemetry/co2\" + -DHELL=\"hjk/devices/DisplaySulzfeld/telemetry/Lux\" + -DHTU_Korrectur=0.00 + -DBME_Korrectur=-2.15 + -DKorrekturLuftdruck=0.00 + -DHTUKorrekturFeuchte=0.00 + -DBME_KorrekturFeuchte=0.00 + -DAKKU_GREZWERT=2.95 + + diff --git a/src/main.cpp b/src/main.cpp index 95410fc..3539f0c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -445,7 +445,7 @@ void ZeigeZeit(tm localTime, int xPos = 2, int yPos = 8) sprintf(szTime, "%02d", localTime.tm_hour); display.setCursor(xPos-1, yPos); display.setFont(&FreeMonoBold12pt7b); - #ifndef marcel + #ifndef WEISS display.setTextColor(myMAGENTA); #else display.setTextColor(myWHITE); @@ -456,7 +456,7 @@ void ZeigeZeit(tm localTime, int xPos = 2, int yPos = 8) // Doppelpunkt zeichnen display.fillRect(xPos + 27, yPos -8, 2, 15, myBLACK); if (blinkSek == true) { - #ifndef marcel + #ifndef WEISS display.fillRect(xPos + 27, yPos - 3, 2, 2, myMAGENTA); display.fillRect(xPos + 27, yPos + 1, 2, 2, myMAGENTA); #else @@ -468,7 +468,7 @@ void ZeigeZeit(tm localTime, int xPos = 2, int yPos = 8) sprintf(szTime, "%02d", localTime.tm_min); display.setCursor(xPos + 29, yPos); display.setFont(&FreeMonoBold12pt7b); - #ifndef marcel + #ifndef WEISS display.setTextColor(myMAGENTA); #else display.setTextColor(myWHITE);