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

remove mqtt subscription to cmd, added telnet message after changing wifi settings,

Browse Source
This commit is contained in:
proddy
2020-07-21 14:38:01 +02:00
parent b5694c71f5
commit f632f471f9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system.cpp
View File

@@ -235,9 +235,6 @@ void System::start() {
pinMode(LED_GPIO, OUTPUT); // LED pin, 0 means disabled pinMode(LED_GPIO, OUTPUT); // LED pin, 0 means disabled
} }
// register MQTT system commands
Mqtt::subscribe("cmd", std::bind(&System::mqtt_commands, this, _1));
#ifndef EMSESP_FORCE_SERIAL #ifndef EMSESP_FORCE_SERIAL
if (tx_mode_) { if (tx_mode_) {
EMSuart::start(tx_mode_); // start UART, if tx_mode is not 0 EMSuart::start(tx_mode_); // start UART, if tx_mode is not 0
@@ -279,7 +276,7 @@ void System::send_heartbeat() {
doc["mqttpublishfails"] = Mqtt::publish_fails(); doc["mqttpublishfails"] = Mqtt::publish_fails();
doc["txfails"] = EMSESP::txservice_.telegram_fail_count(); doc["txfails"] = EMSESP::txservice_.telegram_fail_count();
Mqtt::publish("heartbeat", doc, false); // send to MQTT with retain off Mqtt::publish("heartbeat", doc, false); // send to MQTT with retain off. This will add to MQTT queue.
} }
// sets rate of led flash // sets rate of led flash
@@ -517,6 +514,8 @@ void System::console_commands(Shell & shell, unsigned int context) {
flash_string_vector{F_(set), F_(wifi), F_(hostname)}, flash_string_vector{F_(set), F_(wifi), F_(hostname)},
flash_string_vector{F_(name_mandatory)}, flash_string_vector{F_(name_mandatory)},
[](Shell & shell __attribute__((unused)), const std::vector<std::string> & arguments) { [](Shell & shell __attribute__((unused)), const std::vector<std::string> & arguments) {
shell.println("Note, connection will be reset...");
Console::loop();
EMSESP::esp8266React.getWiFiSettingsService()->update( EMSESP::esp8266React.getWiFiSettingsService()->update(
[&](WiFiSettings & wifiSettings) { [&](WiFiSettings & wifiSettings) {
wifiSettings.hostname = arguments.front().c_str(); wifiSettings.hostname = arguments.front().c_str();
@@ -530,13 +529,14 @@ void System::console_commands(Shell & shell, unsigned int context) {
flash_string_vector{F_(set), F_(wifi), F_(ssid)}, flash_string_vector{F_(set), F_(wifi), F_(ssid)},
flash_string_vector{F_(name_mandatory)}, flash_string_vector{F_(name_mandatory)},
[](Shell & shell, const std::vector<std::string> & arguments) { [](Shell & shell, const std::vector<std::string> & arguments) {
shell.println("Note, connection will be reset...");
Console::loop();
EMSESP::esp8266React.getWiFiSettingsService()->update( EMSESP::esp8266React.getWiFiSettingsService()->update(
[&](WiFiSettings & wifiSettings) { [&](WiFiSettings & wifiSettings) {
wifiSettings.ssid = arguments.front().c_str(); wifiSettings.ssid = arguments.front().c_str();
return StateUpdateResult::CHANGED; return StateUpdateResult::CHANGED;
}, },
"local"); "local");
shell.println(F("WiFi SSID updated"));
}); });
EMSESPShell::commands->add_command(ShellContext::SYSTEM, EMSESPShell::commands->add_command(ShellContext::SYSTEM,