From 789a4e1340298f8a2ff6eabe37e03762651beb29 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Wed, 22 Mar 2023 11:03:18 +0100 Subject: [PATCH] formatting --- src/common.h | 14 +++++++------- src/web/WebSchedulerService.h | 4 +--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/common.h b/src/common.h index 9fdbb5a9c..4583d5562 100644 --- a/src/common.h +++ b/src/common.h @@ -54,17 +54,17 @@ using string_vector = std::vector; #if defined(EMSESP_TEST) || defined(EMSESP_EN_ONLY) // In testing just take one language (en) to save on Flash space -#define MAKE_WORD_TRANSLATION(list_name, en, ...) static const char * const __pstr__L_##list_name[] = {en, nullptr}; -#define MAKE_TRANSLATION(list_name, shortname, en, ...) static const char * const __pstr__L_##list_name[] = {shortname, en, nullptr}; +#define MAKE_WORD_TRANSLATION(list_name, en, ...) static const char * const __pstr__L_##list_name[] = {en, nullptr}; +#define MAKE_TRANSLATION(list_name, shortname, en, ...) static const char * const __pstr__L_##list_name[] = {shortname, en, nullptr}; #elif defined(EMSESP_DE_ONLY) -#define MAKE_WORD_TRANSLATION(list_name, en, de, ...) static const char * const __pstr__L_##list_name[] = {de, nullptr}; -#define MAKE_TRANSLATION(list_name, shortname, en, de, ...) static const char * const __pstr__L_##list_name[] = {shortname, de, nullptr}; +#define MAKE_WORD_TRANSLATION(list_name, en, de, ...) static const char * const __pstr__L_##list_name[] = {de, nullptr}; +#define MAKE_TRANSLATION(list_name, shortname, en, de, ...) static const char * const __pstr__L_##list_name[] = {shortname, de, nullptr}; #else -#define MAKE_WORD_TRANSLATION(list_name, ...) static const char * const __pstr__L_##list_name[] = {__VA_ARGS__, nullptr}; -#define MAKE_TRANSLATION(list_name, ...) static const char * const __pstr__L_##list_name[] = {__VA_ARGS__, nullptr}; +#define MAKE_WORD_TRANSLATION(list_name, ...) static const char * const __pstr__L_##list_name[] = {__VA_ARGS__, nullptr}; +#define MAKE_TRANSLATION(list_name, ...) static const char * const __pstr__L_##list_name[] = {__VA_ARGS__, nullptr}; #endif -#define MAKE_NOTRANSLATION(list_name, ...) static const char * const __pstr__L_##list_name[] = {__VA_ARGS__, nullptr}; +#define MAKE_NOTRANSLATION(list_name, ...) static const char * const __pstr__L_##list_name[] = {__VA_ARGS__, nullptr}; // fixed strings, no translations #define MAKE_ENUM_FIXED(enum_name, ...) static const char * const __pstr__L_##enum_name[] = {__VA_ARGS__, nullptr}; diff --git a/src/web/WebSchedulerService.h b/src/web/WebSchedulerService.h index e723185e4..5b919fe3b 100644 --- a/src/web/WebSchedulerService.h +++ b/src/web/WebSchedulerService.h @@ -60,13 +60,11 @@ class WebSchedulerService : public StatefulService { bool command_setvalue(const char * value, const std::string name); bool get_value_info(JsonObject & output, const char * cmd); - private: - bool command(const char * cmd, const char * data); - // make all functions public so we can test in the debug and standalone mode #ifndef EMSESP_STANDALONE private: #endif + bool command(const char * cmd, const char * data); HttpEndpoint _httpEndpoint; FSPersistence _fsPersistence;