v5.10.0j - MQTT/JSON language consolidation complete

5.10.0j
 * Allow conditional code based on core version
 * Removed all
MQTT, JSON and Command language defines from locale files (#1473)

README.md

@@ -1,7 +1,7 @@
 ## Sonoff-Tasmota
 Provide ESP8266 based Sonoff by [iTead Studio](https://www.itead.cc/) and ElectroDragon IoT Relay with Serial, Web and MQTT control allowing 'Over the Air' or OTA firmware updates using Arduino IDE.
 
-Current version is **5.10.0i** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
+Current version is **5.10.0j** - See [sonoff/_releasenotes.ino](https://github.com/arendst/Sonoff-Tasmota/blob/development/sonoff/_releasenotes.ino) for change information.
 
 ### ATTENTION All versions
 

sonoff/_releasenotes.ino

@@ -1,4 +1,8 @@
-/* 5.10.0i
+/* 5.10.0j
+ * Allow conditional code based on core version
+ * Removed all MQTT, JSON and Command language defines from locale files (#1473)
+ *
+ * 5.10.0i
  * Add device function pointers
  * Moved Command and JSON English language defines to one file (i18n.h)
  * Update it-IT.h language file (#1449)

sonoff/i18n.h

@@ -20,49 +20,113 @@
 #ifndef _I18N_H_
 #define _I18N_H_
 
-/********************************************************************************************/
+/*********************************************************************************************\
+ * All text used in Commands, MQTT, JSON messages only in English (#1473)
+ *
+ * (At this location they can/may be overruled by language files using undefs)
+\*********************************************************************************************/
 
-// Text used in JSON messages only in English (#1473)
+#define D_JSON_ABORTED "Aborted"
+#define D_JSON_ACTIVE "Active"
 #define D_JSON_ADDRESS "Address"
 #define D_JSON_AIRQUALITY "AirQuality"
 #define D_JSON_ANALOG_INPUT "Analog"
-#define D_JSON_CO2 "Carbon dioxide"
+#define D_JSON_AP "AP"                   // Access Point
+#define D_JSON_APMAC_ADDRESS "APMac"
+#define D_JSON_APPENDED "Appended"
+#define D_JSON_BAUDRATE "Baudrate"
+#define D_JSON_BLINK "Blink"
+#define D_JSON_BLOCKED_LOOP "Blocked Loop"
+#define D_JSON_BOOTVERSION "Boot"
+#define D_JSON_BOOTCOUNT "BootCount"
+#define D_JSON_BUILDDATETIME "BuildDateTime"
+#define D_JSON_CO2 "CarbonDioxide"
+#define D_JSON_COMMAND "Command"
+#define D_JSON_COREVERSION "Core"
 #define D_JSON_COUNTER "Counter"
-#define D_JSON_CURRENT "Current"          // As in Voltage and Current
+#define D_JSON_CURRENT "Current"         // As in Voltage and Current
 #define D_JSON_DATA "Data"
+#define D_JSON_DNSSERVER "DNSServer"
 #define D_JSON_DONE "Done"
+#define D_JSON_EMPTY "Empty"
+#define D_JSON_ENDDST "EndDST"           // End Daylight Savings Time
+#define D_JSON_ERASE "Erase"
+#define D_JSON_ERROR "Error"
+#define D_JSON_EVERY "Every"
+#define D_JSON_FAILED "Failed"
+#define D_JSON_FALLBACKTOPIC "FallbackTopic"
+#define D_JSON_FLASHMODE "FlashMode"
+#define D_JSON_FLASHSIZE "FlashSize"
+#define D_JSON_FREEMEMORY "Free"
+#define D_JSON_FROM "from"
+#define D_JSON_GAS "Gas"
+#define D_JSON_GATEWAY "Gateway"
+#define D_JSON_HEAPSIZE "Heap"
 #define D_JSON_HIGH "High"
 #define D_JSON_HUMIDITY "Humidity"
+#define D_JSON_I2CSCAN_DEVICES_FOUND_AT "Device(s) found at"
+#define D_JSON_I2CSCAN_UNKNOWN_ERROR_AT "Unknown error at"
+#define D_JSON_I2CSCAN_NO_DEVICES_FOUND "No devices found"
+#define D_JSON_ID "Id"
 #define D_JSON_ILLUMINANCE "Illuminance"
 #define D_JSON_UNKNOWN "Unknown"
 #define D_JSON_LIGHT "Light"
+#define D_JSON_LOCAL_TIME "Local"
 #define D_JSON_LOW "Low"
+#define D_JSON_MAC "Mac"
+#define D_JSON_MASK "Mask"
+#define D_JSON_NO "No"
 #define D_JSON_NOISE "Noise"
+#define D_JSON_NONE "None"
 #define D_JSON_OR "or"
 #define D_JSON_PERIOD "Period"
 #define D_JSON_POWERFACTOR "Factor"
 #define D_JSON_POWERUSAGE "Power"
 #define D_JSON_PRESSURE "Pressure"
 #define D_JSON_PRESSUREATSEALEVEL "SeaPressure"
+#define D_JSON_PROGRAMFLASHSIZE "ProgramFlashSize"
+#define D_JSON_PROGRAMSIZE "ProgramSize"
+#define D_JSON_RESTARTING "Restarting"
+#define D_JSON_RESTARTREASON "RestartReason"
+#define D_JSON_RSSI "RSSI"
+#define D_JSON_SAVEADDRESS "SaveAddress"
+#define D_JSON_SAVECOUNT "SaveCount"
+#define D_JSON_SAVED "Saved"
+#define D_JSON_SAVESTATE "SaveState"
+#define D_JSON_SDKVERSION "SDK"
+#define D_JSON_SELECTED "selected"
+#define D_JSON_SSID "SSId"
+#define D_JSON_STARTDST "StartDST"       // Start Daylight Savings Time
+#define D_JSON_STARTED "Started"
+#define D_JSON_SUBNETMASK "Subnetmask"
+#define D_JSON_SUCCESSFUL "Successful"
+#define D_JSON_SWITCH "Switch"
 #define D_JSON_SYNC "Sync"
 #define D_JSON_TEMPERATURE "Temperature"
+#define D_JSON_TEMPERATURE_UNIT "TempUnit"
+#define D_JSON_TIME "Time"
 #define D_JSON_TODAY "Today"
 #define D_JSON_TOTAL "Total"
 #define D_JSON_TYPE "Type"
-#define D_JSON_UV_LEVEL "UV Level"
+#define D_JSON_UPTIME "Uptime"
+#define D_JSON_UTC_TIME "UTC"
+#define D_JSON_UV_LEVEL "UvLevel"
+#define D_JSON_VCC "Vcc"
+#define D_JSON_VERSION "Version"
 #define D_JSON_VOLTAGE "Voltage"
+#define D_JSON_WIFI "Wifi"
 #define D_JSON_WRONG "Wrong"
 #define D_JSON_YESTERDAY "Yesterday"
 
-// Result
-#define D_RSLT_RESULT "RESULT"
+#define D_RSLT_ENERGY "ENERGY"
 #define D_RSLT_INFO "INFO"
-#define D_RSLT_STATE "STATE"
+#define D_RSLT_MARGINS "MARGINS"
+#define D_RSLT_POWER "POWER"
+#define D_RSLT_RESULT "RESULT"
 #define D_RSLT_SENSOR "SENSOR"
+#define D_RSLT_STATE "STATE"
 #define D_RSLT_UPTIME "UPTIME"
-#define D_RSLT_MARGINS "MARGINS"
 #define D_RSLT_WARNING "WARNING"
-#define D_RSLT_ENERGY "ENERGY"
 
 // Commands sonoff.ino
 #define D_CMND_MQTTHOST "MqttHost"
@@ -102,7 +166,6 @@
   #define D_STATUS10_SENSOR "SNS"
   #define D_STATUS11_STATUS "STS"
 #define D_CMND_POWER "Power"
-  #define D_RSLT_POWER "POWER"
 #define D_CMND_POWERONSTATE "PowerOnState"
 #define D_CMND_PULSETIME "PulseTime"
 #define D_CMND_BLINKTIME "BlinkTime"
@@ -119,7 +182,7 @@
 #define D_CMND_MODULE "Module"
 #define D_CMND_MODULES "Modules"
 #define D_CMND_GPIO "GPIO"
-  #define D_NOT_SUPPORTED "Not supported"
+  #define D_JSON_NOT_SUPPORTED "Not supported"
 #define D_CMND_GPIOS "GPIOs"
 #define D_CMND_PWM "PWM"
 #define D_CMND_PWMFREQUENCY "PWMFrequency"
@@ -130,7 +193,7 @@
 #define D_CMND_SLEEP "Sleep"
 #define D_CMND_UPLOAD "Upload"
 #define D_CMND_UPGRADE "Upgrade"
-  #define D_ONE_OR_GT "1 or >%s to upgrade"
+  #define D_JSON_ONE_OR_GT "1 or >%s to upgrade"
 #define D_CMND_OTAURL "OtaUrl"
 #define D_CMND_SERIALLOG "SerialLog"
 #define D_CMND_SYSLOG "SysLog"
@@ -153,18 +216,19 @@
 #define D_CMND_FRIENDLYNAME "FriendlyName"
 #define D_CMND_SWITCHMODE "SwitchMode"
 #define D_CMND_WEBSERVER "Webserver"
-  #define D_WEBSERVER_MODE "WebServerMode"
-  #define D_ACTIVE_FOR "Active for"
-  #define D_ON_DEVICE "on"
+  #define D_JSON_WEBSERVER_MODE "WebServerMode"
+  #define D_JSON_ACTIVE_FOR "Active for"
+  #define D_JSON_ON_DEVICE "on"
+  #define D_JSON_WITH_IP_ADDRESS "with IP address"
 #define D_CMND_WEBPASSWORD "WebPassword"
 #define D_CMND_WEBLOG "WebLog"
 #define D_CMND_EMULATION "Emulation"
 #define D_CMND_TELEPERIOD "TelePeriod"
 #define D_CMND_RESTART "Restart"
-  #define D_ONE_TO_RESTART "1 to restart"
+  #define D_JSON_ONE_TO_RESTART "1 to restart"
 #define D_CMND_RESET "Reset"
-  #define D_RESET_AND_RESTARTING "Reset and Restarting"
-  #define D_ONE_TO_RESET "1 to reset"
+  #define D_JSON_RESET_AND_RESTARTING "Reset and Restarting"
+  #define D_JSON_ONE_TO_RESET "1 to reset"
 #define D_CMND_TIMEZONE "Timezone"
 #define D_CMND_ALTITUDE "Altitude"
 #define D_CMND_LEDPOWER "LedPower"
@@ -209,19 +273,32 @@
 #define D_CMND_MAXPOWER "MaxPower"
 #define D_CMND_MAXPOWERHOLD "MaxPowerHold"
 #define D_CMND_MAXPOWERWINDOW "MaxPowerWindow"
+  #define D_JSON_MAXPOWERREACHED "MaxPowerReached"
+  #define D_JSON_MAXPOWERREACHEDRETRY "MaxPowerReachedRetry"
 #define D_CMND_SAFEPOWER "SafePower"
 #define D_CMND_SAFEPOWERHOLD "SafePowerHold"
 #define D_CMND_SAFEPOWERWINDOW "SafePowerWindow"
+  #define D_JSON_POWERMONITOR "PowerMonitor"
 #define D_CMND_MAXENERGY "MaxEnergy"
 #define D_CMND_MAXENERGYSTART "MaxEnergyStart"
+  #define D_JSON_ENERGYMONITOR "EnergyMonitor"
+  #define D_JSON_MAXENERGYREACHED "MaxEnergyReached"
 
 // Commands xdrv_04_snfbridge.ino
 #define D_CMND_RFCODE "RfCode"
 #define D_CMND_RFHIGH "RfHigh"
 #define D_CMND_RFHOST "RfHost"
 #define D_CMND_RFKEY "RfKey"
+  #define D_JSON_START_LEARNING "Start learning"
+  #define D_JSON_SET_TO_DEFAULT "Set to default"
+  #define D_JSON_DEFAULT_SENT "Default sent"
+  #define D_JSON_LEARNED_SENT "Learned sent"
+  #define D_JSON_LEARNING_ACTIVE "Learning active"
+  #define D_JSON_LEARN_FAILED "Learn failed"
+  #define D_JSON_LEARNED "Learned"
 #define D_CMND_RFLOW "RfLow"
 #define D_CMND_RFSYNC "RfSync"
+  #define D_JSON_RFRECEIVED "RfReceived"
 
 // Commands xdrv_05_domoticz.ino
 #define D_CMND_DOMOTICZ "Domoticz"
@@ -296,7 +373,7 @@ const char S_JSON_COMMAND_NVALUE_UNIT[] PROGMEM =             "{\"%s\":\"%d%s\"}
 const char S_JSON_COMMAND_NVALUE_UNIT_NVALUE_UNIT[] PROGMEM = "{\"%s\":\"%d%s (%d%s)\"}";
 
 const char S_JSON_COMMAND_NVALUE_SVALUE[] PROGMEM =           "{\"%s\":\"%d (%s)\"}";
-const char S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE[] PROGMEM =    "{\"%s\":\"%d (" D_ACTIVE " %d)\"}";
+const char S_JSON_COMMAND_NVALUE_ACTIVE_NVALUE[] PROGMEM =    "{\"%s\":\"%d (" D_JSON_ACTIVE " %d)\"}";
 
 const char S_JSON_COMMAND_NVALUE[] PROGMEM =                  "{\"%s\":%d}";
 const char S_JSON_COMMAND_SVALUE[] PROGMEM =                  "{\"%s\":\"%s\"}";