diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino
index 07d30af84..e65516123 100644
--- a/sonoff/_releasenotes.ino
+++ b/sonoff/_releasenotes.ino
@@ -6,6 +6,7 @@
* Add Home Assistant MQTT Discovery for Buttons and change SetOption19 response (#2277)
* Change webpage parameter communication
* Change default Reset configuration time from 4 seconds to 40 seconds on Button hold (#2268)
+ * Change Timer parameter Device to more obvious Output
*
* 5.12.0h
* Add optional Arduino OTA support to be enabled in user_config.h (#1998)
diff --git a/sonoff/i18n.h b/sonoff/i18n.h
index 2b9ac09ed..dcc7024a0 100644
--- a/sonoff/i18n.h
+++ b/sonoff/i18n.h
@@ -355,7 +355,7 @@
#define D_JSON_TIMER_TIME "Time"
#define D_JSON_TIMER_DAYS "Days"
#define D_JSON_TIMER_REPEAT "Repeat"
- #define D_JSON_TIMER_DEVICE "Device"
+ #define D_JSON_TIMER_OUTPUT "Output"
#define D_JSON_TIMER_POWER "Power"
#define D_CMND_TIMERS "Timers"
diff --git a/sonoff/language/cs-CZ.h b/sonoff/language/cs-CZ.h
index 617524e20..c83da57de 100644
--- a/sonoff/language/cs-CZ.h
+++ b/sonoff/language/cs-CZ.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h
index f6f5c78a0..7e50360d0 100644
--- a/sonoff/language/de-DE.h
+++ b/sonoff/language/de-DE.h
@@ -356,17 +356,17 @@
#define D_DOMOTICZ_VOLTAGE "Voltage/PM2.5"
#define D_DOMOTICZ_CURRENT "Current/PM10"
#define D_DOMOTICZ_AIRQUALITY "AirQuality"
-#define D_DOMOTICZ_UPDATE_TIMER "Update timer"
+ #define D_DOMOTICZ_UPDATE_TIMER "Update Zeitplan"
// xdrv_09_timers.ino
-#define D_CONFIGURE_TIMER "Configure Timer"
-#define D_TIMER_PARAMETERS "Timer parameters"
-#define D_TIMER_ARM "Arm"
-#define D_TIMER_TIME "Time"
-#define D_TIMER_DAYS "Days"
-#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
-#define D_TIMER_POWER "Power"
+#define D_CONFIGURE_TIMER "Zeitplan konfigurieren"
+#define D_TIMER_PARAMETERS "Zeitplan Einstellungen"
+#define D_TIMER_ARM "Aktiv"
+#define D_TIMER_TIME "Uhrzeit"
+#define D_TIMER_DAYS "Wochentage"
+#define D_TIMER_REPEAT "Wiederholen"
+#define D_TIMER_OUTPUT "Ausgang"
+#define D_TIMER_POWER "Aktion"
// xdrv_03_energy.ino
#define D_ENERGY_TODAY "Energie heute"
diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h
index c7db040db..c0ead99f8 100644
--- a/sonoff/language/en-GB.h
+++ b/sonoff/language/en-GB.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Output"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h
index bf35cc807..891a313ab 100644
--- a/sonoff/language/es-AR.h
+++ b/sonoff/language/es-AR.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Hora"
#define D_TIMER_DAYS "Días"
#define D_TIMER_REPEAT "Repetir"
-#define D_TIMER_DEVICE "Salida"
+#define D_TIMER_OUTPUT "Salida"
#define D_TIMER_POWER "Estado"
// xdrv_03_energy.ino
diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h
index 64953f3b3..3fa12b4cd 100644
--- a/sonoff/language/fr-FR.h
+++ b/sonoff/language/fr-FR.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xsns_03_energy.ino
diff --git a/sonoff/language/hu-HU.h b/sonoff/language/hu-HU.h
index dd6ec3292..9edb25609 100644
--- a/sonoff/language/hu-HU.h
+++ b/sonoff/language/hu-HU.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h
index c9134c7dd..084327cc7 100644
--- a/sonoff/language/it-IT.h
+++ b/sonoff/language/it-IT.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h
index 3b91d3d84..2d1fbaf31 100644
--- a/sonoff/language/nl-NL.h
+++ b/sonoff/language/nl-NL.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Tijd"
#define D_TIMER_DAYS "Dagen"
#define D_TIMER_REPEAT "Herhaal"
-#define D_TIMER_DEVICE "Uitgang"
+#define D_TIMER_OUTPUT "Uitgang"
#define D_TIMER_POWER "Actie"
// xdrv_03_energy.ino
diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h
index f1023e5e4..6c011fed5 100644
--- a/sonoff/language/pl-PL.h
+++ b/sonoff/language/pl-PL.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/pt-PT.h b/sonoff/language/pt-PT.h
index 73a8b53ea..00acd9872 100644
--- a/sonoff/language/pt-PT.h
+++ b/sonoff/language/pt-PT.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/ru-RU.h b/sonoff/language/ru-RU.h
index 5c5b964e6..496daf8b2 100644
--- a/sonoff/language/ru-RU.h
+++ b/sonoff/language/ru-RU.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h
index 86c352dbf..82f0ae4ce 100644
--- a/sonoff/language/zh-CN.h
+++ b/sonoff/language/zh-CN.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/language/zh-TW.h b/sonoff/language/zh-TW.h
index f015232e3..b37639f6f 100644
--- a/sonoff/language/zh-TW.h
+++ b/sonoff/language/zh-TW.h
@@ -365,7 +365,7 @@
#define D_TIMER_TIME "Time"
#define D_TIMER_DAYS "Days"
#define D_TIMER_REPEAT "Repeat"
-#define D_TIMER_DEVICE "Device"
+#define D_TIMER_OUTPUT "Device"
#define D_TIMER_POWER "Power"
// xdrv_03_energy.ino
diff --git a/sonoff/xdrv_09_timers.ino b/sonoff/xdrv_09_timers.ino
index d84b14358..efa57b708 100644
--- a/sonoff/xdrv_09_timers.ino
+++ b/sonoff/xdrv_09_timers.ino
@@ -70,7 +70,7 @@ void PrepShowTimer(uint8_t index)
uint8_t mask = 1 << i;
snprintf(days, sizeof(days), "%s%d", days, ((Settings.timer[index].days & mask) > 0));
}
- snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_DEVICE "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"),
+ snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s\"" D_CMND_TIMER "%d\":{\"" D_JSON_TIMER_ARM "\":%d,\"" D_JSON_TIMER_TIME "\":\"%02d:%02d\",\"" D_JSON_TIMER_DAYS "\":\"%s\",\"" D_JSON_TIMER_REPEAT "\":%d,\"" D_JSON_TIMER_OUTPUT "\":%d,\"" D_JSON_TIMER_POWER "\":%d}"),
mqtt_data, index +1, Settings.timer[index].arm, Settings.timer[index].time / 60, Settings.timer[index].time % 60, days, Settings.timer[index].repeat, Settings.timer[index].device +1, Settings.timer[index].power);
}
@@ -146,7 +146,7 @@ boolean TimerCommand()
if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_REPEAT))].success()) {
Settings.timer[index].repeat = (root[parm_uc] != 0);
}
- if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_DEVICE))].success()) {
+ if (root[UpperCase_P(parm_uc, PSTR(D_JSON_TIMER_OUTPUT))].success()) {
uint8_t device = ((uint8_t)root[parm_uc] -1) & 0x0F;
Settings.timer[index].device = (device < devices_present) ? device : devices_present -1;
}
@@ -257,7 +257,7 @@ const char HTTP_FORM_TIMER[] PROGMEM =
const char HTTP_FORM_TIMER1[] PROGMEM =
"
"
""
- "" D_TIMER_DEVICE " "
+ "" D_TIMER_OUTPUT " "
"" D_TIMER_POWER "