Erik/homebridge-kobold-Homaassistant-Flavour
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a bug that crashed the plugin on devices with zone cleaning

Browse Source 
Fixed a bug in the update cache timing
This commit is contained in:
Arne 2019-09-24 20:06:04 +02:00
parent af54046927
commit bef37d88c8
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
accessories/neatoVacuumRobot.js
View File

@ -35,10 +35,6 @@ function NeatoVacuumRobotAccessory(platform, robotObject, boundary = undefined)
this.boundary = boundary; this.boundary = boundary;
this.nextRoom = null; this.nextRoom = null;
SpotWidthCharacteristic = require('../characteristics/spotWidth')(Characteristic, CustomUUID);
SpotHeightCharacteristic = require('../characteristics/spotHeight')(Characteristic, CustomUUID);
SpotRepeatCharacteristic = require('../characteristics/spotRepeat')(Characteristic, CustomUUID);
if (typeof boundary === 'undefined') if (typeof boundary === 'undefined')
{ {
this.name = this.robot.name; this.name = this.robot.name;
@ -78,6 +74,10 @@ function NeatoVacuumRobotAccessory(platform, robotObject, boundary = undefined)
this.scheduleService = new Service.Switch(this.name + " Schedule", "schedule"); this.scheduleService = new Service.Switch(this.name + " Schedule", "schedule");
this.findMeService = new Service.Switch(this.name + " Find Me", "findMe"); this.findMeService = new Service.Switch(this.name + " Find Me", "findMe");
SpotWidthCharacteristic = require('../characteristics/spotWidth')(Characteristic, CustomUUID);
SpotHeightCharacteristic = require('../characteristics/spotHeight')(Characteristic, CustomUUID);
SpotRepeatCharacteristic = require('../characteristics/spotRepeat')(Characteristic, CustomUUID);
// Spot cleaning with advanced options // Spot cleaning with advanced options
if ((typeof this.availableServices.spotCleaning !== 'undefined') && this.availableServices.spotCleaning.includes("basic")) if ((typeof this.availableServices.spotCleaning !== 'undefined') && this.availableServices.spotCleaning.includes("basic"))
{ {
@ -92,6 +92,7 @@ function NeatoVacuumRobotAccessory(platform, robotObject, boundary = undefined)
this.spotCleanSimpleService = new Service.Switch(this.name + " Clean Spot", "cleanSpot"); this.spotCleanSimpleService = new Service.Switch(this.name + " Clean Spot", "cleanSpot");
this.spotCleanSimpleService.addCharacteristic(SpotRepeatCharacteristic); this.spotCleanSimpleService.addCharacteristic(SpotRepeatCharacteristic);
} }
this.log("Added default cleaning device named: " + this.name);
} }
else else
{ {
@ -101,9 +102,8 @@ function NeatoVacuumRobotAccessory(platform, robotObject, boundary = undefined)
{ {
serviceName = "Clean " + boundary.name; serviceName = "Clean " + boundary.name;
} }
this.cleanBoundaryService = this.cleanBoundaryService = new Service.Switch(serviceName, "cleanBoundary:" + boundary.id);
new Service.Switch(serviceName, "cleanBoundary:" + boundary.id); this.log("Added zone cleaning for: " + boundary.name);
this.log("Adding zone cleaning for: " + boundary.name);
} }
} }
@ -632,7 +632,7 @@ NeatoVacuumRobotAccessory.prototype = {
{ {
this.platform.updateRobot(this.robot._serial, () => this.platform.updateRobot(this.robot._serial, () =>
{ {
debug(this.name + ": The Dock is " + (this.robot.isDocked ? '' : 'un ') + "occupied"); debug(this.name + ": The Dock is " + (this.robot.isDocked ? '' : 'NOT ') + "OCCUPIED");
callback(false, this.robot.isDocked ? 1 : 0); callback(false, this.robot.isDocked ? 1 : 0);
}); });
}, },
@ -650,7 +650,7 @@ NeatoVacuumRobotAccessory.prototype = {
{ {
this.platform.updateRobot(this.robot._serial, () => this.platform.updateRobot(this.robot._serial, () =>
{ {
debug(this.name + ": Battery is " + (this.robot.isCharging ? '' : 'not ') + "charging"); debug(this.name + ": Battery is " + (this.robot.isCharging ? '' : 'NOT ') + "CHARGING");
callback(false, this.robot.isCharging); callback(false, this.robot.isCharging);
}); });
}, },

9
index.js
View File

@ -55,7 +55,7 @@ NeatoVacuumRobotPlatform.prototype = {
{ {
this.robots.forEach((robot, i) => this.robots.forEach((robot, i) =>
{ {
this.log("Found robot #" + (i + 1) + " named \"" + robot.device.name + "\" with serial \"" + robot.device._serial + "\""); this.log("Found robot #" + (i + 1) + " named \"" + robot.device.name + "\" with serial \"" + robot.device._serial.substring(0,9) + "XXXXXXXXXXXX\"");
// Start Update Intervall // Start Update Intervall
this.updateRobotTimer(robot.device._serial); this.updateRobotTimer(robot.device._serial);
@ -67,6 +67,11 @@ NeatoVacuumRobotPlatform.prototype = {
robot.mainAccessory = mainAccessory; robot.mainAccessory = mainAccessory;
robot.roomAccessories = []; robot.roomAccessories = [];
// For testing purposes only
// let roomAccessory = new NeatoVacuumRobotAccessory(this, robot, {name: "Testzimmer", id: "1"});
// accessories.push(roomAccessory);
// robot.roomAccessories.push(roomAccessory);
if (robot.device.maps) if (robot.device.maps)
{ {
robot.device.maps.forEach((map) => robot.device.maps.forEach((map) =>
@ -206,13 +211,13 @@ NeatoVacuumRobotPlatform.prototype = {
else else
{ {
debug(robot.device.name + ": ++ Updating robot state"); debug(robot.device.name + ": ++ Updating robot state");
robot.lastUpdate = new Date();
robot.device.getState((error, result) => robot.device.getState((error, result) =>
{ {
if (error) if (error)
{ {
this.log.error("Cannot update robot. Check if robot is online. " + error); this.log.error("Cannot update robot. Check if robot is online. " + error);
} }
robot.lastUpdate = new Date();
callback(); callback();
}); });
} }