Skip to content
This repository has been archived by the owner on Nov 27, 2020. It is now read-only.

Commit

Permalink
Change savePresets to singular.
Browse files Browse the repository at this point in the history
  • Loading branch information
Skinah committed Jul 6, 2020
1 parent 7e93eca commit 71f5c65
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Dimmer XmasTreeDimmer "level" {channel="wled:wled:001:0eb121:colour"}
Number XmasTreeFX "FX" <text> {channel="wled:wled:001:0eb121:fx"}
Number XmasTreePalette "Palette" <colorwheel> {channel="wled:wled:001:0eb121:palettes"}
Number XmasTreePresets "Preset" <text> {channel="wled:wled:001:0eb121:presets"}
Number XmasTreeSavePresets "Save Preset" <text> {channel="wled:wled:001:0eb121:savePresets"}
Number XmasTreesavePreset "Save Preset" <text> {channel="wled:wled:001:0eb121:savePreset"}
Dimmer XmasTreeSpeed "FX Speed" <time> {channel="wled:wled:001:0eb121:speed"}
Dimmer XmasTreeIntensity "FX Intensity" {channel="wled:wled:001:0eb121:intensity"}
Switch XmasTreePresetCycle "presetCycle" <time> {channel="wled:wled:001:0eb121:presetCycle"}
Expand All @@ -98,7 +98,7 @@ Switch XmasTreeSleep "Sleep" <moon> {channel="wled:wled:001:0eb121:sleep"
Default item=XmasTreePresetCycle
Default item=XmasTreePresetDuration
Default item=XmasTreePresetTime
Selection item=XmasTreeSavePresets
Selection item=XmasTreeSavePreset
}
```
Expand Down
8 changes: 3 additions & 5 deletions src/main/resources/ESH-INF/thing/thing-types.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<thing-type id="wled">
<supported-bridge-type-refs>
<bridge-type-ref id="mqttBroker" />
<bridge-type-ref id="mqttBroker"/>
</supported-bridge-type-refs>
<label>WLed String</label>
<description>A Wled based string of LEDs</description>
Expand All @@ -75,8 +75,6 @@
<channel id="speed" typeId="speed"/>
<channel id="intensity" typeId="intensity"/>
<channel id="sleep" typeId="sleep"/>


</channels>
</thing-type>

Expand Down Expand Up @@ -300,10 +298,10 @@
</state>
</channel-type>

<channel-type id="savePresets">
<channel-type id="savePreset">
<item-type>Number</item-type>
<label>Save Preset</label>
<description>Save current state to Preset Location.</description>
<description>Save current state to selected location.</description>
<state>
<options>
<option value="1">Preset 1</option>
Expand Down
44 changes: 32 additions & 12 deletions target/classes/ESH-INF/thing/thing-types.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<thing-type id="wled">
<supported-bridge-type-refs>
<bridge-type-ref id="mqttBroker" />
<bridge-type-ref id="mqttBroker"/>
</supported-bridge-type-refs>
<label>WLed String</label>
<description>A Wled based string of LEDs</description>
Expand All @@ -75,8 +75,6 @@
<channel id="speed" typeId="speed"/>
<channel id="intensity" typeId="intensity"/>
<channel id="sleep" typeId="sleep"/>


</channels>
</thing-type>

Expand Down Expand Up @@ -250,6 +248,10 @@
<option value="89">89 Fireworks Starburst</option>
<option value="90">90 Fireworks 1D</option>
<option value="91">91 BouncingBalls</option>
<option value="92">92 Sinelon</option>
<option value="93">93 Sinelon_Dual</option>
<option value="94">94 Sinelon_Rainbow</option>
<option value="95">95 Popcorn</option>
<option value="96">96 Drip</option>
<option value="97">97 Plasma</option>
<option value="98">98 Percent</option>
Expand All @@ -265,6 +267,7 @@
<option value="108">108 Sinewave</option>
<option value="109">109 Phased Noise</option>
<option value="110">110 Flow</option>
<option value="111">111 Chunchun</option>
</options>
</state>
</channel-type>
Expand All @@ -291,19 +294,36 @@
<option value="14">Preset 14</option>
<option value="15">Preset 15</option>
<option value="16">Preset 16</option>
<option value="17">Preset 17</option>
<option value="18">Preset 18</option>
<option value="19">Preset 19</option>
<option value="20">Preset 20</option>
<option value="21">Preset 21</option>
<option value="22">Preset 22</option>
<option value="23">Preset 23</option>
<option value="24">Preset 24</option>
<option value="25">Preset 25</option>
</options>
</state>
</channel-type>

<channel-type id="savePreset">
<item-type>Number</item-type>
<label>Save Preset</label>
<description>Save current state to selected location.</description>
<state>
<options>
<option value="1">Preset 1</option>
<option value="2">Preset 2</option>
<option value="3">Preset 3</option>
<option value="4">Preset 4</option>
<option value="5">Preset 5</option>
<option value="6">Preset 6</option>
<option value="7">Preset 7</option>
<option value="8">Preset 8</option>
<option value="9">Preset 9</option>
<option value="10">Preset 10</option>
<option value="11">Preset 11</option>
<option value="12">Preset 12</option>
<option value="13">Preset 13</option>
<option value="14">Preset 14</option>
<option value="15">Preset 15</option>
<option value="16">Preset 16</option>
</options>
</state>
</channel-type>

<channel-type id="presetDuration">
<item-type>Dimmer</item-type>
<label>Preset Duration</label>
Expand Down
4 changes: 2 additions & 2 deletions target/classes/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.openhab.binding.wled
Bnd-LastModified: 1594033597803
Bnd-LastModified: 1594039070194
Bundle-Description: This project contains the official add-ons of open
HAB
Bundle-Developers: openhab;email="[email protected]";name=openHAB;organ
Expand All @@ -20,7 +20,7 @@ Bundle-SCM: url="https://github.com/openhab/openhab-addons/org.openhab
tor.bundles/org.openhab.binding.wled",tag=HEAD
Bundle-SymbolicName: org.openhab.binding.wled
Bundle-Vendor: openHAB.org
Bundle-Version: 2.5.4.202007061106
Bundle-Version: 2.5.4.202007061237
Created-By: 1.8.0_231 (Oracle Corporation)
Import-Package: org.eclipse.smarthome.config.core,org.eclipse.smarthom
e.config.discovery,org.eclipse.smarthome.core.library.types,org.eclip
Expand Down
Binary file not shown.
Binary file modified target/classes/org/openhab/binding/wled/internal/WLedHandler.class
Binary file not shown.

0 comments on commit 71f5c65

Please sign in to comment.