From 0913f31c683bed1aebd36aae63aacc50a809ab0e Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 28 Feb 2021 13:54:15 +0100 Subject: [PATCH] removed (test) and hardcoded it, only for EMSESP_TEST compiling --- src/console.cpp | 6 +++++- src/locale_EN.h | 1 - src/system.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/console.cpp b/src/console.cpp index a3f08977f..63a56070c 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -444,7 +444,7 @@ void Console::enter_custom_context(Shell & shell, unsigned int context) { // each custom context has the common commands like log, help, exit, su etc void Console::load_standard_commands(unsigned int context) { #if defined(EMSESP_TEST) - EMSESPShell::commands->add_command(context, CommandFlags::USER, flash_string_vector{F_(test)}, flash_string_vector{F_(name_optional)}, [](Shell & shell, const std::vector & arguments) { + EMSESPShell::commands->add_command(context, CommandFlags::USER, flash_string_vector{F("test")}, flash_string_vector{F_(name_optional)}, [](Shell & shell, const std::vector & arguments) { if (arguments.size() == 0) { Test::run_test(shell, "default"); } else { @@ -453,6 +453,10 @@ void Console::load_standard_commands(unsigned int context) { }); #endif +#if defined(EMSESP_STANDALONE) + EMSESPShell::commands->add_command(context, CommandFlags::USER, flash_string_vector{F("t")}, [](Shell & shell, const std::vector & arguments) { Test::run_test(shell, "default"); }); +#endif + #if defined(EMSESP_DEBUG) EMSESPShell::commands->add_command(context, CommandFlags::USER, flash_string_vector{F_(debug)}, flash_string_vector{F_(name_optional)}, [](Shell & shell, const std::vector & arguments) { if (arguments.size() == 0) { diff --git a/src/locale_EN.h b/src/locale_EN.h index 7e3dd9b9c..60f70d88e 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -78,7 +78,6 @@ MAKE_PSTR_WORD(data) MAKE_PSTR_WORD(command) MAKE_PSTR_WORD(commands) MAKE_PSTR_WORD(info) -MAKE_PSTR_WORD(test) MAKE_PSTR_WORD(settings) // devices diff --git a/src/system.cpp b/src/system.cpp index 83427124d..e71f9a4ac 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -194,7 +194,7 @@ void System::start(uint32_t heap_start) { Command::add_with_json(EMSdevice::DeviceType::SYSTEM, F_(settings), System::command_settings); #if defined(EMSESP_TEST) - Command::add(EMSdevice::DeviceType::SYSTEM, F_(test), System::command_test); + Command::add(EMSdevice::DeviceType::SYSTEM, F("test"), System::command_test); #endif });