patrick/Helligkeit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dht22_adafruit_fix'

Browse Source 
# Conflicts:
#	src/Greenhouse.cpp
This commit is contained in:
Patrick Haßel 2025-03-03 10:15:19 +01:00
commit 118bef8f72
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
platformio.ini
View File

@ -39,10 +39,10 @@ lib_deps = ${common.lib_deps}
build_flags = ${common.build_flags} -DNODE_GREENHOUSE -DHOSTNAME=\"Greenhouse\" build_flags = ${common.build_flags} -DNODE_GREENHOUSE -DHOSTNAME=\"Greenhouse\"
board_build.filesystem = ${common.board_build.filesystem} board_build.filesystem = ${common.board_build.filesystem}
monitor_speed = ${common.monitor_speed} monitor_speed = ${common.monitor_speed}
;upload_protocol = ${common.upload_protocol} upload_protocol = ${common.upload_protocol}
;upload_port = 10.0.0.160 upload_port = 10.0.0.160
upload_port = ${common.upload_port} ;upload_port = ${common.upload_port}
upload_speed = ${common.upload_speed} ;upload_speed = ${common.upload_speed}
[env:Fermenter] [env:Fermenter]
platform = ${esp12e.platform} platform = ${esp12e.platform}
@ -54,6 +54,6 @@ board_build.filesystem = ${common.board_build.filesystem}
monitor_speed = ${common.monitor_speed} monitor_speed = ${common.monitor_speed}
upload_flags = --auth=OtaAuthPatrixFermenter upload_flags = --auth=OtaAuthPatrixFermenter
upload_protocol = ${common.upload_protocol} upload_protocol = ${common.upload_protocol}
upload_port = 10.0.0.169 upload_port = 10.0.0.164
;upload_port = ${common.upload_port} ;upload_port = ${common.upload_port}
;upload_speed = ${common.upload_speed} ;upload_speed = ${common.upload_speed}

14
src/Greenhouse.cpp
View File

@ -1,20 +1,20 @@
#ifdef NODE_GREENHOUSE #ifdef NODE_GREENHOUSE
#include "patrix/tsl2561.h" #include "patrix/tsl2561.h"
#include "patrix/bmp280_aht20.h" #include "patrix/DHT22.h"
TSL2561 greenhouse_TSL2561("greenhouse"); TSL2561 greenhouseTSL("greenhouse");
BMP280_AHT20 greenhouse_BMP280_AHT20("greenhouse"); DHT22Sensor greenhouseDHT22("greenhouse", D5);
void patrixSetup() { void patrixSetup() {
greenhouse_TSL2561.setup(); greenhouseTSL.setup();
greenhouse_BMP280_AHT20.setup(); greenhouseDHT22.setup();
} }
void patrixLoop() { void patrixLoop() {
greenhouse_TSL2561.loop(); greenhouseTSL.loop();
greenhouse_BMP280_AHT20.loop(); greenhouseDHT22.loop();
} }
#endif #endif

5
src/patrix/DHT22.h
View File

@ -24,12 +24,13 @@ public:
void setup() { void setup() {
dht.begin(); dht.begin();
last = millis();
} }
void loop() { void loop() {
const auto now = max(1UL, millis()); const auto now = max(1UL, millis());
float temperature = NAN; float temperature = NAN;
if (last == 0 || now - last >= intervalMs) { if (now - last >= intervalMs) {
sensors_event_t event; sensors_event_t event;
dht.temperature().getEvent(&event); dht.temperature().getEvent(&event);
@ -50,7 +51,7 @@ public:
mqttPublishValue(name + "/humidity/absolute", absHumid, "HUMIDITY_ABSOLUTE_GM3"); mqttPublishValue(name + "/humidity/absolute", absHumid, "HUMIDITY_ABSOLUTE_GM3");
} }
} }
last = now; last = now;
} }
} }