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

show RSSI in standalone to test negative value with shuntingyard

Browse Source
This commit is contained in:
proddy
2024-07-08 14:56:21 +02:00
parent 9bda29044f
commit bef664b6d6
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system.cpp
View File

@@ -1300,17 +1300,20 @@ bool System::get_value_info(JsonObject root, const char * command) {
LOG_ERROR("empty system command"); LOG_ERROR("empty system command");
return false; return false;
} }
char cmd[COMMAND_MAX_LENGTH]; char cmd[COMMAND_MAX_LENGTH];
strlcpy(cmd, command, sizeof(cmd)); strlcpy(cmd, command, sizeof(cmd));
char * val = strstr(cmd, "/value"); char * val = strstr(cmd, "/value");
if (val) { if (val) {
val[0] = '\0'; val[0] = '\0';
} }
char * dash = strchr(cmd, '/'); char * dash = strchr(cmd, '/');
if (dash) { if (dash) {
*dash = '\0'; *dash = '\0';
dash++; dash++;
} }
if (command_info("", 0, root)) { if (command_info("", 0, root)) {
std::string s; std::string s;
// Loop through all the key-value pairs in root to find the key, case independent // Loop through all the key-value pairs in root to find the key, case independent
@@ -1333,6 +1336,7 @@ bool System::get_value_info(JsonObject root, const char * command) {
} }
} }
} }
if (!s.empty()) { if (!s.empty()) {
root.clear(); root.clear();
if (val) { if (val) {
@@ -1372,9 +1376,9 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
#endif #endif
node["reset reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1); node["reset reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1);
#ifndef EMSESP_STANDALONE
// Network Status // Network Status
node = output["Network"].to<JsonObject>(); node = output["Network"].to<JsonObject>();
#ifndef EMSESP_STANDALONE
if (EMSESP::system_.ethernet_connected()) { if (EMSESP::system_.ethernet_connected()) {
node["network"] = "Ethernet"; node["network"] = "Ethernet";
node["hostname"] = ETH.getHostname(); node["hostname"] = ETH.getHostname();
@@ -1397,6 +1401,11 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
// node["IPv6 address"] = uuid::printable_to_string(WiFi.localIPv6()); // node["IPv6 address"] = uuid::printable_to_string(WiFi.localIPv6());
// } // }
} }
#else
// for testing
node["network"] = "WiFi";
node["hostname"] = "ems-esp";
node["RSSI"] = -23;
#endif #endif
EMSESP::esp8266React.getNetworkSettingsService()->read([&](NetworkSettings & settings) { EMSESP::esp8266React.getNetworkSettingsService()->read([&](NetworkSettings & settings) {
if (WiFi.status() == WL_CONNECTED && !settings.bssid.isEmpty()) { if (WiFi.status() == WL_CONNECTED && !settings.bssid.isEmpty()) {