ETM-Schurig/etm-powersync-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Hue Wall Switch module button codes + correct Switch V2 codes

Browse Source 
Hue wall switch button codes added + harmonized use of button codes of Dimmer Switch V2 with other remote types
This commit is contained in:
loosrob 2021-08-14 17:59:02 +02:00
parent 10265ee69d
commit 9e79b264dd
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
philipshue/integrationpluginphilipshue.cpp
View File

@ -557,7 +557,7 @@ void IntegrationPluginPhilipsHue::setupThing(ThingSetupInfo *info)
connect(wallSwitch, &HueRemote::stateChanged, this, &IntegrationPluginPhilipsHue::remoteStateChanged); connect(wallSwitch, &HueRemote::stateChanged, this, &IntegrationPluginPhilipsHue::remoteStateChanged);
connect(wallSwitch, &HueRemote::buttonPressed, this, &IntegrationPluginPhilipsHue::onRemoteButtonEvent); connect(wallSwitch, &HueRemote::buttonPressed, this, &IntegrationPluginPhilipsHue::onRemoteButtonEvent);
m_remotes.insert(smarwallSwitchtButton, thing); m_remotes.insert(wallSwitch, thing);
return info->finish(Thing::ThingErrorNoError); return info->finish(Thing::ThingErrorNoError);
} }
@ -1259,7 +1259,7 @@ void IntegrationPluginPhilipsHue::onRemoteButtonEvent(int buttonCode)
param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "POWER"); param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "POWER");
id = dimmerSwitch2PressedEventTypeId; id = dimmerSwitch2PressedEventTypeId;
break; break;
case 1000: case 1001:
param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "POWER"); param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "POWER");
id = dimmerSwitch2LongPressedEventTypeId; id = dimmerSwitch2LongPressedEventTypeId;
break; break;
@ -1267,7 +1267,7 @@ void IntegrationPluginPhilipsHue::onRemoteButtonEvent(int buttonCode)
param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "DIM UP"); param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "DIM UP");
id = dimmerSwitch2PressedEventTypeId; id = dimmerSwitch2PressedEventTypeId;
break; break;
case 2000: case 2001:
param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "DIM UP"); param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "DIM UP");
id = dimmerSwitch2LongPressedEventTypeId; id = dimmerSwitch2LongPressedEventTypeId;
break; break;
@ -1275,7 +1275,7 @@ void IntegrationPluginPhilipsHue::onRemoteButtonEvent(int buttonCode)
param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "DIM DOWN"); param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "DIM DOWN");
id = dimmerSwitch2PressedEventTypeId; id = dimmerSwitch2PressedEventTypeId;
break; break;
case 3000: case 3001:
param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "DIM DOWN"); param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "DIM DOWN");
id = dimmerSwitch2LongPressedEventTypeId; id = dimmerSwitch2LongPressedEventTypeId;
break; break;
@ -1283,7 +1283,7 @@ void IntegrationPluginPhilipsHue::onRemoteButtonEvent(int buttonCode)
param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "HUE"); param = Param(dimmerSwitch2PressedEventButtonNameParamTypeId, "HUE");
id = dimmerSwitch2PressedEventTypeId; id = dimmerSwitch2PressedEventTypeId;
break; break;
case 4000: case 4001:
param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "HUE"); param = Param(dimmerSwitch2LongPressedEventButtonNameParamTypeId, "HUE");
id = dimmerSwitch2LongPressedEventTypeId; id = dimmerSwitch2LongPressedEventTypeId;
break; break;
@ -1292,10 +1292,10 @@ void IntegrationPluginPhilipsHue::onRemoteButtonEvent(int buttonCode)
return; return;
} }
// codes ending in 2 (e.g. 1002) are short presses; // codes ending in 2 (e.g. 1002) are short presses;
// for long presses the Dimmer Switch V2 sends 3 codes: // for long presses the Dimmer Switch V2 sends 3 codes (same behaviour as hue remote and smart button):
// * codes ending in 0 (e.g. 1000) indicate start of long press // * codes ending in 0 (e.g. 1000) indicate start of long press
// * codes ending in 3 (e.g. 1003) indicate end of long press --> not yet supported by this plugin, but e.g. LongPressEnded action could be added // * codes ending in 3 (e.g. 1003) indicate end of long press
// * codes ending in 1 (e.g. 1001) are sent during the long press --> probably for backwards compatibility with earlier version, and therefore not added to this plugin // * codes ending in 1 (e.g. 1001) are sent during the long press
} else if (thing->thingClassId() == tapThingClassId) { } else if (thing->thingClassId() == tapThingClassId) {
switch (buttonCode) { switch (buttonCode) {
case 34: case 34:
@ -1354,7 +1354,12 @@ void IntegrationPluginPhilipsHue::onRemoteButtonEvent(int buttonCode)
} }
} else if (thing->thingClassId() == wallSwitchThingClassId) { } else if (thing->thingClassId() == wallSwitchThingClassId) {
switch (buttonCode) { switch (buttonCode) {
case 999999: // temporary number, replace with code (codes for on and off?) case 1002: // temporary number, replace with code (codes for on and off?)
param = Param(wallSwitchPressedEventButtonNameParamTypeId, "ONE");
id = wallSwitchPressedEventTypeId;
break;
case 2002: // temporary number, replace with code (codes for on and off?)
param = Param(wallSwitchPressedEventButtonNameParamTypeId, "TWO");
id = wallSwitchPressedEventTypeId; id = wallSwitchPressedEventTypeId;
break; break;
default: default:

13
philipshue/integrationpluginphilipshue.json
View File

@ -755,7 +755,7 @@
"id": "e967027f-f8fc-410c-8b48-6ac4c42e2777", "id": "e967027f-f8fc-410c-8b48-6ac4c42e2777",
"name": "wallSwitch", "name": "wallSwitch",
"displayName": "Hue Wall Switch Module", "displayName": "Hue Wall Switch Module",
"interfaces": ["button", "wirelessconnectable"], "interfaces": ["multibutton", "wirelessconnectable"],
"createMethods": ["auto"], "createMethods": ["auto"],
"paramTypes": [ "paramTypes": [
{ {
@ -821,7 +821,16 @@
{ {
"id": "4623b5ff-b999-4200-ba38-89435d78fcae", "id": "4623b5ff-b999-4200-ba38-89435d78fcae",
"name": "pressed", "name": "pressed",
"displayName": "Button pressed" "displayName": "Button pressed",
"paramTypes": [
{
"id": "adb4ec5e-e48f-4697-a876-e56e8458987a",
"name": "buttonName",
"displayName": "Button name",
"type": "QString",
"allowedValues": ["ONE", "TWO"]
}
]
} }
] ]
}, },