Skip to content

Commit

Permalink
[insteon] Improved support for 2334 Keypad Dimmer and 2487S Keypad Sw…
Browse files Browse the repository at this point in the history 
…itch (openhab#7339)

* Added Beep and LED On/Off to dimmers switches (and keypad dimmers and switches).  Also added Dawn/Dusk and LowBattery to motion detectors.
* Added Beep and LED On/Off as channels
* Added Beep and LED On/Off channels to README.md
* Added Motion Sensor Dawn/Dusk and Low Batt as channels and to README.md
* Changed a few variable names to better match standard and removed commented out code.
* Chnged variable for light sensor above threshold to betther match standard and fixed formatting to better match standard
* Changed WirelessMotionSensorLightlevelabovethreshold to WirelessMotionSensorLightLevelAboveThreshold per request
* Changed WirelessMotionSensorLowbattery to WirelessMotionSensorLowBattery per request
* Added some formatting changes to ensure docs match code and to al code to match Eclipse formatting
* Added LED On/Off and Beep to Dimmer Modules (2457D2), On/Off Modules (2635-222), and On/Off Outdoor Modules (2634-222)
* Added Fast On/Off and Manual change support for Insteon 2334 - 6 and 8 button varients and added all support Insteon 2487S - 8 button varient

Signed-off-by: Tom Weichmann <tommycw10@gmail.com>
Signed-off-by: CSchlipp <christian@schlipp.de>
  • Loading branch information
@tommycw1 @CSchlipp
tommycw1 authored and CSchlipp committed Jul 26, 2020
1 parent b93a0b1 commit 505e863
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 1 deletion.
1 change: 1 addition & 0 deletions bundles/org.openhab.binding.insteon/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ These have been tested and should work out of the box:
| 2342-222 | Mini Remote (8 Button) | F00.00.20 | Bernd Pfrommer |
| 2441V | Insteon Thermostat Adaptor for Venstar | F00.00.21 | Bernd Pfrommer |
| 2982-222 | Insteon Smoke Bridge | F00.00.22 | Bernd Pfrommer |
| 2487S | KeypadLinc On/Off 8-Button | F00.00.23 | Tom Weichmann |
| 2450 | IO Link | 0x00001A | Bernd Pfrommer |
| 2486D | KeypadLinc Dimmer | 0x000037 | Patrick Giasson, Joe Barnum |
| 2484DWH8 | KeypadLinc Countdown Timer | 0x000041 | Rob Nielsen |
Expand Down
8 changes: 8 additions & 0 deletions ...g.insteon/src/main/java/org/openhab/binding/insteon/internal/InsteonBindingConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ public class InsteonBindingConstants {
public static final String FAST_ON_OFF_BUTTON_B = "fastOnOffButtonB";
public static final String FAST_ON_OFF_BUTTON_C = "fastOnOffButtonC";
public static final String FAST_ON_OFF_BUTTON_D = "fastOnOffButtonD";
public static final String FAST_ON_OFF_BUTTON_E = "fastOnOffButtonE";
public static final String FAST_ON_OFF_BUTTON_F = "fastOnOffButtonF";
public static final String FAST_ON_OFF_BUTTON_G = "fastOnOffButtonG";
public static final String FAST_ON_OFF_BUTTON_H = "fastOnOffButtonH";
public static final String HEAT_SET_POINT = "heatSetPoint";
public static final String HUMIDITY = "humidity";
public static final String HUMIDITY_HIGH = "humidityHigh";
Expand Down Expand Up @@ -86,6 +90,10 @@ public class InsteonBindingConstants {
public static final String MANUAL_CHANGE_BUTTON_B = "manualChangeButtonB";
public static final String MANUAL_CHANGE_BUTTON_C = "manualChangeButtonC";
public static final String MANUAL_CHANGE_BUTTON_D = "manualChangeButtonD";
public static final String MANUAL_CHANGE_BUTTON_E = "manualChangeButtonE";
public static final String MANUAL_CHANGE_BUTTON_F = "manualChangeButtonF";
public static final String MANUAL_CHANGE_BUTTON_G = "manualChangeButtonG";
public static final String MANUAL_CHANGE_BUTTON_H = "manualChangeButtonH";
public static final String NOTIFICATION = "notification";
public static final String ON_LEVEL = "onLevel";
public static final String RAMP_DIMMER = "rampDimmer";
Expand Down
6 changes: 5 additions & 1 deletion ...teon/src/main/java/org/openhab/binding/insteon/internal/handler/InsteonDeviceHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ public class InsteonDeviceHandler extends BaseThingHandler {
InsteonBindingConstants.FAN_MODE, InsteonBindingConstants.FAST_ON_OFF,
InsteonBindingConstants.FAST_ON_OFF_BUTTON_A, InsteonBindingConstants.FAST_ON_OFF_BUTTON_B,
InsteonBindingConstants.FAST_ON_OFF_BUTTON_C, InsteonBindingConstants.FAST_ON_OFF_BUTTON_D,
InsteonBindingConstants.FAST_ON_OFF_BUTTON_E, InsteonBindingConstants.FAST_ON_OFF_BUTTON_F,
InsteonBindingConstants.FAST_ON_OFF_BUTTON_G, InsteonBindingConstants.FAST_ON_OFF_BUTTON_H,
InsteonBindingConstants.HEAT_SET_POINT, InsteonBindingConstants.HUMIDITY,
InsteonBindingConstants.HUMIDITY_HIGH, InsteonBindingConstants.HUMIDITY_LOW,
InsteonBindingConstants.IS_COOLING, InsteonBindingConstants.IS_HEATING,
Expand All @@ -79,7 +81,9 @@ public class InsteonDeviceHandler extends BaseThingHandler {
InsteonBindingConstants.LOAD_SWITCH_MANUAL_CHANGE, InsteonBindingConstants.LOWBATTERY,
InsteonBindingConstants.MANUAL_CHANGE, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_A,
InsteonBindingConstants.MANUAL_CHANGE_BUTTON_B, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_C,
InsteonBindingConstants.MANUAL_CHANGE_BUTTON_D, InsteonBindingConstants.NOTIFICATION,
InsteonBindingConstants.MANUAL_CHANGE_BUTTON_D, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_E,
InsteonBindingConstants.MANUAL_CHANGE_BUTTON_F, InsteonBindingConstants.MANUAL_CHANGE_BUTTON_G,
InsteonBindingConstants.MANUAL_CHANGE_BUTTON_H, InsteonBindingConstants.NOTIFICATION,
InsteonBindingConstants.ON_LEVEL, InsteonBindingConstants.RAMP_DIMMER, InsteonBindingConstants.RAMP_RATE,
InsteonBindingConstants.RESET, InsteonBindingConstants.STAGE1_DURATION, InsteonBindingConstants.SWITCH,
InsteonBindingConstants.SYSTEM_MODE, InsteonBindingConstants.TEMPERATURE,
Expand Down
40 changes: 40 additions & 0 deletions bundles/org.openhab.binding.insteon/src/main/resources/ESH-INF/thing/thing-types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,26 @@
<label>Fast On/Off Button D</label>
</channel-type>

<channel-type id="fastOnOffButtonE">
<item-type>Switch</item-type>
<label>Fast On/Off Button E</label>
</channel-type>

<channel-type id="fastOnOffButtonF">
<item-type>Switch</item-type>
<label>Fast On/Off Button F</label>
</channel-type>

<channel-type id="fastOnOffButtonG">
<item-type>Switch</item-type>
<label>Fast On/Off Button G</label>
</channel-type>

<channel-type id="fastOnOffButtonH">
<item-type>Switch</item-type>
<label>Fast On/Off Button H</label>
</channel-type>

<channel-type id="heatSetPoint">
<item-type>Number</item-type>
<label>Heat Set Point</label>
Expand Down Expand Up @@ -337,6 +357,26 @@
<label>Manual Change Button D</label>
</channel-type>

<channel-type id="manualChangeButtonE">
<item-type>Number</item-type>
<label>Manual Change Button E</label>
</channel-type>

<channel-type id="manualChangeButtonF">
<item-type>Number</item-type>
<label>Manual Change Button F</label>
</channel-type>

<channel-type id="manualChangeButtonG">
<item-type>Number</item-type>
<label>Manual Change Button G</label>
</channel-type>

<channel-type id="manualChangeButtonH">
<item-type>Number</item-type>
<label>Manual Change Button H</label>
</channel-type>

<channel-type id="notification">
<item-type>Number</item-type>
<label>Notification</label>
Expand Down
66 changes: 66 additions & 0 deletions bundles/org.openhab.binding.insteon/src/main/resources/device_types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,18 @@ Example entry:
<feature name="keypadbuttonc">KeyPadButton5</feature>
<feature name="keypadbuttond">KeyPadButton6</feature>
</feature_group>
<feature_group name="fastonoff_button_group" type="FastOnOffButtonGroup">
<feature name="fastonoffbuttona">FastOnOffButton3</feature>
<feature name="fastonoffbuttonb">FastOnOffButton4</feature>
<feature name="fastonoffbuttonc">FastOnOffButton5</feature>
<feature name="fastonoffbuttond">FastOnOffButton6</feature>
</feature_group>
<feature_group name="manualchange_button_group" type="ManualChangeButtonGroup">
<feature name="manualchangebuttona">ManualChangeButton3</feature>
<feature name="manualchangebuttonb">ManualChangeButton4</feature>
<feature name="manualchangebuttonc">ManualChangeButton5</feature>
<feature name="manualchangebuttond">ManualChangeButton6</feature>
</feature_group>
<feature_group name="ext_group" type="ExtStatusGroup">
<feature name="ledbrightness">LEDBrightness</feature>
<feature name="ramprate">RampRate</feature>
Expand All @@ -369,6 +381,24 @@ Example entry:
<feature name="keypadbuttonf">KeyPadButton6</feature>
<feature name="keypadbuttong">KeyPadButton7</feature>
<feature name="keypadbuttonh">KeyPadButton8</feature>
</feature_group>
<feature_group name="fastonoff_button_group" type="FastOnOffButtonGroup">
<feature name="fastonoffbuttonb">FastOnOffButton2</feature>
<feature name="fastonoffbuttonc">FastOnOffButton3</feature>
<feature name="fastonoffbuttond">FastOnOffButton4</feature>
<feature name="fastonoffbuttone">FastOnOffButton5</feature>
<feature name="fastonoffbuttonf">FastOnOffButton6</feature>
<feature name="fastonoffbuttong">FastOnOffButton7</feature>
<feature name="fastonoffbuttonh">FastOnOffButton8</feature>
</feature_group>
<feature_group name="manualchange_button_group" type="ManualChangeButtonGroup">
<feature name="manualchangebuttonb">ManualChangeButton2</feature>
<feature name="manualchangebuttonc">ManualChangeButton3</feature>
<feature name="manualchangebuttond">ManualChangeButton4</feature>
<feature name="manualchangebuttone">ManualChangeButton5</feature>
<feature name="manualchangebuttonf">ManualChangeButton6</feature>
<feature name="manualchangebuttong">ManualChangeButton7</feature>
<feature name="manualchangebuttonh">ManualChangeButton8</feature>
</feature_group>
<feature_group name="ext_group" type="ExtStatusGroup">
<feature name="ledbrightness">LEDBrightness</feature>
Expand Down Expand Up @@ -509,4 +539,40 @@ Example entry:
<feature name="lastheardfrom">GenericLastTime</feature>
</device>

<device productKey="F00.00.23">
<model>2487S</model>
<description>KeypadLinc On/Off 8-Button Scene Control </description>
<feature name="loadswitch">LoadSwitchButton</feature>
<feature name="loadswitchmanualchange">LoadSwitchManualChange</feature>
<feature name="loadswitchfastonoff">LoadSwitchFastOnOff</feature>
<feature_group name="button_group" type="KeyPadButtonGroup">
<feature name="keypadbuttonb">KeyPadButton2</feature>
<feature name="keypadbuttonc">KeyPadButton3</feature>
<feature name="keypadbuttond">KeyPadButton4</feature>
<feature name="keypadbuttone">KeyPadButton5</feature>
<feature name="keypadbuttonf">KeyPadButton6</feature>
<feature name="keypadbuttong">KeyPadButton7</feature>
<feature name="keypadbuttonh">KeyPadButton8</feature>
</feature_group>
<feature_group name="fastonoff_button_group" type="FastOnOffButtonGroup">
<feature name="fastonoffbuttonb">FastOnOffButton2</feature>
<feature name="fastonoffbuttonc">FastOnOffButton3</feature>
<feature name="fastonoffbuttond">FastOnOffButton4</feature>
<feature name="fastonoffbuttone">FastOnOffButton5</feature>
<feature name="fastonoffbuttonf">FastOnOffButton6</feature>
<feature name="fastonoffbuttong">FastOnOffButton7</feature>
<feature name="fastonoffbuttonh">FastOnOffButton8</feature>
</feature_group>
<feature_group name="manualchange_button_group" type="ManualChangeButtonGroup">
<feature name="manualchangebuttonb">ManualChangeButton2</feature>
<feature name="manualchangebuttonc">ManualChangeButton3</feature>
<feature name="manualchangebuttond">ManualChangeButton4</feature>
<feature name="manualchangebuttone">ManualChangeButton5</feature>
<feature name="manualchangebuttonf">ManualChangeButton6</feature>
<feature name="manualchangebuttong">ManualChangeButton7</feature>
<feature name="manualchangebuttonh">ManualChangeButton8</feature>
</feature_group>
<feature name="lastheardfrom">GenericLastTime</feature>
</device>

</xml>

0 comments on commit 505e863

Please sign in to comment.