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

Merge pull request #1819 from proddy/dev

Browse Source 
fix shower duration
This commit is contained in:
Proddy
2024-06-23 10:39:33 +01:00
committed by GitHub
parent f417b6087b ef4588e3de
commit e037c0753d
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/src/project/SchedulerDialog.tsx
View File

@@ -297,7 +297,7 @@ const SchedulerDialog = ({
name="time"
label={isCondition ? 'Condition' : 'On Change Value'}
fullWidth
value={editItem.time == "00:00" ? editItem.time = "" : editItem.time}
value={editItem.time == '00:00' ? (editItem.time = '') : editItem.time}
margin="normal"
onChange={updateFormValue}
/>
@@ -307,7 +307,9 @@ const SchedulerDialog = ({
name="time"
type="time"
label={isTimer ? LL.TIMER(1) : LL.TIME(1)}
value={editItem.time == "" ? editItem.time = "00:00" : editItem.time}
value={
editItem.time == '' ? (editItem.time = '00:00') : editItem.time
}
margin="normal"
onChange={updateFormValue}
/>

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>());
}

8
test/api_test.http
View File

@@ -65,6 +65,14 @@ GET {{host}}/api/temperaturesensor/info
###
GET {{host}}/rest/deviceData?id=3
Content-Type: application/json
Authorization: Bearer {{token}}
###
GET {{host}}/api/boiler/commands
#
# Test on dev
#