From 31c94424a9f28be07a243e92abbd2ebd8b2c3be3 Mon Sep 17 00:00:00 2001 From: Helge Date: Tue, 4 Oct 2022 17:39:06 +0200 Subject: [PATCH] Json name adaption + test config --- tasmota/include/i18n.h | 8 ++++---- tasmota/my_user_config.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tasmota/include/i18n.h b/tasmota/include/i18n.h index b7c139f1d..c96a02982 100644 --- a/tasmota/include/i18n.h +++ b/tasmota/include/i18n.h @@ -233,10 +233,10 @@ #define D_JSON_SIGNALSTRENGTH "SignalStrength" #define D_JSON_CHIPTEMPERATURE "ChipTemperature" #define D_JSON_RAW "Raw" -#define D_JSON_MX "Induction X-Axis" -#define D_JSON_MY "Induction Y-Axis" -#define D_JSON_MZ "Induction Z-Axis" -#define D_JSON_MAGNETICFLD "Magnetic Induction" +#define D_JSON_MX "XaxisInduction" +#define D_JSON_MY "YaxisInduction" +#define D_JSON_MZ "ZaxisInduction" +#define D_JSON_MAGNETICFLD "MagneticInduction" #define D_RSLT_ENERGY "ENERGY" #define D_RSLT_HASS_STATE "HASS_STATE" #define D_RSLT_INFO "INFO" diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index b3b76f260..72c94467b 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -505,8 +505,8 @@ // -- Rules or Script ---------------------------- // Select none or only one of the below defines USE_RULES or USE_SCRIPT #define USE_RULES // Add support for rules (+8k code) -// #define USE_EXPRESSION // Add support for expression evaluation in rules (+3k2 code, +64 bytes mem) -// #define SUPPORT_IF_STATEMENT // Add support for IF statement in rules (+4k2 code, -332 bytes mem) + #define USE_EXPRESSION // Add support for expression evaluation in rules (+3k2 code, +64 bytes mem) + #define SUPPORT_IF_STATEMENT // Add support for IF statement in rules (+4k2 code, -332 bytes mem) // #define USER_RULE1 "" // Add rule1 data saved at initial firmware load or when command reset is executed // #define USER_RULE2 "" // Add rule2 data saved at initial firmware load or when command reset is executed // #define USER_RULE3 "" // Add rule3 data saved at initial firmware load or when command reset is executed