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

fix duration conversion from ms #1801

Browse Source
This commit is contained in:
proddy
2024-06-23 11:36:38 +02:00
parent 9d42684591
commit 79e784239b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/shower.cpp
View File

@@ -100,12 +100,12 @@ void Shower::loop() {
// it is over the wait period, so assume that the shower has finished and calculate the total time and publish
// because its unsigned long, can't have negative so check if length is less than OFFSET_TIME
if ((timer_pause_ - timer_start_) > SHOWER_OFFSET_TIME) {
duration_ = (timer_pause_ - timer_start_ - SHOWER_OFFSET_TIME);
duration_ = (timer_pause_ - timer_start_ - SHOWER_OFFSET_TIME); // duration in seconds
if (duration_ > shower_min_duration_) {
JsonDocument doc;
// duration in seconds
doc["duration"] = (duration_ / 1000UL); // seconds
doc["duration"] = duration_; // seconds
time_t now = time(nullptr);
// if NTP enabled, publish timestamp
if (now > 1576800000) { // year 2020
@@ -114,9 +114,9 @@ void Shower::loop() {
char dt[25];
strftime(dt, sizeof(dt), "%FT%T%z", tm_);
doc["timestamp"] = dt;
LOG_INFO("shower finished %s (duration %lu s)", dt, duration_ / 1000UL);
LOG_INFO("shower finished %s (duration %lu s)", dt, duration_);
} else {
LOG_INFO("shower finished (duration %lu s)", duration_ / 1000UL);
LOG_INFO("shower finished (duration %lu s)", duration_);
}
Mqtt::queue_publish("shower_data", doc.as<JsonObject>());
}