From 2ee18320beb0325f0cdded1dc0a7ce518d54377d Mon Sep 17 00:00:00 2001
From: Florian <1technophile@users.noreply.github.com>
Date: Sat, 29 Jun 2019 14:46:24 +0200
Subject: [PATCH] replace the use of calculate buffer by a constant buffer size
 for json size

---
 ZsensorBH1750.ino  | 3 +--
 ZsensorBME280.ino  | 3 +--
 ZsensorDHT.ino     | 3 +--
 ZsensorINA226.ino  | 3 +--
 ZsensorTSL2561.ino | 3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ZsensorBH1750.ino b/ZsensorBH1750.ino
index 74bbcc5..ce73ff3 100644
--- a/ZsensorBH1750.ino
+++ b/ZsensorBH1750.ino
@@ -55,8 +55,7 @@ void MeasureLightIntensity()
 {
   if (millis() > (timebh1750 + TimeBetweenReadingBH1750)) {//retriving value of Lux, FtCd and Wattsm2 from BH1750
     trc(F("Creating BH1750 buffer"));
-    const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(3);
-    StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
+    StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
     JsonObject& BH1750data = jsonBuffer.createObject();
     
     timebh1750 = millis();
diff --git a/ZsensorBME280.ino b/ZsensorBME280.ino
index 29c3c8d..385675a 100644
--- a/ZsensorBME280.ino
+++ b/ZsensorBME280.ino
@@ -129,8 +129,7 @@ void MeasureTempHumAndPressure()
       trc(F("Failed to read from Weather Sensor BME280!"));
     }else{
         trc(F("Creating BME280 buffer"));
-        const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(6);
-        StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
+        StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
         JsonObject& BME280data = jsonBuffer.createObject();
       // Generate Temperature in degrees C
       if(BmeTempC != persisted_bme_tempc || bme280_always){
diff --git a/ZsensorDHT.ino b/ZsensorDHT.ino
index c3d79f1..ac1f11b 100644
--- a/ZsensorDHT.ino
+++ b/ZsensorDHT.ino
@@ -49,8 +49,7 @@ void MeasureTempAndHum(){
       trc(F("Failed to read from DHT sensor!"));
     }else{
       trc(F("Creating DHT buffer"));
-      const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(2);
-      StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
+      StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
       JsonObject& DHTdata = jsonBuffer.createObject();
       if(h != persistedh || dht_always){
         DHTdata.set("hum", (float)h);
diff --git a/ZsensorINA226.ino b/ZsensorINA226.ino
index 4ab0747..1da7ff3 100644
--- a/ZsensorINA226.ino
+++ b/ZsensorINA226.ino
@@ -52,8 +52,7 @@ void MeasureINA226(){
     if (millis() > (timeINA226 + TimeBetweenReadingINA226)) {//retriving value of temperature and humidity of the box from DHT every xUL
         timeINA226 = millis();
         trc(F("Creating INA226 buffer"));
-        const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(3);
-        StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
+        StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
         JsonObject& INA226data = jsonBuffer.createObject();
         // Topic on which we will send data
         trc(F("Retrieving electrical data"));
diff --git a/ZsensorTSL2561.ino b/ZsensorTSL2561.ino
index 6a41a95..2eb407e 100644
--- a/ZsensorTSL2561.ino
+++ b/ZsensorTSL2561.ino
@@ -92,8 +92,7 @@ void MeasureLightIntensityTSL2561()
     timetsl2561 = millis();
 
     trc(F("Creating TSL2561 buffer"));
-    const int JSON_MSG_CALC_BUFFER = JSON_OBJECT_SIZE(3);
-    StaticJsonBuffer<JSON_MSG_CALC_BUFFER> jsonBuffer;
+    StaticJsonBuffer<JSON_MSG_BUFFER> jsonBuffer;
     JsonObject& TSL2561data = jsonBuffer.createObject();
     
     sensors_event_t event;