Skip to content

Commit

Permalink
(simatec) Beta 1.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@simatec
simatec committed Jun 5, 2023
1 parent 93a6c78 commit 0615520
Show file tree
Hide file tree
Showing 5 changed files with 183 additions and 196 deletions.
5 changes: 5 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ When the adapter crashes or an other Code error happens, this error message that

## Changelog
<!-- ### __WORK IN PROGRESS__ -->
### __WORK IN PROGRESS__
* (simatec) new Manu-Mode Check added
* (simatec) suncalc added
* (simatec) Dependencies updated

### 1.4.29 (2023-04-26)
* (simatec) Bugfix Brightness down

Expand Down
3 changes: 3 additions & 0 deletions docs/de/shuttercontrol.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,9 @@ Dieser Parameter kann verhindern, dass der Rollo bei wechselnder Bewölkung imme
Wird ein Rollladen manuell verstellt und entspricht die Position nicht der
automatisch angefahrenen, setzt die Automatik aus!

> Ausnahme:
Wird der Rollladen manuell in die konfigurierte Höhe für öffnen, schließen oder Sonnenschutz gefahren, bleibt die Automatik bestehen.

**Rollladen Verzögerung bei Fenster öffnen (s)**
Parameter um das Öffnen des Rollladens zu verzögern, nachdem das Fenster/Türe geöffnet wurde (in Sekunden)

Expand Down
58 changes: 34 additions & 24 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,40 @@ function startAdapter(options) {
if (typeof _shutterState != undefined && _shutterState != null && shutterSettings[s].oldHeight != _shutterState.val) {
adapter.log.debug('Shutter state changed: ' + shutterSettings[s].shutterName + ' old value = ' + shutterSettings[s].oldHeight + ' new value = ' + _shutterState.val);
}
if (typeof _shutterState != undefined && _shutterState != null && _shutterState.val != shutterSettings[s].currentHeight && _shutterState.val != shutterSettings[s].oldHeight && adapter.config.currentShutterState === true) {

shutterSettings[s].currentAction = 'Manu_Mode';
shutterSettings[s].triggerAction = 'Manu_Mode';
if (typeof _shutterState != undefined && _shutterState != null && _shutterState.val != shutterSettings[s].currentHeight && _shutterState.val != shutterSettings[s].oldHeight) {

switch (_shutterState.val) {
case parseFloat(shutterSettings[s].heightUp):
shutterSettings[s].currentAction = 'up';
shutterSettings[s].triggerAction = 'up';
shutterSettings[s].currentHeight = _shutterState.val;
shutterSettings[s].triggerHeight = shutterSettings[s].currentHeight;

adapter.log.debug(shutterSettings[s].shutterName + ' Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val + '. automatic is active');
break;
case parseFloat(shutterSettings[s].heightDown):
shutterSettings[s].currentAction = 'down';
shutterSettings[s].triggerAction = 'down';
shutterSettings[s].currentHeight = _shutterState.val;
shutterSettings[s].triggerHeight = shutterSettings[s].currentHeight;

adapter.log.debug(shutterSettings[s].shutterName + ' Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val + '. automatic is active');
break;
case parseFloat(shutterSettings[s].heightDownSun):
shutterSettings[s].currentAction = 'sunProtect';
shutterSettings[s].triggerAction = 'sunProtect';
shutterSettings[s].currentHeight = _shutterState.val;
shutterSettings[s].triggerHeight = shutterSettings[s].currentHeight;

adapter.log.debug(shutterSettings[s].shutterName + ' Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val + '. automatic is active');
break;
default:
shutterSettings[s].currentAction = 'Manu_Mode';
shutterSettings[s].triggerAction = 'Manu_Mode';

adapter.log.debug(shutterSettings[s].shutterName + ' drived manually to ' + _shutterState.val + '. Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val);
adapter.log.debug(shutterSettings[s].shutterName + ' Updated trigger action to ' + shutterSettings[s].triggerAction + ' to prevent moving after window close ');
}

adapter.log.debug(`#1 shutterName: ${shutterSettings[s].shutterName}`);
adapter.log.debug(`#1 shutterState: ${_shutterState.val} %`);
Expand All @@ -261,27 +291,7 @@ function startAdapter(options) {
await adapter.setStateAsync('shutters.autoState.' + nameDevice, { val: shutterSettings[s].currentAction, ack: true })
.catch((e) => adapter.log.warn(e));

adapter.log.debug(shutterSettings[s].shutterName + ' drived manually to ' + _shutterState.val + '. Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val);
adapter.log.debug(shutterSettings[s].shutterName + ' Updated trigger action to ' + shutterSettings[s].triggerAction + ' to prevent moving after window close ');
shutterSettings = await shutterState(shutterSettings[s].name, adapter, shutterSettings, false);
} else if (typeof _shutterState != undefined && _shutterState != null && _shutterState.val != shutterSettings[s].currentHeight && _shutterState.val != shutterSettings[s].oldHeight && adapter.config.currentShutterState === false) {
shutterSettings[s].currentAction = 'Manu_Mode';
shutterSettings[s].triggerAction = 'Manu_Mode';

adapter.log.debug(`#2 shutterName: ${shutterSettings[s].shutterName}`);
adapter.log.debug(`#2 shutterState: ${_shutterState.val} %`);
adapter.log.debug(`#2 currentAction: ${shutterSettings[s].currentAction}`);
adapter.log.debug(`#2 triggerAction: ${shutterSettings[s].triggerAction}`);
adapter.log.debug(`#2 currentHeight: ${shutterSettings[s].currentHeight} %`);
adapter.log.debug(`#2 oldHeight: ${shutterSettings[s].oldHeight} %`);
adapter.log.debug(`#2 currentShutterState: ${adapter.config.currentShutterState === true ? 'activated' : 'disabled'}`);
adapter.log.debug(`#2 currentShutterStateTime: ${adapter.config.currentShutterStateTime} seconds`);

await adapter.setStateAsync('shutters.autoState.' + nameDevice, { val: shutterSettings[s].currentAction, ack: true })
.catch((e) => adapter.log.warn(e));

adapter.log.debug(shutterSettings[s].shutterName + ' Updated trigger action to ' + shutterSettings[s].triggerAction + ' to prevent moving after window close ');
adapter.log.debug(shutterSettings[s].shutterName + ' drived manually to ' + _shutterState.val + '. Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val);
shutterSettings = await shutterState(shutterSettings[s].name, adapter, shutterSettings, false);
} else if (typeof _shutterState != undefined && _shutterState != null && _shutterState.val === shutterSettings[s].currentHeight) {
adapter.log.debug(shutterSettings[s].shutterName + ' Old value = ' + shutterSettings[s].oldHeight + '. New value = ' + _shutterState.val + '. automatic is active');
Expand Down
Loading

0 comments on commit 0615520

Please sign in to comment.