Merge pull request #226 from NebzHB/beta

Update to beta
NebzHB · May 20, 2024 · 4188150 · 4188150
2 parents 497c988 + 8b1d438
commit 4188150
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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; }

diff --git 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,
@@ -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"
   },