diff --git a/bundles/org.openhab.binding.ecowatt/README.md b/bundles/org.openhab.binding.ecowatt/README.md index 6567b7ca39c..9f006b49d93 100644 --- a/bundles/org.openhab.binding.ecowatt/README.md +++ b/bundles/org.openhab.binding.ecowatt/README.md @@ -40,9 +40,9 @@ All channels are read-only. | Channel | Type | Description | |-------------------|--------|------------------------------------------------------------------| -| todaySignal | Number | The signal relating to the forecast consumption level for today. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. | -| tomorrowSignal | Number | The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. | -| currentHourSignal | Number | The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. | +| todaySignal | Number | The signal relating to the forecast consumption level for today. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). | +| tomorrowSignal | Number | The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). | +| currentHourSignal | Number | The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). | ## Full Example diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties index 742223ac718..3f5890c865c 100644 --- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties +++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties @@ -8,11 +8,11 @@ binding.ecowatt.description = This binding uses the Ecowatt API to expose clear thing-type.ecowatt.signals.label = Electricity Forecast thing-type.ecowatt.signals.description = The French electricity consumption forecasts thing-type.ecowatt.signals.channel.currentHourSignal.label = Current Hour Signal -thing-type.ecowatt.signals.channel.currentHourSignal.description = The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. +thing-type.ecowatt.signals.channel.currentHourSignal.description = The signal relating to the forecast consumption level for the current hour. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). thing-type.ecowatt.signals.channel.todaySignal.label = Today Signal -thing-type.ecowatt.signals.channel.todaySignal.description = The signal relating to the forecast consumption level for today. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. +thing-type.ecowatt.signals.channel.todaySignal.description = The signal relating to the forecast consumption level for today. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red)). thing-type.ecowatt.signals.channel.tomorrowSignal.label = Tomorrow Signal -thing-type.ecowatt.signals.channel.tomorrowSignal.description = The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. +thing-type.ecowatt.signals.channel.tomorrowSignal.description = The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). # thing types config @@ -24,10 +24,10 @@ thing-type.config.ecowatt.signals.idSecret.description = ID secret provided with # channel types channel-type.ecowatt.signal.label = Consumption Signal -channel-type.ecowatt.signal.description = The signal relating to the forecast consumption level. Values are 1 for normal consumption, 2 for strained electrical system and 3 for very strained electrical system. -channel-type.ecowatt.signal.state.option.1 = Green (normal consumption) -channel-type.ecowatt.signal.state.option.2 = Orange (strained electrical system) -channel-type.ecowatt.signal.state.option.3 = Red (very strained electrical system) +channel-type.ecowatt.signal.description = The signal relating to the forecast consumption level. Values are 1 for normal consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). +channel-type.ecowatt.signal.state.option.1 = Green +channel-type.ecowatt.signal.state.option.2 = Orange +channel-type.ecowatt.signal.state.option.3 = Red # thing status descriptions diff --git a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml index 43da2596a62..5c58aa53b25 100644 --- a/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml +++ b/bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml @@ -11,18 +11,19 @@ - The signal relating to the forecast consumption level for today. Values are 1 for normal consumption, 2 - for strained electrical system and 3 for very strained electrical system. + The signal relating to the forecast consumption level for today. Values are 1 for normal consumption + (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red)). The signal relating to the forecast consumption level for tomorrow. Values are 1 for normal - consumption, 2 for strained electrical system and 3 for very strained electrical system. + consumption + (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). The signal relating to the forecast consumption level for the current hour. Values are 1 for normal - consumption, 2 for strained electrical system and 3 for very strained electrical system. + consumption (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red). @@ -42,13 +43,13 @@ Number - The signal relating to the forecast consumption level. Values are 1 for normal consumption, 2 for - strained electrical system and 3 for very strained electrical system. + The signal relating to the forecast consumption level. Values are 1 for normal consumption (green), 2 for + strained electrical system (orange) and 3 for very strained electrical system (red). - - - + + +