bzi/macrocell_office_iot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement publish function for cleaner code

Browse Source
This commit is contained in:
bzi 2019-02-18 20:34:27 +01:00
parent cc268b5cd5
commit 9356c436bc
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
esp_sensor_firmware/esp_sensor_firmware.ino
View File

@ -19,7 +19,7 @@
#define ID_HUMID ID_BASE "/temperature" #define ID_HUMID ID_BASE "/temperature"
#define ID_HEAT ID_BASE "/temperature" #define ID_HEAT ID_BASE "/temperature"
#define OPERATION_BLINK_EN true // blink continously if in correct operation #define OPERATION_BLINK_EN true // blink continuously if in correct operation
#define DHTPIN 4 // Digital pin connected to the DHT sensor #define DHTPIN 4 // Digital pin connected to the DHT sensor
#define DHTTYPE DHT22 // DHT 22 (AM2302), AM2321 #define DHTTYPE DHT22 // DHT 22 (AM2302), AM2321
@ -96,6 +96,18 @@ long lastSent = 0;
bool published = false; bool published = false;
bool forcePublish = false; bool forcePublish = false;
bool publish (String desc, char *topic, float val, float &val_r, int diff, bool force){
if (checkBound(val, val_r, 0.3) or force) {
val_r = val;
Serial.print("New " + desc + ": ");
Serial.println(String(val).c_str());
client.publish(topic, String(val).c_str(), true);
return true;
} else {
return false;
}
}
void loop() { void loop() {
if (!client.connected()) { if (!client.connected()) {
reconnect(); reconnect();
@ -121,7 +133,6 @@ void loop() {
float hi = dht.computeHeatIndex(t, h, false); float hi = dht.computeHeatIndex(t, h, false);
Serial.print(F("Humidity: ")); Serial.print(F("Humidity: "));
Serial.print(h); Serial.print(h);
Serial.print(F("% Temperature: ")); Serial.print(F("% Temperature: "));
@ -137,30 +148,9 @@ void loop() {
lastSent = 0; lastSent = 0;
} }
if (checkBound(t, t_r, 0.3) or forcePublish) { published += publish("temperature", ID_TEMP, t, t_r, 0.3, forcePublish);
t_r = t; published += publish("humidity", ID_HUMID, h, h_r, 2.5, forcePublish);
Serial.print("New temperature:"); published += publish("heat index", ID_HEAT, hi, hi_r, 0.2, forcePublish);
Serial.println(String(t).c_str());
client.publish(ID_TEMP, String(t).c_str(), true);
published = true;
}
if (checkBound(h, h_r, 2.5) or forcePublish) {
h_r = h;
Serial.print("New humidity:");
Serial.println(String(h).c_str());
client.publish(ID_HUMID, String(h).c_str(), true);
published = true;
}
if (checkBound(hi, hi_r, 0.2) or forcePublish) {
hi_r = hi;
Serial.print("New heat index:");
Serial.println(String(hi).c_str());
client.publish(ID_HEAT, String(hi).c_str(), true);
published = true;
}
if (published == false) { if (published == false) {
lastSent = lastSent + 1; lastSent = lastSent + 1;