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

response show combined telegram

Browse Source
This commit is contained in:
MichaelDvP
2023-07-17 09:53:40 +02:00
parent 7a5f13bcad
commit c47414dad5
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/emsesp.cpp
View File

@@ -625,25 +625,36 @@ void EMSESP::publish_sensor_values(const bool time, const bool force) {
// MQTT publish a telegram as raw data to the topic 'response' // MQTT publish a telegram as raw data to the topic 'response'
void EMSESP::publish_response(std::shared_ptr<const Telegram> telegram) { void EMSESP::publish_response(std::shared_ptr<const Telegram> telegram) {
StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc; static char * buffer = nullptr;
static uint8_t offset;
char buffer[100]; if (buffer == nullptr) {
doc["src"] = Helpers::hextoa(buffer, telegram->src); offset = telegram->offset; // store offset from first part
doc["dest"] = Helpers::hextoa(buffer, telegram->dest); buffer = new char[768]; // max 256 hex-codes, 255 spaces, 1 termination
doc["type"] = Helpers::hextoa(buffer, telegram->type_id); buffer[0] = '\0';
doc["offset"] = Helpers::hextoa(buffer, telegram->offset); }
strlcpy(buffer, Helpers::data_to_hex(telegram->message_data, telegram->message_length).c_str(), sizeof(buffer)); // telegram is without crc strlcat(buffer, Helpers::data_to_hex(telegram->message_data, telegram->message_length).c_str(), 768);
if (response_id_ != 0) {
strlcat(buffer, " ", 768);
return;
}
DynamicJsonDocument doc(EMSESP_JSON_SIZE_LARGE);
char s[10];
doc["src"] = Helpers::hextoa(s, telegram->src);
doc["dest"] = Helpers::hextoa(s, telegram->dest);
doc["type"] = Helpers::hextoa(s, telegram->type_id);
doc["offset"] = Helpers::hextoa(s, offset);
doc["data"] = buffer; doc["data"] = buffer;
if (telegram->message_length <= 4) { if (telegram->message_length <= 4 && strlen(buffer) <= 11) {
uint32_t value = 0; uint32_t value = 0;
for (uint8_t i = 0; i < telegram->message_length; i++) { for (uint8_t i = 0; i < telegram->message_length; i++) {
value = (value << 8) + telegram->message_data[i]; value = (value << 8) + telegram->message_data[i];
} }
doc["value"] = value; doc["value"] = value;
} }
Mqtt::queue_publish("response", doc.as<JsonObject>()); Mqtt::queue_publish("response", doc.as<JsonObject>());
delete[] buffer;
buffer = nullptr;
} }
// builds json with the detail of each value, for a specific EMS device type or the temperature sensor // builds json with the detail of each value, for a specific EMS device type or the temperature sensor
@@ -852,11 +863,10 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
// show log for read and response // show log for read and response
LOG_NOTICE("%s", pretty_telegram(telegram).c_str()); LOG_NOTICE("%s", pretty_telegram(telegram).c_str());
if (telegram->type_id == response_id_) { if (telegram->type_id == response_id_) {
publish_response(telegram);
response_id_ = 0;
if (!read_next_) { if (!read_next_) {
response_id_ = 0; response_id_ = 0;
} }
publish_response(telegram);
} }
// check if read is finished or gives more parts // check if read is finished or gives more parts
if (!read_next_) { if (!read_next_) {

2
src/system.cpp
View File

@@ -99,7 +99,7 @@ bool System::command_send(const char * value, const int8_t id) {
} }
bool System::command_response(const char * value, const int8_t id, JsonObject & output) { bool System::command_response(const char * value, const int8_t id, JsonObject & output) {
StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc; DynamicJsonDocument doc(EMSESP_JSON_SIZE_LARGE);
if (DeserializationError::Ok == deserializeJson(doc, Mqtt::get_response())) { if (DeserializationError::Ok == deserializeJson(doc, Mqtt::get_response())) {
for (JsonPair p : doc.as<JsonObject>()) { for (JsonPair p : doc.as<JsonObject>()) {
output[p.key()] = p.value(); output[p.key()] = p.value();