jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-28 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace optional MQTT_TELE_RETAIN to Energy Margins message by `SensorRetain`

Browse Source
This commit is contained in:
Theo Arends 2024-06-07 11:48:52 +02:00
parent d16a502f36
commit 9350f68ac5
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- Matter refactoring of bridged devices (#21575) - Matter refactoring of bridged devices (#21575)
- ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 (#21569) - ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 (#21569)
- Optional MQTT_TELE_RETAIN to Energy Margins message replaced by ``SensorRetain``
### Fixed ### Fixed
- Berry `input()` returns empty string and does not crash (#21565) - Berry `input()` returns empty string and does not crash (#21565)

1
RELEASENOTES.md
View File

@ -125,6 +125,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
- Matter support for Air Quality sensors [#21559](https://github.com/arendst/Tasmota/issues/21559) - Matter support for Air Quality sensors [#21559](https://github.com/arendst/Tasmota/issues/21559)
### Changed ### Changed
- Optional MQTT_TELE_RETAIN to Energy Margins message replaced by ``SensorRetain``
- ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 [#21569](https://github.com/arendst/Tasmota/issues/21569) - ESP32 Core3 platform update from 2024.05.13 to 2024.06.10 [#21569](https://github.com/arendst/Tasmota/issues/21569)
- Matter refactoring of bridged devices [#21575](https://github.com/arendst/Tasmota/issues/21575) - Matter refactoring of bridged devices [#21575](https://github.com/arendst/Tasmota/issues/21575)

12
tasmota/tasmota_xdrv_driver/xdrv_02_9_mqtt.ino
View File

@ -861,13 +861,19 @@ void MqttPublishPrefixTopicRulesProcess_P(uint32_t prefix, const char* subtopic)
MqttPublishPrefixTopicRulesProcess_P(prefix, subtopic, false); MqttPublishPrefixTopicRulesProcess_P(prefix, subtopic, false);
} }
void MqttPublishTeleSensor(void) { void MqttPublishTele(const char* subtopic) {
// Publish tele/<device>/SENSOR default ResponseData string with optional retained // Publish tele/<device>/<subtopic> default ResponseData string with optional retained
// then process rules // then process rules
#ifdef USE_INFLUXDB #ifdef USE_INFLUXDB
InfluxDbProcess(1); // Use a copy of ResponseData InfluxDbProcess(1); // Use a copy of ResponseData
#endif #endif
MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_SENSOR), Settings->flag.mqtt_sensor_retain); // CMND_SENSORRETAIN MqttPublishPrefixTopicRulesProcess_P(TELE, subtopic, Settings->flag.mqtt_sensor_retain); // CMND_SENSORRETAIN
}
void MqttPublishTeleSensor(void) {
// Publish tele/<device>/SENSOR default ResponseData string with optional retained
// then process rules
MqttPublishTele(PSTR(D_RSLT_SENSOR));
} }
void MqttPublishPowerState(uint32_t device) { void MqttPublishPowerState(uint32_t device) {

6
tasmota/tasmota_xdrv_driver/xdrv_03_energy.ino
View File

@ -29,10 +29,6 @@
//#define USE_ENERGY_MARGIN_DETECTION //#define USE_ENERGY_MARGIN_DETECTION
// #define USE_ENERGY_POWER_LIMIT // #define USE_ENERGY_POWER_LIMIT
#ifndef MQTT_TELE_RETAIN
#define MQTT_TELE_RETAIN 0
#endif
#define ENERGY_NONE 0 #define ENERGY_NONE 0
#define ENERGY_WATCHDOG 4 // Allow up to 4 seconds before deciding no valid data present #define ENERGY_WATCHDOG 4 // Allow up to 4 seconds before deciding no valid data present
@ -564,7 +560,7 @@ void EnergyMarginCheck(void) {
} }
if (jsonflg) { if (jsonflg) {
ResponseJsonEndEnd(); ResponseJsonEndEnd();
MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_MARGINS), MQTT_TELE_RETAIN); MqttPublishTele(PSTR(D_RSLT_MARGINS));
EnergyMqttShow(); EnergyMqttShow();
Energy->margin_stable = 3; // Allow 2 seconds to stabilize before reporting Energy->margin_stable = 3; // Allow 2 seconds to stabilize before reporting
} }

6
tasmota/tasmota_xdrv_driver/xdrv_03_esp32_energy.ino
View File

@ -26,10 +26,6 @@
#define XDRV_03 3 #define XDRV_03 3
#define XSNS_03 3 #define XSNS_03 3
#ifndef MQTT_TELE_RETAIN
#define MQTT_TELE_RETAIN 0
#endif
#define ENERGY_NONE 0 #define ENERGY_NONE 0
#define ENERGY_WATCHDOG 4 // Allow up to 4 seconds before deciding no valid data present #define ENERGY_WATCHDOG 4 // Allow up to 4 seconds before deciding no valid data present
@ -787,7 +783,7 @@ void EnergyMarginCheck(void) {
} }
if (jsonflg) { if (jsonflg) {
ResponseJsonEndEnd(); ResponseJsonEndEnd();
MqttPublishPrefixTopicRulesProcess_P(TELE, PSTR(D_RSLT_MARGINS), MQTT_TELE_RETAIN); MqttPublishTele(PSTR(D_RSLT_MARGINS));
EnergyMqttShow(); EnergyMqttShow();
Energy->margin_stable = 3; // Allow 2 seconds to stabilize before reporting Energy->margin_stable = 3; // Allow 2 seconds to stabilize before reporting
} }