andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

https://github.com/proddy/EMS-ESP/issues/162

Browse Source
This commit is contained in:
Paul
2019-10-13 22:05:39 +02:00
parent e3d06e15a3
commit 42265b4501
2 changed files with 47 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/ems-esp.cpp
View File

@@ -536,11 +536,11 @@ void publishValues(bool force) {
uint32_t fchecksum; uint32_t fchecksum;
uint8_t jsonSize; uint8_t jsonSize;
static uint8_t last_boilerActive = 0xFF; // for remembering last setting of the tap water or heating on/off static uint8_t last_boilerActive = 0xFF; // for remembering last setting of the tap water or heating on/off
static uint32_t previousBoilerPublishCRC = 0; // CRC check for boiler values static uint32_t previousBoilerPublishCRC = 0; // CRC check for boiler values
static uint32_t previousThermostatPublishCRC[EMS_THERMOSTAT_MAXHC]; // CRC check for thermostat values static uint32_t previousThermostatPublishCRC; // CRC check for thermostat values
static uint32_t previousMixingPublishCRC[EMS_THERMOSTAT_MAXHC]; // CRC check for mixing values static uint32_t previousMixingPublishCRC; // CRC check for mixing values
static uint32_t previousSMPublishCRC = 0; // CRC check for Solar Module values (e.g. SM10) static uint32_t previousSMPublishCRC = 0; // CRC check for Solar Module values (e.g. SM10)
JsonObject rootBoiler = doc.to<JsonObject>(); JsonObject rootBoiler = doc.to<JsonObject>();
@@ -727,39 +727,44 @@ void publishValues(bool force) {
} else if (thermoMode == 4) { } else if (thermoMode == 4) {
dataThermostat[THERMOSTAT_MODE] = "day"; dataThermostat[THERMOSTAT_MODE] = "day";
} }
}
}
data[0] = '\0'; // reset data for next package data[0] = '\0'; // reset data for next package
serializeJson(doc, data, sizeof(data)); serializeJson(doc, data, sizeof(data));
// check for empty json // check for empty json
jsonSize = measureJson(doc); jsonSize = measureJson(doc);
if (jsonSize > 2) { if (jsonSize > 2) {
// calculate new CRC // calculate new CRC
crc.reset(); crc.reset();
for (uint8_t i = 0; i < (jsonSize - 1); i++) { for (uint8_t i = 0; i < (jsonSize - 1); i++) {
crc.update(data[i]); crc.update(data[i]);
} }
fchecksum = crc.finalize(); fchecksum = crc.finalize();
if ((previousThermostatPublishCRC[hc_v - 1] != fchecksum) || force) { if ((previousThermostatPublishCRC != fchecksum) || force) {
previousThermostatPublishCRC[hc_v - 1] = fchecksum; previousThermostatPublishCRC = fchecksum;
myDebugLog("Publishing thermostat data via MQTT"); myDebugLog("Publishing thermostat data via MQTT");
myESP.mqttPublish(TOPIC_THERMOSTAT_DATA, data); myESP.mqttPublish(TOPIC_THERMOSTAT_DATA, data);
}
}
} }
} }
} }
// handle the thermostat values // handle the thermostat values
if (ems_getMixingDeviceEnabled()) { if (ems_getMixingDeviceEnabled()) {
doc.clear();
JsonObject rootMixing = doc.to<JsonObject>();
for (uint8_t hc_v = 1; hc_v <= EMS_THERMOSTAT_MAXHC; hc_v++) { for (uint8_t hc_v = 1; hc_v <= EMS_THERMOSTAT_MAXHC; hc_v++) {
_EMS_Mixing_HC * mixing = &EMS_Mixing.hc[hc_v - 1]; _EMS_Mixing_HC * mixing = &EMS_Mixing.hc[hc_v - 1];
// only send if we have an active Heating Circuit with real data // only send if we have an active Heating Circuit with real data
if (mixing->active) { if (mixing->active) {
// build new json object // build new json object
doc.clear(); char hc[10]; // hc{1-4}
JsonObject rootMixing = doc.to<JsonObject>(); strlcpy(hc, THERMOSTAT_HC, sizeof(hc));
strlcat(hc, _int_to_char(s, mixing->hc), sizeof(hc));
JsonObject dataThermostat = rootMixing.createNestedObject(hc);
if (mixing->flowTemp != EMS_VALUE_SHORT_NOTSET) if (mixing->flowTemp != EMS_VALUE_SHORT_NOTSET)
rootMixing["flowTemp"] = (double)mixing->flowTemp / 10; rootMixing["flowTemp"] = (double)mixing->flowTemp / 10;
@@ -767,36 +772,29 @@ void publishValues(bool force) {
rootMixing["pumpMod"] = mixing->pumpMod; rootMixing["pumpMod"] = mixing->pumpMod;
if (mixing->valveStatus != EMS_VALUE_INT_NOTSET) if (mixing->valveStatus != EMS_VALUE_INT_NOTSET)
rootMixing["valveStatus"] = mixing->valveStatus; rootMixing["valveStatus"] = mixing->valveStatus;
}
}
data[0] = '\0'; // reset data for next package data[0] = '\0'; // reset data for next package
serializeJson(doc, data, sizeof(data)); serializeJson(doc, data, sizeof(data));
// check for empty json // check for empty json
jsonSize = measureJson(doc); jsonSize = measureJson(doc);
if (jsonSize > 2) { if (jsonSize > 2) {
// calculate new CRC // calculate new CRC
crc.reset(); crc.reset();
for (uint8_t i = 0; i < (jsonSize - 1); i++) { for (uint8_t i = 0; i < (jsonSize - 1); i++) {
crc.update(data[i]); crc.update(data[i]);
} }
fchecksum = crc.finalize(); fchecksum = crc.finalize();
if ((previousMixingPublishCRC[hc_v - 1] != fchecksum) || force) { if ((previousMixingPublishCRC != fchecksum) || force) {
previousMixingPublishCRC[hc_v - 1] = fchecksum; previousMixingPublishCRC = fchecksum;
char mixing_topicname[20]; myDebugLog("Publishing mixing device data via MQTT");
char buffer[4]; myESP.mqttPublish(TOPIC_MIXING_DATA, data);
// "mixingt_data" + Heating Cicruit #
strlcpy(mixing_topicname, TOPIC_MIXING_DATA, sizeof(mixing_topicname));
strlcat(mixing_topicname, itoa(hc_v, buffer, 10), sizeof(mixing_topicname));
myDebugLog("Publishing mixing device data via MQTT");
myESP.mqttPublish(mixing_topicname, data);
}
}
} }
} }
} }
// For SM10 and SM100 Solar Modules // For SM10 and SM100 Solar Modules
if (ems_getSolarModuleEnabled()) { if (ems_getSolarModuleEnabled()) {
// build new json object // build new json object

3
src/my_config.h
View File

@@ -72,7 +72,6 @@
#define TOPIC_SHOWER_COLDSHOT "coldshot" // used to trigger a coldshot from an MQTT command #define TOPIC_SHOWER_COLDSHOT "coldshot" // used to trigger a coldshot from an MQTT command
#define TOPIC_SHOWER_DURATION "duration" // duration of the last shower #define TOPIC_SHOWER_DURATION "duration" // duration of the last shower
// MQTT for External Sensors
// MQTT for EXTERNAL SENSORS
#define TOPIC_EXTERNAL_SENSORS "sensors" // for sending sensor values to MQTT #define TOPIC_EXTERNAL_SENSORS "sensors" // for sending sensor values to MQTT
#define PAYLOAD_EXTERNAL_SENSORS "temp_%d" // for formatting the payload for each external dallas sensor #define PAYLOAD_EXTERNAL_SENSORS "temp_%d" // for formatting the payload for each external dallas sensor