Skip to content

Commit

Permalink
Reverting back the changes found in #264. Reverting back to attempt to …
Browse files Browse the repository at this point in the history 
…resolve #444.
  • Loading branch information
05TEVE committed Feb 7, 2024
1 parent e0856ab commit f49e760
Show file tree
Hide file tree
Showing 4 changed files with 550 additions and 312 deletions.
6 changes: 6 additions & 0 deletions config.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,12 @@
"SimpleBlinds"
]
},
{
"title": "Simple Blinds2",
"enum": [
"Simple Blinds2"
]
},
{
"title": "Smart Plug w/ White and Color Lights",
"enum": [
Expand Down
2 changes: 2 additions & 0 deletions index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const GarageDoorAccessory = require('./lib/GarageDoorAccessory');
const SimpleDimmerAccessory = require('./lib/SimpleDimmerAccessory');
const SimpleDimmer2Accessory = require('./lib/SimpleDimmer2Accessory');
const SimpleBlindsAccessory = require('./lib/SimpleBlindsAccessory');
const SimpleBlinds2Accessory = require('./lib/SimpleBlinds2Accessory');
const SimpleHeaterAccessory = require('./lib/SimpleHeaterAccessory');
const SimpleFanAccessory = require('./lib/SimpleFanAccessory');
const SimpleFanLightAccessory = require('./lib/SimpleFanLightAccessory');
Expand All @@ -42,6 +43,7 @@ const CLASS_DEF = {
simpledimmer: SimpleDimmerAccessory,
simpledimmer2: SimpleDimmer2Accessory,
simpleblinds: SimpleBlindsAccessory,
simpleblinds2: SimpleBlinds2Accessory,
simpleheater: SimpleHeaterAccessory,
switch: SwitchAccessory,
fan: SimpleFanAccessory,
Expand Down
271 changes: 271 additions & 0 deletions lib/SimpleBlinds2Accessory.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,271 @@
const BaseAccessory = require('./BaseAccessory');

const BLINDS_OPENING = 'opening';
const BLINDS_CLOSING = 'closing';
const BLINDS_STOPPED = 'stopped';

const BLINDS_OPEN = 100;
const BLINDS_CLOSED = 0;

class SimpleBlindsAccessory extends BaseAccessory {
static getCategory(Categories) {
return Categories.WINDOW_COVERING;
}

constructor(...props) {
super(...props);
}

_registerPlatformAccessory() {
const {Service} = this.hap;

this.accessory.addService(Service.WindowCovering, this.device.context.name);

super._registerPlatformAccessory();
}

_registerCharacteristics(dps) {
const {Service, Characteristic} = this.hap;
const service = this.accessory.getService(Service.WindowCovering);
this._checkServiceName(service, this.device.context.name);

this.dpAction = this._getCustomDP(this.device.context.dpAction) || '1';

let _cmdOpen = 'on';
if (this.device.context.cmdOpen) {
_cmdOpen = ('' + this.device.context.cmdOpen).trim();
}

let _cmdClose = 'off';
if (this.device.context.cmdClose) {
_cmdClose = ('' + this.device.context.cmdClose).trim();
}

this.cmdStop = 'stop';
if (this.device.context.cmdStop) {
this.cmdStop = ('' + this.device.context.cmdStop).trim();
}

this.cmdOpen = _cmdOpen;
this.cmdClose = _cmdClose;
if (!!this.device.context.flipState) {
this.cmdOpen = _cmdClose;
this.cmdClose = _cmdOpen;
}

this.duration = parseInt(this.device.context.timeToOpen) || 45;
const endingDuration = parseInt(this.device.context.timeToTighten) || 0;
this.minPosition = endingDuration ? Math.round(endingDuration * -100 / (this.duration - endingDuration)) : BLINDS_CLOSED;

// If the blinds are closed, note it; if not, assume open because there is no way to know where it is
this.assumedPosition = dps[this.dpAction] === this.cmdClose ? this.minPosition : BLINDS_OPEN;
this.assumedState = BLINDS_STOPPED;
this.changeTime = this.targetPosition = false;

const characteristicCurrentPosition = service.getCharacteristic(Characteristic.CurrentPosition)
.updateValue(this._getCurrentPosition(dps[this.dpAction]))
.on('get', this.getCurrentPosition.bind(this));

const characteristicTargetPosition = service.getCharacteristic(Characteristic.TargetPosition)
.updateValue(this._getTargetPosition(dps[this.dpAction]))
.on('get', this.getTargetPosition.bind(this))
.on('set', this.setTargetPosition.bind(this));

const characteristicPositionState = service.getCharacteristic(Characteristic.PositionState)
.updateValue(this._getPositionState())
.on('get', this.getPositionState.bind(this));

this.device.on('change', changes => {
this.log.debug("[Tuya] Blinds saw change to " + changes[this.dpAction]);
if (changes.hasOwnProperty(this.dpAction)) {
switch (changes[this.dpAction]) {
case this.cmdOpen: // Starting to open
this.assumedState = BLINDS_OPENING;
characteristicPositionState.updateValue(Characteristic.PositionState.INCREASING);

// Only if change was external or someone internally asked for open
if (this.targetPosition === false || this.targetPosition === BLINDS_OPEN) {
this.targetPosition = false;

const durationToOpen = Math.abs(this.assumedPosition - BLINDS_OPEN) * this.duration * 10;
this.changeTime = Date.now() - durationToOpen;

this.log.debug("[Tuya] Blinds will be marked open in " + durationToOpen + "ms");

if (this.changeTimeout) clearTimeout(this.changeTimeout);
this.changeTimeout = setTimeout(() => {
characteristicCurrentPosition.updateValue(BLINDS_OPEN);
characteristicPositionState.updateValue(Characteristic.PositionState.STOPPED);
this.changeTime = false;
this.assumedPosition = BLINDS_OPEN;
this.assumedState = BLINDS_STOPPED;
this.log.debug("[Tuya] Blinds marked open");
}, durationToOpen);
}
break;

case this.cmdClose: // Starting to close
this.assumedState = BLINDS_CLOSING;
characteristicPositionState.updateValue(Characteristic.PositionState.DECREASING);

// Only if change was external or someone internally asked for close
if (this.targetPosition === false || this.targetPosition === BLINDS_CLOSED) {
this.targetPosition = false;

const durationToClose = Math.abs(this.assumedPosition - BLINDS_CLOSED) * this.duration * 10;
this.changeTime = Date.now() - durationToClose;

this.log.debug("[Tuya] Blinds will be marked closed in " + durationToClose + "ms");

if (this.changeTimeout) clearTimeout(this.changeTimeout);
this.changeTimeout = setTimeout(() => {
characteristicCurrentPosition.updateValue(BLINDS_CLOSED);
characteristicPositionState.updateValue(Characteristic.PositionState.STOPPED);
this.changeTime = false;
this.assumedPosition = this.minPosition;
this.assumedState = BLINDS_STOPPED;
this.log.debug("[Tuya] Blinds marked closed");
}, durationToClose);
}
break;

case this.cmdStop: // Stopped in middle
if (this.changeTimeout) clearTimeout(this.changeTimeout);

this.log.debug("[Tuya] Blinds last change was " + this.changeTime + "; " + (Date.now() - this.changeTime) + 'ms ago');

if (this.changeTime) {
/*
this.assumedPosition = Math.min(100 - this.minPosition, Math.max(0, Math.round((Date.now() - this.changeTime) / (10 * this.duration))));
if (this.assumedState === BLINDS_CLOSING) this.assumedPosition = 100 - this.assumedPosition;
else this.assumedPosition += this.minPosition;
*/
const disposition = ((Date.now() - this.changeTime) / (10 * this.duration));
if (this.assumedState === BLINDS_CLOSING) {
this.assumedPosition = BLINDS_OPEN - disposition;
} else {
this.assumedPosition = this.minPosition + disposition;
}
}

const adjustedPosition = Math.max(0, Math.round(this.assumedPosition));
characteristicCurrentPosition.updateValue(adjustedPosition);
characteristicTargetPosition.updateValue(adjustedPosition);
characteristicPositionState.updateValue(Characteristic.PositionState.STOPPED);
this.log.debug("[Tuya] Blinds marked stopped at " + adjustedPosition + "; assumed to be at " + this.assumedPosition);

this.changeTime = this.targetPosition = false;
this.assumedState = BLINDS_STOPPED;
break;
}
}
});
}

getCurrentPosition(callback) {
this.getState(this.dpAction, (err, dp) => {
if (err) return callback(err);

callback(null, this._getCurrentPosition(dp));
});
}

_getCurrentPosition(dp) {
switch (dp) {
case this.cmdOpen:
return BLINDS_OPEN;

case this.cmdClose:
return BLINDS_CLOSED;

default:
return Math.max(BLINDS_CLOSED, Math.round(this.assumedPosition));
}
}

getTargetPosition(callback) {
this.getState(this.dpAction, (err, dp) => {
if (err) return callback(err);

callback(null, this._getTargetPosition(dp));
});
}

_getTargetPosition(dp) {
switch (dp) {
case this.cmdOpen:
return BLINDS_OPEN;

case this.cmdClose:
return BLINDS_CLOSED;

default:
return Math.max(BLINDS_CLOSED, Math.round(this.assumedPosition));
}
}

setTargetPosition(value, callback) {
this.log.debug('[Tuya] Blinds asked to move from ' + this.assumedPosition + ' to ' + value);

if (this.changeTimeout) clearTimeout(this.changeTimeout);
this.targetPosition = value;

if (this.changeTime !== false) {
this.log.debug("[Tuya] Blinds " + (this.assumedState === BLINDS_CLOSING ? 'closing' : 'opening') + " had started " + this.changeTime + "; " + (Date.now() - this.changeTime) + 'ms ago');
const disposition = ((Date.now() - this.changeTime) / (10 * this.duration));
if (this.assumedState === BLINDS_CLOSING) {
this.assumedPosition = BLINDS_OPEN - disposition;
} else {
this.assumedPosition = this.minPosition + disposition;
}
this.log.debug("[Tuya] Blinds' adjusted assumedPosition is " + this.assumedPosition);
}

const duration = Math.abs(this.assumedPosition - value) * this.duration * 10;

if (Math.abs(value - this.assumedPosition) < 1) {
return this.setState(this.dpAction, this.cmdStop, callback);
} else if (value > this.assumedPosition) {
this.assumedState = BLINDS_OPENING;
this.setState(this.dpAction, this.cmdOpen, callback);
this.changeTime = Date.now() - Math.abs(this.assumedPosition - this.minPosition) * this.duration * 10;
} else {
this.assumedState = BLINDS_CLOSING;
this.setState(this.dpAction, this.cmdClose, callback);
this.changeTime = Date.now() - Math.abs(this.assumedPosition - BLINDS_OPEN) * this.duration * 10;
}

if (value !== BLINDS_OPEN && value !== BLINDS_CLOSED) {
this.log.debug("[Tuya] Blinds will stop in " + duration + "ms");
this.log.debug("[Tuya] Blinds assumed started " + this.changeTime + "; " + (Date.now() - this.changeTime) + 'ms ago');
this.changeTimeout = setTimeout(() => {
this.log.debug("[Tuya] Blinds asked to stop");
this.setState(this.dpAction, this.cmdStop);
}, duration);
}
}

getPositionState(callback) {
const state = this._getPositionState();
process.nextTick(() => {
callback(null, state);
});
}

_getPositionState() {
const {Characteristic} = this.hap;

switch (this.assumedState) {
case BLINDS_OPENING:
return Characteristic.PositionState.INCREASING;

case BLINDS_CLOSING:
return Characteristic.PositionState.DECREASING;

default:
return Characteristic.PositionState.STOPPED;
}
}
}

module.exports = SimpleBlindsAccessory;
Loading

0 comments on commit f49e760

Please sign in to comment.