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

fix typos, double entities, publish time water

Browse Source
This commit is contained in:
MichaelDvP
2023-11-04 17:00:33 +01:00
parent 6bbf4e4778
commit d105c18bf7
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/solar.cpp
View File

@@ -220,8 +220,6 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const c
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylPumpMod_, DeviceValueType::UINT, FL_(cylPumpMod), DeviceValueUOM::PERCENT); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylPumpMod_, DeviceValueType::UINT, FL_(cylPumpMod), DeviceValueUOM::PERCENT);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &valveStatus_, DeviceValueType::BOOL, FL_(valveStatus), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &valveStatus_, DeviceValueType::BOOL, FL_(valveStatus), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &vs1Status_, DeviceValueType::BOOL, FL_(vs1Status), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &vs1Status_, DeviceValueType::BOOL, FL_(vs1Status), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &cylHeated_, DeviceValueType::BOOL, FL_(cylHeated), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &collectorShutdown_, DeviceValueType::BOOL, FL_(collectorShutdown), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
&collectorMaxTemp_, &collectorMaxTemp_,
DeviceValueType::UINT, DeviceValueType::UINT,

3
src/mqtt.cpp
View File

@@ -171,7 +171,7 @@ void Mqtt::loop() {
EMSESP::publish_device_values(EMSdevice::DeviceType::MIXER); EMSESP::publish_device_values(EMSdevice::DeviceType::MIXER);
} else } else
if (publish_time_water_ && (currentMillis - last_publish_mixer_ > publish_time_water_)) { if (publish_time_water_ && (currentMillis - last_publish_water_ > publish_time_water_)) {
last_publish_water_ = (currentMillis / publish_time_water_) * publish_time_water_; last_publish_water_ = (currentMillis / publish_time_water_) * publish_time_water_;
EMSESP::publish_device_values(EMSdevice::DeviceType::WATER); EMSESP::publish_device_values(EMSdevice::DeviceType::WATER);
} else } else
@@ -180,6 +180,7 @@ void Mqtt::loop() {
last_publish_other_ = (currentMillis / publish_time_other_) * publish_time_other_; last_publish_other_ = (currentMillis / publish_time_other_) * publish_time_other_;
EMSESP::publish_other_values(); // switch and heatpump EMSESP::publish_other_values(); // switch and heatpump
EMSESP::webSchedulerService.publish(); EMSESP::webSchedulerService.publish();
EMSESP::webCustomEntityService.publish();
} else } else
if (publish_time_sensor_ && (currentMillis - last_publish_sensor_ > publish_time_sensor_)) { if (publish_time_sensor_ && (currentMillis - last_publish_sensor_ > publish_time_sensor_)) {

1
src/system.cpp
View File

@@ -1276,6 +1276,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
node["publish time thermostat"] = settings.publish_time_thermostat; node["publish time thermostat"] = settings.publish_time_thermostat;
node["publish time solar"] = settings.publish_time_solar; node["publish time solar"] = settings.publish_time_solar;
node["publish time mixer"] = settings.publish_time_mixer; node["publish time mixer"] = settings.publish_time_mixer;
node["publish time water"] = settings.publish_time_water;
node["publish time other"] = settings.publish_time_other; node["publish time other"] = settings.publish_time_other;
node["publish time sensor"] = settings.publish_time_sensor; node["publish time sensor"] = settings.publish_time_sensor;
node["publish single"] = settings.publish_single; node["publish single"] = settings.publish_single;

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.3-dev.6a" #define EMSESP_APP_VERSION "3.6.3-dev.6b"