andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-01-26 16:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix mqtt bool output for analog, scheduler

Browse Source
This commit is contained in:
MichaelDvP
2025-12-15 16:48:33 +01:00
parent 2b679daabc
commit 911aa40ca1
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/web/WebCustomEntityService.cpp
View File

@@ -225,7 +225,7 @@ bool WebCustomEntityService::command_setvalue(const char * value, const int8_t i
// if add_uom is true it will add the UOM string to the value
void WebCustomEntityService::render_value(JsonObject output, CustomEntityItem const & entity, const bool useVal, const bool web, const bool add_uom) {
char payload[20];
const char * name = useVal ? "value" : entity.name;
const char * name = useVal ? "value" : (const char *)entity.name;
switch (entity.value_type) {
case DeviceValueType::BOOL:

7
src/web/WebSchedulerService.cpp
View File

@@ -235,10 +235,11 @@ void WebSchedulerService::publish(const bool force) {
}
JsonDocument doc;
JsonObject output = doc.to<JsonObject>();
bool ha_created = ha_registered_;
for (const ScheduleItem & scheduleItem : *scheduleItems_) {
if (scheduleItem.name[0] != '\0' && !doc[scheduleItem.name].is<JsonVariantConst>()) {
Mqtt::add_value_bool(doc.as<JsonObject>(), scheduleItem.name, scheduleItem.active);
if (scheduleItem.name[0] != '\0' && !output[scheduleItem.name].is<JsonVariantConst>()) {
Mqtt::add_value_bool(output, (const char *)scheduleItem.name, scheduleItem.active);
// create HA config
if (Mqtt::ha_enabled() && !ha_registered_) {
@@ -290,7 +291,7 @@ void WebSchedulerService::publish(const bool force) {
if (!doc.isNull()) {
char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
snprintf(topic, sizeof(topic), "%s_data", F_(scheduler));
Mqtt::queue_publish(topic, doc.as<JsonObject>());
Mqtt::queue_publish(topic, output);
}
}