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

F-commands to flash and display them

Browse Source
This commit is contained in:
MichaelDvP
2020-11-01 15:35:49 +01:00
parent cb228d8c8b
commit de0e291b78
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/uuid-console/src/shell.cpp
View File

@@ -133,6 +133,14 @@ void Shell::loop_one() {
} }
} }
void Shell::set_command_str(const __FlashStringHelper * str) {
line_buffer_ = read_flash_string(str);
erase_current_line();
prompt_displayed_ = false;
display_prompt();
process_command();
}
void Shell::loop_normal() { void Shell::loop_normal() {
const int input = read_one_char(); const int input = read_one_char();
@@ -246,20 +254,17 @@ void Shell::loop_normal() {
cursor_ = line_buffer_.length(); cursor_ = line_buffer_.length();
} else if (esc_ == 11) { } else if (esc_ == 11) {
// F1 and F10 // F1 and F10
line_buffer_ = "help"; set_command_str(F("help"));
process_command();
} else if (esc_ == 12) { } else if (esc_ == 12) {
// F2 // F2
line_buffer_ = "show"; set_command_str(F("show"));
process_command();
} else if (esc_ == 20) { } else if (esc_ == 20) {
// F9 // F9
line_buffer_ = "send telegram \"0B \""; line_buffer_ = read_flash_string(F("send telegram \"0B \""));
cursor_ = 1; cursor_ = 1;
} else if (esc_ == 21) { } else if (esc_ == 21) {
// F10 // F10
line_buffer_ = "call system report"; set_command_str(F("call system report"));
process_command();
} }
esc_ = 0; esc_ = 0;
} else { } else {

1
lib/uuid-console/src/uuid/console.h
View File

@@ -892,6 +892,7 @@ class Shell : public std::enable_shared_from_this<Shell>, public uuid::log::Hand
* @since 0.1.0 * @since 0.1.0
*/ */
size_t vprintf(const __FlashStringHelper * format, va_list ap); size_t vprintf(const __FlashStringHelper * format, va_list ap);
void set_command_str(const __FlashStringHelper * str);
static const uuid::log::Logger logger_; /*!< uuid::log::Logger instance for shells. @since 0.1.0 */ static const uuid::log::Logger logger_; /*!< uuid::log::Logger instance for shells. @since 0.1.0 */
static std::set<std::shared_ptr<Shell>> shells_; /*!< Registered running shells to be executed. @since 0.1.0 */ static std::set<std::shared_ptr<Shell>> shells_; /*!< Registered running shells to be executed. @since 0.1.0 */

2
src/emsesp.cpp
View File

@@ -917,7 +917,7 @@ void EMSESP::start() {
emsdevices.reserve(5); // reserve space for initially 5 devices to avoid mem emsdevices.reserve(5); // reserve space for initially 5 devices to avoid mem
LOG_INFO("EMS Device library loaded with %d records", device_library_.size()); LOG_INFO(F("EMS Device library loaded with %d records"), device_library_.size());
#if defined(EMSESP_STANDALONE) #if defined(EMSESP_STANDALONE)
mqtt_.on_connect(); // simulate an MQTT connection mqtt_.on_connect(); // simulate an MQTT connection

4
src/system.cpp
View File

@@ -61,7 +61,7 @@ bool System::command_send(const char * value, const int8_t id) {
// restart EMS-ESP // restart EMS-ESP
void System::restart() { void System::restart() {
LOG_NOTICE("Restarting system..."); LOG_NOTICE(F("Restarting system..."));
Shell::loop_all(); Shell::loop_all();
delay(1000); // wait a second delay(1000); // wait a second
#if defined(ESP8266) #if defined(ESP8266)
@@ -73,7 +73,7 @@ void System::restart() {
// saves all settings // saves all settings
void System::wifi_reconnect() { void System::wifi_reconnect() {
LOG_NOTICE("The wifi will reconnect..."); LOG_NOTICE(F("The wifi will reconnect..."));
Shell::loop_all(); Shell::loop_all();
delay(1000); // wait a second delay(1000); // wait a second
EMSESP::webSettingsService.save(); // local settings EMSESP::webSettingsService.save(); // local settings