Merge branch 'dht22_adafruit_fix'

# Conflicts:
#	src/Greenhouse.cpp

platformio.ini

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

src/Greenhouse.cpp

@@ -1,20 +1,20 @@
 #ifdef NODE_GREENHOUSE
 
 #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() {
-  greenhouse_TSL2561.setup();
-  greenhouse_BMP280_AHT20.setup();
+  greenhouseTSL.setup();
+  greenhouseDHT22.setup();
 }
 
 void patrixLoop() {
-  greenhouse_TSL2561.loop();
-  greenhouse_BMP280_AHT20.loop();
+  greenhouseTSL.loop();
+  greenhouseDHT22.loop();
 }
 
 #endif

src/patrix/DHT22.h

@@ -24,12 +24,13 @@ public:
 
   void setup() {
     dht.begin();
+    last = millis();
   }
 
   void loop() {
     const auto now = max(1UL, millis());
     float temperature = NAN;
-    if (last == 0 || now - last >= intervalMs) {
+    if (now - last >= intervalMs) {
       sensors_event_t event;
 
       dht.temperature().getEvent(&event);