public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ecowatt] Add channels for D+2 and D+3 (#13823) 

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2022-12-04 16:32:26 +01:00 committed by GitHub
parent 312b4e2faf
commit 7cbae110a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/EcowattBindingConstants.java
View File

@ -32,5 +32,7 @@ public class EcowattBindingConstants {
// List of all Channel ids
public static final String CHANNEL_TODAY_SIGNAL = "todaySignal";
public static final String CHANNEL_TOMORROW_SIGNAL = "tomorrowSignal";
public static final String CHANNEL_IN_TWO_DAYS_SIGNAL = "inTwoDaysSignal";
public static final String CHANNEL_IN_THREE_DAYS_SIGNAL = "inThreeDaysSignal";
public static final String CHANNEL_CURRENT_HOUR_SIGNAL = "currentHourSignal";
}

8
bundles/org.openhab.binding.ecowatt/src/main/java/org/openhab/binding/ecowatt/internal/handler/EcowattHandler.java
View File

@ -212,6 +212,14 @@ public class EcowattHandler extends BaseThingHandler {
if ((channelId == null || CHANNEL_TOMORROW_SIGNAL.equals(channelId)) && isLinked(CHANNEL_TOMORROW_SIGNAL)) {
updateState(CHANNEL_TOMORROW_SIGNAL, getDaySignalState(response, now.plusDays(1)));
}
if ((channelId == null || CHANNEL_IN_TWO_DAYS_SIGNAL.equals(channelId))
&& isLinked(CHANNEL_IN_TWO_DAYS_SIGNAL)) {
updateState(CHANNEL_IN_TWO_DAYS_SIGNAL, getDaySignalState(response, now.plusDays(2)));
}
if ((channelId == null || CHANNEL_IN_THREE_DAYS_SIGNAL.equals(channelId))
&& isLinked(CHANNEL_IN_THREE_DAYS_SIGNAL)) {
updateState(CHANNEL_IN_THREE_DAYS_SIGNAL, getDaySignalState(response, now.plusDays(3)));
}
if ((channelId == null || CHANNEL_CURRENT_HOUR_SIGNAL.equals(channelId))
&& isLinked(CHANNEL_CURRENT_HOUR_SIGNAL)) {
updateState(CHANNEL_CURRENT_HOUR_SIGNAL, getHourSignalState(response, now));

4
bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/i18n/ecowatt.properties
View File

@ -9,6 +9,10 @@ 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 (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).
thing-type.ecowatt.signals.channel.inThreeDaysSignal.label = In Three Days Signal
thing-type.ecowatt.signals.channel.inThreeDaysSignal.description = The signal relating to the forecast consumption level in three days. 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.inTwoDaysSignal.label = In Two Days Signal
thing-type.ecowatt.signals.channel.inTwoDaysSignal.description = The signal relating to the forecast consumption level in two days. 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 (green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).
thing-type.ecowatt.signals.channel.tomorrowSignal.label = Tomorrow Signal

12
bundles/org.openhab.binding.ecowatt/src/main/resources/OH-INF/thing/thing-types.xml
View File

@ -20,6 +20,18 @@
consumption
(green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).</description>
</channel>
<channel id="inTwoDaysSignal" typeId="signal">
<label>In Two Days Signal</label>
<description>The signal relating to the forecast consumption level in two days. Values are 1 for normal
consumption
(green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).</description>
</channel>
<channel id="inThreeDaysSignal" typeId="signal">
<label>In Three Days Signal</label>
<description>The signal relating to the forecast consumption level in three days. Values are 1 for normal
consumption
(green), 2 for strained electrical system (orange) and 3 for very strained electrical system (red).</description>
</channel>
<channel id="currentHourSignal" typeId="signal">
<label>Current Hour Signal</label>
<description>The signal relating to the forecast consumption level for the current hour. Values are 1 for normal