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

fix display partition name, remove double quotes in shuntingyard

Browse Source
This commit is contained in:
MichaelDvP
2025-09-25 17:11:21 +02:00
parent b2a8738672
commit 61c3b47269
5 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/shuntingYard.hpp
View File

@@ -67,7 +67,12 @@ std::deque<Token> exprToTokens(const std::string & expr) {
if (*p) {
++p;
}
const auto s = std::string(b, p);
auto s = std::string(b, p);
auto n = s.find("\"\"");
while (n != std::string::npos) {
s.erase(n, 2);
n = s.find("\"\"");
}
tokens.emplace_back(Token::Type::String, s, -3);
if (*p == '\0') {
--p;
@@ -360,8 +365,8 @@ bool isnum(const std::string & s) {
std::string commands(std::string & expr, bool quotes = true) {
auto expr_new = emsesp::Helpers::toLower(expr);
for (uint8_t device = 0; device < emsesp::EMSdevice::DeviceType::UNKNOWN; device++) {
const char * d = emsesp::EMSdevice::device_type_2_device_name(device);
auto f = expr_new.find(d);
std::string d = (std::string)emsesp::EMSdevice::device_type_2_device_name(device) + "/";
auto f = expr_new.find(d);
while (f != std::string::npos) {
// entity names are alphanumeric or _
auto e = expr_new.find_first_not_of("/._abcdefghijklmnopqrstuvwxyz0123456789", f);
@@ -401,6 +406,14 @@ std::string commands(std::string & expr, bool quotes = true) {
f = expr_new.find(d, e);
}
}
if (quotes) {
// remove double quotes
auto f = expr.find("\"\"");
while (f != std::string::npos) {
expr.erase(f, 2);
f = expr.find("\"\"");
}
}
return expr;
}
@@ -442,7 +455,7 @@ std::string to_hex(uint32_t i) {
// RPN calculator
std::string calculate(const std::string & expr) {
std::string expr_new = expr;
commands(expr_new);
// commands(expr_new);
const auto tokens = exprToTokens(expr_new);
if (tokens.empty()) {
@@ -679,6 +692,7 @@ std::string calculate(const std::string & expr) {
// check for multiple instances of <cond> ? <expr1> : <expr2>
std::string compute(const std::string & expr) {
std::string expr_new = expr;
commands(expr_new); // replace ems-esp commands with values
// search json with url:
auto f = expr_new.find_first_of('{');

2
src/core/system.cpp
View File

@@ -1572,7 +1572,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
node["freeCaps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram
node["usedApp"] = EMSESP::system_.appUsed(); // kilobytes
node["freeApp"] = EMSESP::system_.appFree(); // kilobytes
node["partition"] = esp_ota_get_running_partition()->label; // active partition
node["partition"] = (const char *)esp_ota_get_running_partition()->label; // active partition
node["flash_chip_size"] = ESP.getFlashChipSize() / 1024; // kilobytes
#endif
node["resetReason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1);