Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[opensprinkler] Add Veto and some default times to state options. #11816

Merged
merged 4 commits into from
Jan 8, 2022
Merged

[opensprinkler] Add Veto and some default times to state options. #11816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ea29cf
Add default times to state options.
Skinah Dec 19, 2021
7d258c8
remove pattern
Skinah Dec 20, 2021
1073593
Update default translations properties
lolodomo Dec 21, 2021
84bfc86
Merge pull request #2 from lolodomo/opensprinkler_i18n
Skinah Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions ...org.openhab.binding.opensprinkler/src/main/resources/OH-INF/i18n/opensprinkler.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,39 @@ channel-type.opensprinkler.ignoreRain.label = Station Ignores Rain
channel-type.opensprinkler.ignoreRain.description = The station will ignore forecasted rain.
channel-type.opensprinkler.nextDuration.label = Next Duration
channel-type.opensprinkler.nextDuration.description = The duration the station will be opened the next time it is switched on.
channel-type.opensprinkler.nextDuration.state.option.15s = 15 Seconds
channel-type.opensprinkler.nextDuration.state.option.1min = 1 Minute
channel-type.opensprinkler.nextDuration.state.option.5min = 5 Minutes
channel-type.opensprinkler.nextDuration.state.option.10min = 10 Minutes
channel-type.opensprinkler.nextDuration.state.option.15min = 15 Minutes
channel-type.opensprinkler.nextDuration.state.option.20min = 20 Minutes
channel-type.opensprinkler.nextDuration.state.option.25min = 25 Minutes
channel-type.opensprinkler.nextDuration.state.option.30min = 30 Minutes
channel-type.opensprinkler.nextDuration.state.option.40min = 40 Minutes
channel-type.opensprinkler.nextDuration.state.option.50min = 50 Minutes
channel-type.opensprinkler.nextDuration.state.option.60min = 1 Hour
channel-type.opensprinkler.nextDuration.state.option.90min = 1.5 Hours
channel-type.opensprinkler.nextDuration.state.option.2h = 2 Hours
channel-type.opensprinkler.nextDuration.state.option.3h = 3 Hours
channel-type.opensprinkler.nextDuration.state.option.4h = 4 Hours
channel-type.opensprinkler.programs.label = Run Program
channel-type.opensprinkler.programs.description = Run a program that is saved inside the OpenSprinkler Device.
channel-type.opensprinkler.queued.label = Queued
channel-type.opensprinkler.queued.description = Indicates if the station is queued to be turned on. Can be removed from the queue by turning off. ON is read-only.
channel-type.opensprinkler.rainDelay.label = Rain Delay
channel-type.opensprinkler.rainDelay.description = The amount of time in hours to delay the running of any program.
channel-type.opensprinkler.rainDelay.state.option.0s = Off
channel-type.opensprinkler.rainDelay.state.option.6h = 6 Hours
channel-type.opensprinkler.rainDelay.state.option.12h = 12 Hours
channel-type.opensprinkler.rainDelay.state.option.1d = 1 Day
channel-type.opensprinkler.rainDelay.state.option.2d = 2 Days
channel-type.opensprinkler.rainDelay.state.option.3d = 3 Days
channel-type.opensprinkler.rainDelay.state.option.4d = 4 Days
channel-type.opensprinkler.rainDelay.state.option.5d = 5 Days
channel-type.opensprinkler.rainDelay.state.option.6d = 6 Days
channel-type.opensprinkler.rainDelay.state.option.7d = 1 Week
channel-type.opensprinkler.rainDelay.state.option.14d = 2 Weeks
channel-type.opensprinkler.rainDelay.state.option.28d = 4 Weeks
channel-type.opensprinkler.rainsensor.label = Rain Sensor
channel-type.opensprinkler.rainsensor.description = Provides feedback on whether the OpenSprinkler device has detected rain or not.
channel-type.opensprinkler.remainingWaterTime.label = Remaining Water Time
Expand Down
38 changes: 36 additions & 2 deletions bundles/org.openhab.binding.opensprinkler/src/main/resources/OH-INF/thing/thing-types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
<label>Station State</label>
<description>Controls a station on the OpenSprinkler device.</description>
<category>Switch</category>
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel-type>

<channel-type id="ignoreRain">
Expand Down Expand Up @@ -180,15 +181,48 @@
<label>Next Duration</label>
<description>The duration the station will be opened the next time it is switched on.</description>
<category>Time</category>
<state readOnly="false" pattern="%.0f min"/>
<state>
<options>
<option value="15s">15 Seconds</option>
<option value="1min">1 Minute</option>
<option value="5min">5 Minutes</option>
<option value="10min">10 Minutes</option>
<option value="15min">15 Minutes</option>
<option value="20min">20 Minutes</option>
<option value="25min">25 Minutes</option>
<option value="30min">30 Minutes</option>
<option value="40min">40 Minutes</option>
<option value="50min">50 Minutes</option>
<option value="60min">1 Hour</option>
<option value="90min">1.5 Hours</option>
<option value="2h">2 Hours</option>
<option value="3h">3 Hours</option>
<option value="4h">4 Hours</option>
</options>
</state>
</channel-type>

<channel-type id="rainDelay">
<item-type>Number:Time</item-type>
<label>Rain Delay</label>
<description>The amount of time in hours to delay the running of any program.</description>
<category>Time</category>
<state readOnly="false" pattern="%.0f h"/>
<state readOnly="false" pattern="%.0f h">
<options>
<option value="0s">Off</option>
<option value="6h">6 Hours</option>
<option value="12h">12 Hours</option>
<option value="1d">1 Day</option>
<option value="2d">2 Days</option>
<option value="3d">3 Days</option>
<option value="4d">4 Days</option>
<option value="5d">5 Days</option>
<option value="6d">6 Days</option>
<option value="7d">1 Week</option>
<option value="14d">2 Weeks</option>
<option value="28d">4 Weeks</option>
</options>
</state>
</channel-type>

<channel-type id="programs">
Expand Down