diff --git a/envisens/envisens_esp_fw/envisens_esp_fw.ino b/envisens/envisens_esp_fw/envisens_esp_fw.ino index aef83a3..626a73a 100644 --- a/envisens/envisens_esp_fw/envisens_esp_fw.ino +++ b/envisens/envisens_esp_fw/envisens_esp_fw.ino @@ -114,21 +114,21 @@ bool published = false; bool forcePublish = false; bool publish (String desc, char *topic, float val, float &lastVal, float diff, bool force){ - bool retval = false; + bool ret = false; Serial.println("Sample " + desc + ": " + String(val).c_str()); if (checkVariation(val, lastVal, diff) or force) { - lastVal = val; Serial.println("Sufficient variation on " + desc + ": " + String(val).c_str()); if (checkPlausibility(val, lastVal, diff) or force) { Serial.println("Value published"); client.publish(topic, String(val).c_str(), true); - retval = true; + ret = true; } else { Serial.print("** ERROR: Value out of bounds, not published. Last value :"); Serial.println(String(lastVal).c_str()); } + lastVal = val; } - return retval; + return ret; } void loop() { diff --git a/espsens/espsens.ino b/espsens/espsens.ino index 9fd6649..06a4687 100644 --- a/espsens/espsens.ino +++ b/espsens/espsens.ino @@ -111,21 +111,21 @@ bool published = false; bool forcePublish = false; bool publish (String desc, char *topic, float val, float &lastVal, float diff, bool force){ - bool retval = false; + bool ret = false; Serial.println("Sample " + desc + ": " + String(val).c_str()); if (checkVariation(val, lastVal, diff) or force) { - lastVal = val; Serial.println("Sufficient variation on " + desc + ": " + String(val).c_str()); if (checkPlausibility(val, lastVal, diff) or force) { Serial.println("Value published"); client.publish(topic, String(val).c_str(), true); - retval = true; + ret = true; } else { Serial.print("** ERROR: Value out of bounds, not published. Last value :"); Serial.println(String(lastVal).c_str()); } + lastVal = val; } - return retval; + return ret; } void loop() {