reordering of functions
This commit is contained in:
parent
6302cabda5
commit
0ab545a21c
|
@ -13,7 +13,7 @@ platform = espressif8266
|
||||||
board = esp01_1m
|
board = esp01_1m
|
||||||
framework = arduino
|
framework = arduino
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
|
; upload_port = /dev/cu.usbserial-22410
|
||||||
lib_deps =
|
lib_deps =
|
||||||
PubSubClient
|
PubSubClient
|
||||||
DHT sensor library
|
DHT sensor library
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include <Arduino.h>
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <PubSubClient.h>
|
#include <PubSubClient.h>
|
||||||
#include "DHT.h"
|
#include "DHT.h"
|
||||||
|
@ -13,19 +14,15 @@ const char* temperatureTopic = "sensors/dht2/temperature";
|
||||||
|
|
||||||
unsigned long lastMeasureAttempt = 0;
|
unsigned long lastMeasureAttempt = 0;
|
||||||
|
|
||||||
// DHT dht;
|
|
||||||
DHT dht(DHTPIN, DHTTYPE);
|
DHT dht(DHTPIN, DHTTYPE);
|
||||||
WiFiClient espClient;
|
WiFiClient espClient;
|
||||||
PubSubClient client(espClient);
|
PubSubClient client(espClient);
|
||||||
|
|
||||||
const long measurementInterval = 5000; //dht.getMinimumSamplingPeriod();
|
const long measurementInterval = 5000;
|
||||||
|
|
||||||
void setup() {
|
void yield(unsigned long yieldDuration) { //overload yield function to allow for any ms delay
|
||||||
Serial.begin(115200);
|
unsigned long yieldBegan = millis();
|
||||||
Serial.println();
|
while ( (millis() - yieldBegan) < yieldDuration ) yield();
|
||||||
setup_wifi();
|
|
||||||
client.setServer(mqttServer, mqttPort);
|
|
||||||
dht.begin();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void setup_wifi() {
|
void setup_wifi() {
|
||||||
|
@ -39,6 +36,17 @@ void setup_wifi() {
|
||||||
Serial.println(WiFi.localIP());
|
Serial.println(WiFi.localIP());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void reportResults(float temp, float humid) {
|
||||||
|
if (!isnan(temp) || !isnan(humid)) {
|
||||||
|
Serial.println("-----------------------");
|
||||||
|
Serial.println("Humidity (%): " + String(humid));
|
||||||
|
Serial.println("Temperature (°C): " + String(temp));
|
||||||
|
Serial.println("-----------------------");
|
||||||
|
client.publish(humidityTopic, String(humid).c_str(), true);
|
||||||
|
client.publish(temperatureTopic, String(temp).c_str(), true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void reconnect() {
|
void reconnect() {
|
||||||
while (!client.connected()) {
|
while (!client.connected()) {
|
||||||
Serial.print("Attempting MQTT connection...");
|
Serial.print("Attempting MQTT connection...");
|
||||||
|
@ -53,6 +61,14 @@ void reconnect() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setup() {
|
||||||
|
Serial.begin(115200);
|
||||||
|
Serial.println();
|
||||||
|
setup_wifi();
|
||||||
|
client.setServer(mqttServer, mqttPort);
|
||||||
|
dht.begin();
|
||||||
|
}
|
||||||
|
|
||||||
void loop() {
|
void loop() {
|
||||||
if (WiFi.status() != WL_CONNECTED) setup_wifi();
|
if (WiFi.status() != WL_CONNECTED) setup_wifi();
|
||||||
if (!client.connected()) reconnect();
|
if (!client.connected()) reconnect();
|
||||||
|
@ -62,21 +78,3 @@ void loop() {
|
||||||
lastMeasureAttempt = millis();
|
lastMeasureAttempt = millis();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void reportResults(float temp, float humid) {
|
|
||||||
if (!isnan(temp) || !isnan(humid)) {
|
|
||||||
Serial.println("-----------------------");
|
|
||||||
Serial.println("Humidity (%): " + String(humid));
|
|
||||||
Serial.println("Temperature (°C): " + String(temp));
|
|
||||||
Serial.println("-----------------------");
|
|
||||||
client.publish(humidityTopic, String(humid).c_str(), true);
|
|
||||||
client.publish(temperatureTopic, String(temp).c_str(), true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void yield(unsigned long yieldDuration) { //overload yield function to allow for any ms delay
|
|
||||||
unsigned long yieldBegan = millis();
|
|
||||||
while ( (millis() - yieldBegan) < yieldDuration ) {
|
|
||||||
yield();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue