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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
Proddy
2020-10-25 18:38:30 +01:00
committed by GitHub
parent 5e7e80e390 9ee95985b7
commit 243a467234
16 changed files with 62 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system.cpp
View File

@@ -542,7 +542,7 @@ void System::console_commands(Shell & shell, unsigned int context) {
return StateUpdateResult::CHANGED;
},
"local");
shell.println(F("Admin password updated"));
shell.println(F("su password updated"));
} else {
shell.println(F("Passwords do not match"));
}
@@ -847,7 +847,7 @@ bool System::check_upgrade() {
// value and id are ignored
bool System::command_info(const char * value, const int8_t id, JsonObject & json) {
#ifdef EMSESP_STANDALONE
json["test"] = "testing info command";
json["test"] = "testing system info command";
#else
EMSESP::esp8266React.getWiFiSettingsService()->read([&](WiFiSettings & settings) {
char s[7];