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

Merge pull request #142 from SweVictor/feature/fix-initial-dim-level

Browse source 
Fix wrong initial brightness when transitioning turned-off lights
This commit is contained in:
Marcus Westin 2021-01-18 15:29:42 +01:00 • committed by GitHub
commit a3b3efefeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
plejd/ble.bluez.js
View file

@ -258,11 +258,11 @@ class PlejdService extends EventEmitter {
} }
} }
_transitionTo(id, targetBrightness, transition) { _transitionTo(deviceId, targetBrightness, transition) {
const initialBrightness = this.plejdDevices[id] ? this.plejdDevices[id].dim : null; const initialBrightness = this.plejdDevices[deviceId] ? this.plejdDevices[deviceId].state && this.plejdDevices[deviceId].dim : null;
this._clearDeviceTransitionTimer(id); this._clearDeviceTransitionTimer(deviceId);
const isDimmable = this.devices.find(d => d.id === id).dimmable; const isDimmable = this.devices.find(d => d.id === deviceId).dimmable;
if (transition > 1 && isDimmable && (initialBrightness || initialBrightness === 0) && (targetBrightness || targetBrightness === 0) && targetBrightness !== initialBrightness) { if (transition > 1 && isDimmable && (initialBrightness || initialBrightness === 0) && (targetBrightness || targetBrightness === 0) && targetBrightness !== initialBrightness) {
// Transition time set, known initial and target brightness // Transition time set, known initial and target brightness
@ -282,7 +282,7 @@ class PlejdService extends EventEmitter {
let nSteps = 0; let nSteps = 0;
let nSkippedSteps = 0; let nSkippedSteps = 0;
this.bleDeviceTransitionTimers[id] = setInterval(() => { this.bleDeviceTransitionTimers[deviceId] = setInterval(() => {
let tElapsedMs = (new Date().getTime() - dtStart.getTime()); let tElapsedMs = (new Date().getTime() - dtStart.getTime());
let tElapsed = tElapsedMs / 1000; let tElapsed = tElapsedMs / 1000;
@ -294,14 +294,14 @@ class PlejdService extends EventEmitter {
if (tElapsed === transition) { if (tElapsed === transition) {
nSteps++; nSteps++;
this._clearDeviceTransitionTimer(id); this._clearDeviceTransitionTimer(deviceId);
newBrightness = targetBrightness; newBrightness = targetBrightness;
logger('Completing transition from', initialBrightness, 'to', targetBrightness, 'in ', tElapsedMs, 'ms. Done steps', nSteps, ', skipped ' + nSkippedSteps + '. Average interval', tElapsedMs/(nSteps||1), 'ms.'); logger('Completing transition from', initialBrightness, 'to', targetBrightness, 'in ', tElapsedMs, 'ms. Done steps', nSteps, ', skipped ' + nSkippedSteps + '. Average interval', tElapsedMs/(nSteps||1), 'ms.');
this._setBrightness(id, newBrightness); this._setBrightness(deviceId, newBrightness);
} }
else if (this.writeQueue.length <= this.maxQueueLengthTarget) { else if (this.writeQueue.length <= this.maxQueueLengthTarget) {
nSteps++; nSteps++;
this._setBrightness(id, newBrightness); this._setBrightness(deviceId, newBrightness);
} }
else { else {
nSkippedSteps++; nSkippedSteps++;
@ -314,7 +314,7 @@ class PlejdService extends EventEmitter {
if (transition && isDimmable) { if (transition && isDimmable) {
logger('Could not transition light change. Either initial value is unknown or change is too small. Requested from', initialBrightness, 'to', targetBrightness) logger('Could not transition light change. Either initial value is unknown or change is too small. Requested from', initialBrightness, 'to', targetBrightness)
} }
this._setBrightness(id, targetBrightness); this._setBrightness(deviceId, targetBrightness);
} }
} }
@ -336,10 +336,10 @@ class PlejdService extends EventEmitter {
logger('Setting ', id, 'brightness to ' + brightness); logger('Setting ', id, 'brightness to ' + brightness);
brightness = brightness << 8 | brightness; brightness = brightness << 8 | brightness;
var payload = Buffer.from((id).toString(16).padStart(2, '0') + '0110009801' + (brightness).toString(16).padStart(4, '0'), 'hex'); var payload = Buffer.from((id).toString(16).padStart(2, '0') + '0110009801' + (brightness).toString(16).padStart(4, '0'), 'hex');
}
this.writeQueue.unshift(payload); this.writeQueue.unshift(payload);
} }
} }
}
_turnOff(id) { _turnOff(id) {
logger('Turning off ', id); logger('Turning off ', id);
@ -354,7 +354,6 @@ class PlejdService extends EventEmitter {
async authenticate() { async authenticate() {
console.log('authenticate()'); console.log('authenticate()');
const self = this;
try { try {
//logger('sending challenge to device'); //logger('sending challenge to device');