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

Merge pull request #1825 from MichaelDvP/dev

Browse Source 
Scheduler fixes and additions
This commit is contained in:
Proddy
2024-06-27 08:14:34 +01:00
committed by GitHub
parent a4ad8f551a 266a7a4e9b
commit 95915611b5
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/src/i18n/de/index.ts
View File

@@ -53,7 +53,7 @@ const de: Translation = {
UPDATE_OF: '{0} Aktualisieren',
REMOVED_OF: '{0} Entfernt',
DELETION_OF: '{0} Löschung',
OFFSET: 'Addition',
OFFSET: 'Position',
FACTOR: 'Faktor',
FREQ: 'Frequenz',
DUTY_CYCLE: 'Duty Cycle',

4
src/devices/boiler.cpp
View File

@@ -1079,7 +1079,7 @@ void Boiler::check_active() {
b = ((boilerState_ & 0x09) == 0x09);
val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF;
if (heatingActive_ != val) {
heatingActive_ = val;
has_update(heatingActive_, val);
char s[12];
Mqtt::queue_publish(F_(heating_active), Helpers::render_boolean(s, b));
}
@@ -1103,7 +1103,7 @@ void Boiler::check_active() {
val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF;
if (tapwaterActive_ != val) {
tapwaterActive_ = val;
has_update(tapwaterActive_, val);
char s[12];
Mqtt::queue_publish(F_(tapwater_active), Helpers::render_boolean(s, b));
// if (flowsensor) {

5
src/web/WebSchedulerService.cpp
View File

@@ -371,16 +371,17 @@ bool WebSchedulerService::command(const char * cmd, const char * data) {
#include "shuntingYard.hpp"
bool WebSchedulerService::onChange(const char * cmd) {
bool cmd_ok = false;
for (const ScheduleItem & scheduleItem : *scheduleItems_) {
if (scheduleItem.active && scheduleItem.flags == SCHEDULEFLAG_SCHEDULE_ONCHANGE
&& Helpers::toLower(scheduleItem.time).find(Helpers::toLower(cmd)) != std::string::npos) {
#ifdef EMESESP_DEBUG
// emsesp::EMSESP::logger().debug(scheduleItem.cmd.c_str());
#endif
return command(scheduleItem.cmd.c_str(), compute(scheduleItem.value).c_str());
cmd_ok |= command(scheduleItem.cmd.c_str(), compute(scheduleItem.value).c_str());
}
}
return false;
return cmd_ok;
}
void WebSchedulerService::condition() {

35
src/web/shuntingYard.hpp
View File

@@ -558,16 +558,33 @@ std::string calculate(const std::string & expr) {
}
return stack.back();
}
// check for <expr> ? <expr1> : <expr2>
// check for multiple instances of <cond> ? <expr1> : <expr2>
std::string compute(const std::string & expr) {
auto q = expr.find_first_of("?");
auto p = expr.find_first_of(":", q);
if (p != std::string::npos && q != std::string::npos) {
if (calculate(expr.substr(0, q))[0] == '1') {
return calculate(expr.substr(q + 1, p - q - 1));
} else {
return calculate(expr.substr(p + 1));
auto expr_new = expr;
// positions: q-questionmark, c-colon
auto q = expr_new.find_first_of("?");
while (q != std::string::npos) {
// find corresponding colon
auto c1 = expr_new.find_first_of(":", q + 1);
auto q1 = expr_new.find_first_of("?", q + 1);
while (q1 < c1 && q1 != std::string::npos && c1 != std::string::npos) {
q1 = expr_new.find_first_of("?", q1 + 1);
c1 = expr_new.find_first_of(":", c1 + 1);
}
if (c1 == std::string::npos) {
return ""; // error: missing colon
}
std::string cond = calculate(expr_new.substr(0, q));
if (cond[0] == '1') {
expr_new.erase(c1); // remove second expression after colon
expr_new.erase(0, q + 1); // remove condition before questionmark
} else if (cond[0] == '0') {
expr_new.erase(0, c1 + 1); // remove condition and first expression
} else {
return ""; // error
}
q = expr_new.find_first_of("?"); // search next instance
}
return calculate(expr);
return calculate(expr_new);
}