mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change Timer parameter Device to Output 

Change Timer parameter Device to Output and add German translation
(#2294)
This commit is contained in:
Theo Arends 2018-03-30 11:15:04 +02:00
parent 914c2929f8
commit 5ee463ddfb
16 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sonoff/_releasenotes.ino
View File

@ -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)

2
sonoff/i18n.h
View File

@ -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"

2
sonoff/language/cs-CZ.h
View File

@ -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

18
sonoff/language/de-DE.h
View File

@ -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"

2
sonoff/language/en-GB.h
View File

@ -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

2
sonoff/language/es-AR.h
View File

@ -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

2
sonoff/language/fr-FR.h
View File

@ -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

2
sonoff/language/hu-HU.h
View File

@ -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

2
sonoff/language/it-IT.h
View File

@ -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

2
sonoff/language/nl-NL.h
View File

@ -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

2
sonoff/language/pl-PL.h
View File

@ -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

2
sonoff/language/pt-PT.h
View File

@ -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

2
sonoff/language/ru-RU.h
View File

@ -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

2
sonoff/language/zh-CN.h
View File

@ -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

2
sonoff/language/zh-TW.h
View File

@ -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

6
sonoff/xdrv_09_timers.ino
View File

@ -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 =
"</div><br/><br/><br/>"
"<div>"
"<b>" D_TIMER_DEVICE "</b>&nbsp;<span><select style='width:12%;' id='d1' name='d1'></select></span>&emsp;"
"<b>" D_TIMER_OUTPUT "</b>&nbsp;<span><select style='width:12%;' id='d1' name='d1'></select></span>&emsp;"
"<b>" D_TIMER_POWER "</b>&nbsp;<select style='width:25%;' id='p1' name='p1'>"
"<option value='0'>" D_OFF "</option>"
"<option value='1'>" D_ON "</option>"