From c192d9ba97453f6c503de6fa8ec304bc3312ee75 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Mon, 20 May 2024 15:43:32 +0200 Subject: [PATCH 1/3] Update index.js --- index.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/index.js b/index.js index 4b018ed..5434604 100755 --- a/index.js +++ b/index.js @@ -4617,8 +4617,8 @@ JeedomPlatform.prototype.getAccessoryValue = function(characteristic, service, i if(service.maxValue == 100) { returnValue = returnValue > (service.maxValue-5) ? service.maxValue : returnValue; // >95% is 100% in home (flaps need yearly tunning) } - - if(Math.abs(returnValue - service.TargetValue) <= 2) {service.Moving=Characteristic.PositionState.STOPPED; returnValue=service.TargetValue;} + + if(Math.abs(returnValue - service.TargetValue) <= calculateTolerance(service.maxValue)) {service.Moving=Characteristic.PositionState.STOPPED; returnValue=service.TargetValue;} else if (service.TargetValue !== undefined && service.Moving===Characteristic.PositionState.STOPPED) {service.TargetValue=undefined;} this.log('debug','---------update Blinds Value(refresh):',returnValue,'% soit',cmd.currentValue,' / ',service.maxValue,' : ',positionStateLabel(service.Moving)); break; @@ -4632,7 +4632,7 @@ JeedomPlatform.prototype.getAccessoryValue = function(characteristic, service, i } returnValue = 100-returnValue; // invert percentage - if(Math.abs(returnValue - service.TargetValue) <= 2) {service.Moving=Characteristic.PositionState.STOPPED; returnValue=service.TargetValue;} + if(Math.abs(returnValue - service.TargetValue) <= calculateTolerance(service.maxValue)) {service.Moving=Characteristic.PositionState.STOPPED; returnValue=service.TargetValue;} else if (service.TargetValue !== undefined && service.Moving===Characteristic.PositionState.STOPPED) {service.TargetValue=undefined;} this.log('debug','---------update Inverted Blinds Value(refresh):',returnValue,'% soit',cmd.currentValue,' / ',service.maxValue,' : ',positionStateLabel(service.Moving)); break; @@ -4641,7 +4641,7 @@ JeedomPlatform.prototype.getAccessoryValue = function(characteristic, service, i returnValue = parseInt(cmd.currentValue); returnValue = rangeToPercentage(returnValue, service.minValue, service.maxValue); - if(Math.abs(returnValue - service.TargetValue) <= 2) {service.Moving=Characteristic.PositionState.STOPPED; returnValue=service.TargetValue;} + if(Math.abs(returnValue - service.TargetValue) <= calculateTolerance(service.maxValue)) {service.Moving=Characteristic.PositionState.STOPPED; returnValue=service.TargetValue;} else if (service.TargetValue !== undefined && service.Moving===Characteristic.PositionState.STOPPED) {service.TargetValue=undefined;} this.log('debug','---------update WindowMoto Value(refresh):',returnValue,'% soit',cmd.currentValue,' / ',service.maxValue,' : ',positionStateLabel(service.Moving)); break; @@ -6435,6 +6435,11 @@ JeedomBridgedAccessory.prototype.delServices = function(accessory) { } }; +// calculate the tolerance for ranges +function calculateTolerance(max) { + return max === 0 ? 0 : Math.floor((max - 1) / 100); +} + // convert range to percentage function rangeToPercentage(value, min, max) { if(min == 0 && max == 100) { return value; } From ac46b71bb9a2d8667862a17edb042cd35251aa62 Mon Sep 17 00:00:00 2001 From: Nebz <28622481+NebzHB@users.noreply.github.com> Date: Mon, 20 May 2024 15:46:47 +0200 Subject: [PATCH 2/3] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b20b27a..08f96e2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nebz/homebridge-jeedom", "version": "v1.7.0", - "cust_serial": "0027", + "cust_serial": "0028", "description": "Homebridge plugin for Jeedom ", "main": "index.js", "private":true, From 8b1d4388e4810373695e654b3d7c9e569464e539 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 13:47:45 +0000 Subject: [PATCH 3/3] Bump axios from 1.6.8 to 1.7.1 (#227) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08f96e2..794e5c3 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ ], "dependencies": { "async": "3.2.5", - "axios": "1.6.8", + "axios": "1.7.1", "express": "4.19.2", "fakegato-history": "NebzHB/fakegato-history#master" },