chriz/OpenMQTT-Gateway
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Update to use ArduinoJson 6+ (#1071)

Browse Source
This commit is contained in:
h2zero authored and GitHub committed 2021-09-01 19:18:19 -05:00
1 parent 149712b573
commit ed4949f769
30 files changed
+452 -430
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main/ZsensorHCSR04.ino
+6 -6
View File
@@ -44,8 +44,8 @@ void MeasureDistance() {
if (millis() > (timeHCSR04 + TimeBetweenReadingHCSR04)) {
timeHCSR04 = millis();
Log.trace(F("Creating HCSR04 buffer" CR));
StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
JsonObject& HCSR04data = jsonBuffer.createObject();
StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
JsonObject HCSR04data = jsonBuffer.to<JsonObject>();
digitalWrite(HCSR04_TRI_GPIO, LOW);
delayMicroseconds(2);
digitalWrite(HCSR04_TRI_GPIO, HIGH);
@@ -57,15 +57,15 @@ void MeasureDistance() {
} else {
static unsigned int distance = 99999;
unsigned int d = duration / 58.2;
HCSR04data.set("distance", (int)d);
HCSR04data["distance"] = (int)d;
if (d > distance) {
HCSR04data.set("direction", "away");
HCSR04data["direction"] = "away";
Log.trace(F("HC SR04 Distance changed" CR));
} else if (d < distance) {
HCSR04data.set("direction", "towards");
HCSR04data["direction"] = "towards";
Log.trace(F("HC SR04 Distance changed" CR));
} else if (HCSR04_always) {
HCSR04data.set("direction", "static");
HCSR04data["direction"] = "static";
Log.trace(F("HC SR04 Distance hasn't changed" CR));
}
distance = d;