Skip to content

Commit

Permalink
Merge branch 'ottobonn-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Fishwaldo committed Nov 3, 2020
2 parents e0d26fc + 7555d5a commit 4e3a8d9
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 3 deletions.
58 changes: 58 additions & 0 deletions config/ge/14280-plugin-dimmer.xml
@@ -0,0 +1,58 @@
<Product Revision="0" xmlns="https://github.com/OpenZWave/open-zwave">
<MetaData>
<MetaDataItem name="OzwInfoPage">none</MetaDataItem>
<MetaDataItem name="ProductPic">images/ge/14280-plugin-dimmer.png</MetaDataItem>
<MetaDataItem id="3033" name="ZWProductPage" type="5044">https://products.z-wavealliance.org/products/2139/</MetaDataItem>
<MetaDataItem name="Name">Plug-in Smart Dimmer, Dual Plug With Simultaneous Control</MetaDataItem>
<MetaDataItem name="ProductManual">https://products.z-wavealliance.org/ProductManual/File?folder=%26filename=MarketCertificationFiles/2139/Binder1.pdf</MetaDataItem>
<MetaDataItem id="3033" name="FrequencyName" type="5044">U.S. / Canada / Mexico</MetaDataItem>
<MetaDataItem name="ResetDescription"></MetaDataItem>
<MetaDataItem name="InclusionDescription"></MetaDataItem>
<MetaDataItem name="Description"></MetaDataItem>
<MetaDataItem id="3033" name="Identifier" type="5044">14280/ZW3107</MetaDataItem>
<MetaDataItem name="ExclusionDescription"></MetaDataItem>
<ChangeLog>
<Entry author="Travis Geis - travis@travisgeis.com" date="27 August 2020" revision="0">Initial Metadata Import from Z-Wave Alliance Database - https://products.z-wavealliance.org/products/2139/xml</Entry>
</ChangeLog>
</MetaData>
<CommandClass id="112">
<Value genre="config" index="3" label="LED Light" max="2" min="0" size="1" type="list" value="0">
<Help>Sets when the LED on the switch is lit.</Help>
<Item label="LED on when light off" value="0"/>
<Item label="LED on when light on" value="1"/>
<Item label="LED always off" value="2"/>
</Value>
<!-- Both the number of steps (or levels) that the dimmer will change and the timing of the steps can be modified to suit personal preferences. The timing of the steps can be adjusted in 10 millisecond intervals. As an example, the default setting for parameter 8 is 3. This means that the lighting level will change every 30 milliseconds when the Dim Command is received. A value of 255 would mean that the level would change every 2.55 seconds. Combined, the two parameters allow dim rate adjustments from 10 milliseconds to 4.2 minutes to go from maximum-to-minimum or minimum-to-maximum brightness levels. -->
<Value genre="config" index="7" label="Z-Wave Command Dim Step" max="99" min="1" type="byte" units="" value="1">
<Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
</Value>
<Value genre="config" index="8" label="Z-Wave Command Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
<Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
</Value>
<Value genre="config" index="9" label="Local Control Dim Step" max="99" min="1" type="byte" units="" value="1">
<Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
</Value>
<Value genre="config" index="10" label="Local Control Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
<Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
</Value>
<Value genre="config" index="11" label="ALL ON/ALL OFF Dim Step" max="99" min="1" type="byte" units="" value="1">
<Help>Indicates how many levels the dimmer will change for each dimming step.</Help>
</Value>
<Value genre="config" index="12" label="ALL ON/ALL OFF Dim Rate" max="255" min="1" type="short" units="x 10 milliseconds" value="3">
<Help>This value indicates in 10 millisecond resolution, how often the dim level will change. For example, if you set this parameter to 1, then every 10ms the dim level will change. If you set it to 255, then every 2.55 seconds the dim level will change.</Help>
</Value>
</CommandClass>
<CommandClass id="38">
<Compatibility>
<VerifyChanged index="0">true</VerifyChanged>
</Compatibility>
</CommandClass>
<!-- Association Groups -->
<CommandClass id="133">
<Associations num_groups="3">
<Group index="1" label="Lifeline" max_associations="5"/>
<Group index="2" label="Basic - Load" max_associations="5"/>
<Group index="3" label="Basic - Double Tap" max_associations="5"/>
</Associations>
</CommandClass>
</Product>
Binary file added config/images/ge/14280-plugin-dimmer.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion config/manufacturer_specific.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ManufacturerSpecificData Revision="126"
<ManufacturerSpecificData Revision="127"
xmlns="https://github.com/OpenZWave/open-zwave">
<Manufacturer id="0028" name="2B Electronics"></Manufacturer>
<Manufacturer id="0098" name="2GIG Technologies">
Expand Down Expand Up @@ -812,6 +812,7 @@
<Product config="ge/12724-dimmer.xml" id="3034" name="12730 Fan Control Switch" type="4944"/>
<Product config="ge/12724-dimmer.xml" id="3131" name="14287 Fan Control Switch" type="4944"/>
<Product config="ge/12724-dimmer.xml" id="3032" name="12725 In-Wall 1000W Dimmer" type="4944"/>
<Product config="ge/14280-plugin-dimmer.xml" id="3033" name="14280 Plug-In Two-Outlet Smart Dimmer with Simultaneous Control" type="5044"/>
<Product config="ge/14288-outlet.xml" id="3134" name="14288 In-Wall Tamper Resistant Smart Outlet" type="4952"/>
<Product config="ge/14294-dimmer.xml" id="3038" name="14294 In-Wall Smart Dimmer" type="4944"/>
<Product config="ge/14294-dimmer.xml" id="3039" name="14299 In-Wall 1000W Smart Dimmer" type="4944"/>
Expand Down
8 changes: 6 additions & 2 deletions cpp/build/testconfigversions.cfg
Expand Up @@ -1195,6 +1195,10 @@
'Revision' => 1,
'md5' => '2f1fc4587bf2caf5d982f45535996a36bdb93adb7de8f089e9ca8bc042d91e45677bc2f5997d125b3eb1e93f533c00637ef6d7106a9c456878aa8523ac52dc07'
},
'config/ge/14280-plugin-dimmer.xml' => {
'Revision' => 0,
'md5' => '62c479d852b5e22ba57306c3877ca58eb247528829d02022d8796c725a7b4964c5acc4f829ea807fff291182777ae271a29676145933fe78fe80f7873d597e2b'
},
'config/ge/14282-plugin-switch.xml' => {
'Revision' => 4,
'md5' => '72ec968ba6c64f65c48fc8ef9fa33f623717bda452d0685547735dea6240ef4efde6a1da95f683cd5fe1efdfaeea834a13412482a305c05423c21186c7edaa97'
Expand Down Expand Up @@ -1884,8 +1888,8 @@
'md5' => '4d34aeaaea917c229bedbb737e4de1550b2d7db5f9e61566a1c0a39966b6442d381d01f93714e12aae1404797d36854274cc4063dd7424b00d27da238b17a36a'
},
'config/manufacturer_specific.xml' => {
'Revision' => 126,
'md5' => 'ca6e710bfca12fdd49c2fef6eb93d4481aec02bc49c7ddea4860ffd735b8ad7f535752bf3c581726837893ed5e5d8c0f95553bc62628acb6df72008cb48f1f0d'
'Revision' => 127,
'md5' => '9d7c91aa48ff1928301fb94b500c3c95ad5899926134452f1864062cee85a016dcfd839c57a80398bbeaf4e3696aed4780ea74aafc965e664fa7ed366eedd3c1'
},
'config/mcohome/a8-9.xml' => {
'Revision' => 1,
Expand Down
4 changes: 4 additions & 0 deletions dist/openzwave.spec
Expand Up @@ -135,7 +135,11 @@ getent group zwave >/dev/null || groupadd -f -r zwave


%changelog
<<<<<<< HEAD
* Wed May 08 2019 Justin Hammond <justin@dynam.ac> - 1.6.1459
=======
* Wed May 08 2019 Justin Hammond <justin@dynam.ac> - 1.6.1240
>>>>>>> e851870f8aebda37c981cbaee5b61f308691a318
- Update to new release of OpenZwave - 1.6

* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-0.20180624git1e36dcc.0
Expand Down

0 comments on commit 4e3a8d9

Please sign in to comment.