chore: Add mqttShowInConsole preference to CO2_Gadget_Preferences.h a…

…nd logic to show or not show
melkati · May 29, 2024 · 0e5e038 · 0e5e038
1 parent c83652d
commit 0e5e038
Show file tree

Hide file tree

Showing 14 changed files with 203 additions and 161 deletions.
diff --git a/CO2_Gadget.ino b/CO2_Gadget.ino
@@ -62,6 +62,7 @@ bool mqttDiscoverySent = false;
 uint16_t timeBetweenMQTTPublish = 60;  // Time in seconds between MQTT transmissions
 uint16_t timeToKeepAliveMQTT = 3600;   // Maximum time in seconds between MQTT transmissions - Default: 1 Hour
 uint64_t lastTimeMQTTPublished = 0;    // Time of last MQTT transmission
+bool mqttShowInConsole = false;
 
 // ESP-NOW options
 bool activeESPNOW = false;

diff --git a/CO2_Gadget_MQTT.h b/CO2_Gadget_MQTT.h
@@ -91,7 +91,7 @@ void publishIntMQTT(String topic, int64_t payload) {
 #ifdef SUPPORT_MQTT
     dtostrf(payload, 0, 0, charPublish);
     topic = rootTopic + topic;
-    if (!inMenu) {
+    if (!inMenu && mqttShowInConsole) {
         Serial.printf("-->[MQTT] Publishing %d to ", payload);
         Serial.println("topic: " + topic);
     }
@@ -103,7 +103,7 @@ void publishFloatMQTT(String topic, float payload) {
 #ifdef SUPPORT_MQTT
     dtostrf(payload, 0, 2, charPublish);
     topic = rootTopic + topic;
-    if (!inMenu) {
+    if (!inMenu && mqttShowInConsole) {
         Serial.printf("-->[MQTT] Publishing %.0f to ", payload);
         Serial.println("topic: " + topic);
     }
@@ -114,7 +114,7 @@ void publishFloatMQTT(String topic, float payload) {
 void publishStrMQTT(String topic, String payload) {
 #ifdef SUPPORT_MQTT
     topic = rootTopic + topic;
-    if (!inMenu) {
+    if (!inMenu && mqttShowInConsole) {
         Serial.printf("-->[MQTT] Publishing %s to ", payload.c_str());
         Serial.println("topic: " + topic);
     }
@@ -124,7 +124,7 @@ void publishStrMQTT(String topic, String payload) {
 
 void publishStrDiscoveryMQTT(String topic, String payload, int qos) {
 #ifdef SUPPORT_MQTT
-    if (!inMenu) {
+    if (!inMenu && mqttShowInConsole) {
         // Serial.printf("-->[MQTT] Publishing discovery %s to ", payload.c_str());
         // Serial.println("topic: " + topic);
     }

diff --git a/CO2_Gadget_Preferences.h b/CO2_Gadget_Preferences.h
@@ -178,7 +178,8 @@ void printActualSettings() {
     Serial.println("-->[PREF] batDischgd:\t #" + String(batteryDischargedMillivolts) + "#");
     Serial.println("-->[PREF] batChargd:\t #" + String(batteryFullyChargedMillivolts) + "#");
     Serial.println("-->[PREF] vRef:\t #" + String(vRef) + "#");
-    Serial.println("-->[PREF] mqttClientId:\t#" + mqttClientId + "#");
+    Serial.println("-->[PREF] mqttClientId:\t#" + mqttClientId + "#");    
+    Serial.println("-->[PREF] mqttShowInConsole:\t#" + String(mqttShowInConsole ? "Enabled" : "Disabled") + "# (" + String(mqttShowInConsole) + ")");
     Serial.println("-->[PREF] mqttBroker:\t#" + mqttBroker + "#");
     Serial.println("-->[PREF] mqttUser:\t#" + mqttUser + "#");
 #ifndef WIFI_PRIVACY
@@ -283,6 +284,7 @@ void initPreferences() {
     activeOTA = preferences.getBool("activeOTA", activeOTA);
     rootTopic = preferences.getString("rootTopic", rootTopic);
     mqttClientId = preferences.getString("mqttClientId", mqttClientId);
+    mqttShowInConsole = preferences.getBool("mqttShowInCon", false);
     mqttBroker = preferences.getString("mqttBroker", mqttBroker).c_str();
     mqttUser = preferences.getString("mqttUser", mqttUser).c_str();
     mqttPass = preferences.getString("mqttPass", mqttPass).c_str();
@@ -413,6 +415,7 @@ void putPreferences() {
     preferences.putUInt("batChargd", batteryFullyChargedMillivolts);
     preferences.putUInt("vRef", vRef);
     preferences.putString("mqttClientId", mqttClientId);
+    preferences.putBool("mqttShowInCon", mqttShowInConsole);
     preferences.putString("mqttBroker", mqttBroker);
     preferences.putString("mqttUser", mqttUser);
     preferences.putString("mqttPass", mqttPass);
@@ -517,6 +520,7 @@ String getCO2GadgetVersionAsJson() {
 //     doc["batChargd"] = preferences.getInt("batChargd", 4200);
 //     doc["vRef"] = preferences.getInt("vRef", 930);
 //     doc["mqttClientId"] = preferences.getString("mqttClientId", mqttClientId);
+//     doc["mqttShowInCon"] = preferences.getBool("mqttShowInCon", false);
 //     doc["mqttBroker"] = preferences.getString("mqttBroker", mqttBroker);
 //     doc["mqttUser"] = preferences.getString("mqttUser", mqttUser);
 //     // doc["mqttPass"] = preferences.getString("mqttPass", mqttPass);
@@ -601,6 +605,7 @@ String getActualSettingsAsJson(bool includePasswords = false) {
     doc["batChargd"] = batteryFullyChargedMillivolts;
     doc["vRef"] = vRef;
     doc["mqttClientId"] = mqttClientId;
+    doc["mqttShowInCon"] = mqttShowInConsole;
     doc["mqttBroker"] = mqttBroker;
     doc["mqttUser"] = mqttUser;
     // if includePasswords is false, do not include the password
@@ -727,8 +732,9 @@ bool handleSavePreferencesFromJSON(String jsonPreferences) {
             battery.begin(vRef, voltageDividerRatio, &asigmoidal);
             readBatteryVoltage();
         }
-        vRef = JsonDocument["vRef"];
+        mqttShowInConsole = JsonDocument["mqttShowInCon"];
         mqttClientId = JsonDocument["mqttClientId"].as<String>().c_str();
+        mqttShowInConsole = JsonDocument["mqttShowInCon"];
         mqttBroker = JsonDocument["mqttBroker"].as<String>().c_str();
         mqttUser = JsonDocument["mqttUser"].as<String>().c_str();
         timeToDisplayOff = JsonDocument["tToDispOff"];

diff --git a/CO2_Gadget_WIFI.h b/CO2_Gadget_WIFI.h
@@ -1000,10 +1000,10 @@ void initWebServer() {
 
     server.on("/captiveportal.js", HTTP_GET, [](AsyncWebServerRequest *request) {
         if (request != nullptr) {
-            // /** GZIPPED CONTENT ***/
-            // AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/captiveportal.js.gz", "application/javascript");
-            // response->addHeader("Content-Encoding", "gzip");
-            AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/captiveportal.js", "application/javascript");
+            /** GZIPPED CONTENT ***/
+            AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/captiveportal.js.gz", "application/javascript");
+            response->addHeader("Content-Encoding", "gzip");
+            // AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/captiveportal.js", "application/javascript");
             request->send(response);
         } else {
             Serial.println("---> [WiFi] Error: request is null");

diff --git a/data/captiveportal.js.gz b/data/captiveportal.js.gz
diff --git a/data/index.html.gz b/data/index.html.gz
diff --git a/data/main.js.gz b/data/main.js.gz
diff --git a/data/ota.html.gz b/data/ota.html.gz