From efd77960593a1b47ce07b0375042de4f43685862 Mon Sep 17 00:00:00 2001 From: Slavik Metlser Date: Wed, 1 Jul 2020 08:07:51 +0300 Subject: [PATCH 1/3] Add an ability to define different times according to the moving direction of the blinds. --- .gitignore | 1 + README.md | 15 ++++++++++++++- config.schema.json | 12 ++++++++++++ index.js | 7 +++++-- package.json | 2 +- 5 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 86f13c4..7e59aad 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules/ .DS_Store .env package-lock.json +.idea diff --git a/README.md b/README.md index 89d7323..a54336a 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ Add the accessory in `config.json` in your home directory inside `.homebridge`. "webhook_https": false, "webhook_https_keyfile": "/path/to/https.key", "webhook_https_certfile": "/path/to/https.crt", - "motion_time": 10000, + "motion_up_time": 11000, + "motion_down_time": 10000, "response_lag": 0, "trigger_stop_at_boundaries": false, "verbose": false @@ -177,6 +178,18 @@ Ensure that the motion time is configured properly, even when `position_url` is `motion_time` is the time, in milliseconds, for your blinds to move from up to down. This should only include the time the motor is running. Filming this with your phone to determine the time may be easier than trying to do it with a timer. **NOTE**: If you are performing multiple blind requests simultaneously and are getting network timeouts due to your configuration, try using non-identical `motion_time` (e.g., 9800, 10000, 10200 vs. 10000 for each) it may help. +There are additional two configurations parameters, `motion_down_time` and `motion_up_time`. + +`motion_down_time` is the time, in milliseconds, for your blinds to move from up to down. Everything else is exactly as described in `motion_time` above. + +`motion_up_time` is the time, in milliseconds, for your blinds to move from down to up. Everything else is exactly as described in `motion_time` above. + +The reason for this, is that there are some blinds that their opening time is different from closing time, due to simple physics - The weight of the shutter affects on the speed of the motor. +Ideally, a better approach would be using some kind of gradual equation for calculating the exact time, according to the position, because the weight gradually added or subtracted during the move. But, hopefully this will be a nice to have feature in the future. + +**Note!** +`motion_down_time` and `motion_up_time` are always have higher priority over `motion_time`. This means, that if all three explicitly provided in the configuration file, the value set in `motion_down_time` and `motion_up_time` will be used instead and the value in `motion_time` will be ignored. You can also provide only `motion_down_time` and `motion_up_time` value without providing `motion_time`. If only `motion_time` is provided, its value will be used for `motion_down_time` and `motion_up_time`. + **Steps:** 1. HTTP UP/DOWN request sent; wait for successful reply (i.e., `success_codes`) = `HTTP request delay (measured)` 2. Wait for device to send the signal to blinds, and movement begins = `response_lag` diff --git a/config.schema.json b/config.schema.json index c7adda5..2661ec5 100644 --- a/config.schema.json +++ b/config.schema.json @@ -70,6 +70,18 @@ "title": "Motion Time", "type": "number", "default": 10000, + "description": "Time (in ms) for blinds to move completely up or down." + }, + "motion_up_time": { + "title": "Motion Upward Time", + "type": "number", + "default": 10000, + "description": "Time (in ms) for blinds to move completely from down to up." + }, + "motion_down_time": { + "title": "Motion Downward Time", + "type": "number", + "default": 10000, "description": "Time (in ms) for blinds to move completely from up to down." }, "response_lag": { diff --git a/index.js b/index.js index da964f9..c3472b3 100644 --- a/index.js +++ b/index.js @@ -62,7 +62,9 @@ function BlindsHTTPAccessory(log, config) { this.showToggleButton = config.show_toggle_button === true; // motion time vars - this.motionTime = parseInt(config.motion_time, 10) || 10000; + const motionTimeConfig = parseInt(config.motion_time, 10) || 10000; + this.motionUpTime = parseInt(config.motion_up_time, 10) || motionTimeConfig; + this.motionDownTime = parseInt(config.motion_down_time, 10) || motionTimeConfig; this.responseLag = parseInt(config.response_lag, 10) || 0; // advanced vars @@ -414,7 +416,8 @@ BlindsHTTPAccessory.prototype.setTargetPosition = function (pos, callback) { this.lastCommandMoveUp = moveUp; this.storage.setItemSync(this.name, this.currentTargetPosition); - const motionTimeStep = this.motionTime / 100; + const motionTime = moveUp ? this.motionUpTime : this.motionDownTime; + const motionTimeStep = motionTime / 100; const waitDelay = Math.abs(this.currentTargetPosition - this.lastPosition) * motionTimeStep; this.log.info( diff --git a/package.json b/package.json index cf052b1..d8af379 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "homebridge-blinds", - "version": "1.3.20", + "version": "1.3.21", "description": "A homebridge plugin to control my blinds", "main": "index.js", "scripts": { From b8e1ad615638760fc79d39b619cc5eec5a93c4b9 Mon Sep 17 00:00:00 2001 From: Slavik Metlser Date: Wed, 1 Jul 2020 13:08:10 +0300 Subject: [PATCH 2/3] Add an author --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d8af379..bab5b4d 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,8 @@ "author": "Daniel Caspi ", "contributors": [ "Robin Temme ", - "Jimmy Henderickx " + "Jimmy Henderickx ", + "Slavik Meltser " ], "license": "ISC", "dependencies": { From 6b5e99de9544cbeeac47d81e3014b1cce07bc0d2 Mon Sep 17 00:00:00 2001 From: slavikme Date: Wed, 1 Jul 2020 21:06:22 +0300 Subject: [PATCH 3/3] Update README.md Co-authored-by: dxdc --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a54336a..f96842a 100644 --- a/README.md +++ b/README.md @@ -178,18 +178,17 @@ Ensure that the motion time is configured properly, even when `position_url` is `motion_time` is the time, in milliseconds, for your blinds to move from up to down. This should only include the time the motor is running. Filming this with your phone to determine the time may be easier than trying to do it with a timer. **NOTE**: If you are performing multiple blind requests simultaneously and are getting network timeouts due to your configuration, try using non-identical `motion_time` (e.g., 9800, 10000, 10200 vs. 10000 for each) it may help. -There are additional two configurations parameters, `motion_down_time` and `motion_up_time`. - -`motion_down_time` is the time, in milliseconds, for your blinds to move from up to down. Everything else is exactly as described in `motion_time` above. +**Note!** +For cases where `motion_time` varies based on the direction of shutter movement (i.e., due to gravity), `motion_down_time` and `motion_up_time` may be used for more fine-tuning. -`motion_up_time` is the time, in milliseconds, for your blinds to move from down to up. Everything else is exactly as described in `motion_time` above. +- `motion_down_time` is the time, in milliseconds, for your blinds to move from up to down. +- `motion_up_time` is the time, in milliseconds, for your blinds to move from down to up. +- Everything else is exactly as described in `motion_time` above. -The reason for this, is that there are some blinds that their opening time is different from closing time, due to simple physics - The weight of the shutter affects on the speed of the motor. -Ideally, a better approach would be using some kind of gradual equation for calculating the exact time, according to the position, because the weight gradually added or subtracted during the move. But, hopefully this will be a nice to have feature in the future. +Ideally, a better approach would be using some kind of equation for calculating the exact time. This would be a nice-to-have feature in the future. **Note!** -`motion_down_time` and `motion_up_time` are always have higher priority over `motion_time`. This means, that if all three explicitly provided in the configuration file, the value set in `motion_down_time` and `motion_up_time` will be used instead and the value in `motion_time` will be ignored. You can also provide only `motion_down_time` and `motion_up_time` value without providing `motion_time`. If only `motion_time` is provided, its value will be used for `motion_down_time` and `motion_up_time`. - +`motion_down_time` and `motion_up_time` have a higher priority over `motion_time`. This means, that if all three are explicitly provided in the configuration file, the value set in `motion_time` will be ignored. **Steps:** 1. HTTP UP/DOWN request sent; wait for successful reply (i.e., `success_codes`) = `HTTP request delay (measured)` 2. Wait for device to send the signal to blinds, and movement begins = `response_lag`