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

implemented support for Plejd scenes, wph-01 and write queues

Browse source
This commit is contained in:
icanos 2020-02-29 15:54:08 +00:00
parent cafea72d63
commit d2beca6fb2
6 changed files with 183 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
plejd/mqtt.js
View file

@ -114,7 +114,9 @@ class MqttClient extends EventEmitter {
this.client.on('message', (topic, message) => {
//const command = message.toString();
const command = JSON.parse(message.toString());
const command = message.toString().substring(0, 1) === '{'
? JSON.parse(message.toString())
: message.toString();
if (topic === startTopic) {
logger('home assistant has started. lets do discovery.');
@ -126,7 +128,7 @@ class MqttClient extends EventEmitter {
if (_.includes(topic, 'set')) {
const device = self.devices.find(x => getCommandTopic(x) === topic);
self.emit('stateChanged', device.id, command);
self.emit('stateChanged', device, command);
}
});
}
@ -154,7 +156,7 @@ class MqttClient extends EventEmitter {
logger(`sending discovery for ${device.name}`);
let payload = device.type === 'switch' ? getSwitchPayload(device) : getDiscoveryPayload(device);
console.log(`plejd-mqtt: discovered ${device.type} named ${device.name} with PID ${device.id}.`);
console.log(`plejd-mqtt: discovered ${device.type} (${device.typeName}) named ${device.name} with PID ${device.id}.`);
self.deviceMap[device.id] = payload.unique_id;
@ -176,21 +178,28 @@ class MqttClient extends EventEmitter {
logger('updating state for ' + device.name + ': ' + data.state);
let payload = null;
if (device.dimmable) {
payload = {
state: data.state === 1 ? 'ON' : 'OFF',
brightness: data.brightness
}
if (device.type === 'switch') {
payload = data.state === 1 ? 'ON' : 'OFF';
}
else {
payload = {
state: data.state === 1 ? 'ON' : 'OFF'
if (device.dimmable) {
payload = {
state: data.state === 1 ? 'ON' : 'OFF',
brightness: data.brightness
}
}
else {
payload = {
state: data.state === 1 ? 'ON' : 'OFF'
}
}
payload = JSON.stringify(payload);
}
this.client.publish(
getStateTopic(device),
JSON.stringify(payload)
payload
);
}