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

Replace mqttt scene switches with actual scenes

Browse source
This commit is contained in:
Victor Hagelbäck 2021-04-24 09:22:36 +02:00
parent aacf87a50c
commit b10583336e
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plejd/MqttClient.js
View file

@ -15,7 +15,7 @@ const nodeId = 'plejd';
const MQTT_TYPES = { const MQTT_TYPES = {
LIGHT: 'light', LIGHT: 'light',
SCENE: 'switch', // A bit problematic. Will assume scene if length === guid SCENE: 'scene', // A bit problematic. Will assume scene if length === guid
SWITCH: 'switch', SWITCH: 'switch',
}; };
@ -79,20 +79,13 @@ const getScenehDiscoveryPayload = (
/** @type {import('./types/DeviceRegistry').OutputDevice} */ sceneDevice, /** @type {import('./types/DeviceRegistry').OutputDevice} */ sceneDevice,
) => ({ ) => ({
name: sceneDevice.name, name: sceneDevice.name,
unique_id: sceneDevice.uniqueId,
'~': getBaseTopic(sceneDevice), '~': getBaseTopic(sceneDevice),
state_topic: `~/${TOPICS.STATE}`,
command_topic: `~/${TOPICS.COMMAND}`, command_topic: `~/${TOPICS.COMMAND}`,
availability_topic: `~/${TOPICS.AVAILABILITY}`, availability_topic: `~/${TOPICS.AVAILABILITY}`,
optimistic: false, payload_on: 'ON',
qos: 1, qos: 1,
retain: false, retain: false,
device: {
identifiers: `${sceneDevice.uniqueId}`,
manufacturer: 'Plejd',
model: sceneDevice.typeName,
name: sceneDevice.name,
sw_version: sceneDevice.version,
},
}); });
// #endregion // #endregion
@ -178,7 +171,7 @@ class MqttClient extends EventEmitter {
/** @type {import('types/DeviceRegistry').OutputDevice} */ /** @type {import('types/DeviceRegistry').OutputDevice} */
let device; let device;
if (decodedTopic.type === 'switch' && isGuid(decodedTopic.id)) { if (decodedTopic.type === MQTT_TYPES.SCENE && isGuid(decodedTopic.id)) {
// UUID device id => It's a scene // UUID device id => It's a scene
logger.verbose(`Getting scene ${decodedTopic.id} from registry`); logger.verbose(`Getting scene ${decodedTopic.id} from registry`);
device = this.deviceRegistry.getScene(decodedTopic.id); device = this.deviceRegistry.getScene(decodedTopic.id);