Merge branch 'color_mode_field' into v1.11.0

sidoh · Sep 27, 2023 · 67a835e · 67a835e
2 parents a8815b5 + 2b2ebf2
commit 67a835e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/lib/MQTT/BulbStateUpdater.cpp b/lib/MQTT/BulbStateUpdater.cpp
@@ -37,12 +37,17 @@ void BulbStateUpdater::loop() {
 }
 
 inline void BulbStateUpdater::flushGroup(BulbId bulbId, GroupState& state) {
-  char buffer[200];
-  StaticJsonDocument<200> json;
+  StaticJsonDocument<MILIGHT_MQTT_JSON_BUFFER_SIZE> json;
   JsonObject message = json.to<JsonObject>();
-
   state.applyState(message, bulbId, settings.groupStateFields);
-  serializeJson(json, buffer);
+
+  if (json.memoryUsage() >= json.capacity()) {
+    Serial.println(F("ERROR: State is too large for MQTT buffer, continuing anyway. Consider increasing MILIGHT_MQTT_JSON_BUFFER_SIZE."));
+  }
+
+  size_t documentSize = measureJson(message);
+  char buffer[documentSize + 1];
+  serializeJson(json, buffer, sizeof(buffer));
 
   mqttClient.sendState(
     *MiLightRemoteConfig::fromType(bulbId.deviceType),

diff --git a/lib/MQTT/BulbStateUpdater.h b/lib/MQTT/BulbStateUpdater.h
@@ -7,6 +7,10 @@
 #include <CircularBuffer.h>
 #include <Settings.h>
 
+#ifndef MILIGHT_MQTT_JSON_BUFFER_SIZE
+#define MILIGHT_MQTT_JSON_BUFFER_SIZE 1024
+#endif
+
 #ifndef BULB_STATE_UPDATER
 #define BULB_STATE_UPDATER