rasperrypi-home/hassio-plejd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #199 from faanskit/develop

Browse source 
Fix scene device triggers
This commit is contained in:
Victor 2021-05-25 17:22:36 +02:00 • committed by GitHub
commit 8f15042a58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plejd/MqttClient.js
View file

@ -36,7 +36,7 @@ const getTopicName = (
) => `${getBaseTopic(uniqueId, mqttDeviceType)}/${topicType}`; ) => `${getBaseTopic(uniqueId, mqttDeviceType)}/${topicType}`;
const getButtonEventTopic = (/** @type {string} */ deviceId) => `${getTopicName(deviceId, MQTT_TYPES.DEVICE_AUTOMATION, TOPIC_TYPES.STATE)}`; const getButtonEventTopic = (/** @type {string} */ deviceId) => `${getTopicName(deviceId, MQTT_TYPES.DEVICE_AUTOMATION, TOPIC_TYPES.STATE)}`;
const getTriggerUniqueId = (/** @type { string } */ uniqueId) => `${uniqueId}_trigger`; const getTriggerUniqueId = (/** @type { string } */ uniqueId) => `${uniqueId}_trig`;
const getSceneEventTopic = (/** @type {string} */ sceneId) => `${getTopicName(getTriggerUniqueId(sceneId), MQTT_TYPES.DEVICE_AUTOMATION, TOPIC_TYPES.STATE)}`; const getSceneEventTopic = (/** @type {string} */ sceneId) => `${getTopicName(getTriggerUniqueId(sceneId), MQTT_TYPES.DEVICE_AUTOMATION, TOPIC_TYPES.STATE)}`;
const getSubscribePath = () => `${discoveryPrefix}/+/${nodeId}/#`; const getSubscribePath = () => `${discoveryPrefix}/+/${nodeId}/#`;
@ -110,13 +110,13 @@ const getSceneDeviceTriggerhDiscoveryPayload = (
/** @type {import('./types/DeviceRegistry').OutputDevice} */ sceneDevice, /** @type {import('./types/DeviceRegistry').OutputDevice} */ sceneDevice,
) => ({ ) => ({
automation_type: 'trigger', automation_type: 'trigger',
'~': getBaseTopic(sceneDevice.uniqueId, MQTT_TYPES.DEVICE_AUTOMATION), '~': getBaseTopic(`${sceneDevice.uniqueId}_trig`, MQTT_TYPES.DEVICE_AUTOMATION),
qos: 1, qos: 1,
topic: `~/${TOPIC_TYPES.STATE}`, topic: `~/${TOPIC_TYPES.STATE}`,
type: 'scene', type: 'scene',
subtype: 'trigger', subtype: 'trigger',
device: { device: {
identifiers: `${sceneDevice.uniqueId}`, identifiers: `${sceneDevice.uniqueId}_trigger`,
manufacturer: 'Plejd', manufacturer: 'Plejd',
model: sceneDevice.typeName, model: sceneDevice.typeName,
name: sceneDevice.name, name: sceneDevice.name,

9
plejd/PlejdAddon.js
View file

@ -76,6 +76,15 @@ class PlejdAddon extends EventEmitter {
// we're triggering a scene, lets do that and jump out. // we're triggering a scene, lets do that and jump out.
// since scenes aren't "real" devices. // since scenes aren't "real" devices.
this.sceneManager.executeScene(uniqueId); this.sceneManager.executeScene(uniqueId);
// since the scene doesn't get any updates on whether it's executed or not,
// we fake this by directly send the sceneTriggered back to HA in order for
// it continue to acto on the scene (for non-plejd devices).
try {
this.mqttClient.sceneTriggered(uniqueId);
} catch (err) {
logger.error('Error in PlejdService.sceneTriggered callback', err);
}
return; return;
} }