Only query current time once in requestMeasurement

Also enable dht debug logging in debug mode

platformio.ini

@@ -57,7 +57,9 @@ test_framework = unity
 
 [debug]
 build_type = debug
-build_flags = -D CORE_DEBUG_LEVEL=5
+build_flags =
+    -D CORE_DEBUG_LEVEL=5
+    -D DHT_DEBUG
 
 [env:native]
 platform = native

src/sensors/DHTHandler.cpp

@@ -28,8 +28,9 @@ bool DHTHandler::begin() {
 }
 
 bool DHTHandler::requestMeasurement() {
-	if (_last_request == -1 || millis() - _last_request >= MIN_INTERVAL) {
-		_last_request = millis();
+	const uint64_t now = millis();
+	if (_last_request == -1 || now - _last_request >= MIN_INTERVAL) {
+		_last_request = now;
 		if (!_dht.read(false)) {
 			_temperature = _humidity = NAN;
 			log_w("Failed to read data from dht.");
@@ -53,7 +54,7 @@ bool DHTHandler::requestMeasurement() {
 	} else {
 		log_i("Attempted to read sensor data before minimum delay.");
 		log_d("Min delay: %ums, Time since measurement: %ums",
-				(uint32_t) MIN_INTERVAL, (uint32_t) (millis() - _last_request));
+				(uint32_t) MIN_INTERVAL, (uint32_t) (now - _last_request));
 		return false;
 	}
 }

src/sensors/DallasHandler.cpp

@@ -40,13 +40,15 @@ bool DallasHandler::begin() {
 }
 
 bool DallasHandler::requestMeasurement() {
-	if (_last_request == -1 || millis() - _last_request >= MIN_INTERVAL) {
+	uint64_t now = millis();
+	if (_last_request == -1 || now - _last_request >= MIN_INTERVAL) {
 		// Read previous measurements, if they weren't read yet.
 		if (_last_request > _last_finished_request) {
 			getTemperature();
+			now = millis();
 		}
 
-		_last_request = millis();
+		_last_request = now;
 		DeviceAddress address;
 		if (!_sensors.getAddress(address, SENSOR_INDEX)) {
 			log_w("Failed to get address for sensor %u.", SENSOR_INDEX);
@@ -65,7 +67,7 @@ bool DallasHandler::requestMeasurement() {
 	} else {
 		log_i("Attempted to read sensor data before minimum delay.");
 		log_d("Min delay: %ums, Time since measurement: %ums",
-				(uint32_t) MIN_INTERVAL, (uint32_t) (millis() - _last_request));
+				(uint32_t) MIN_INTERVAL, (uint32_t) (now - _last_request));
 		return false;
 	}
 }