Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
db8305bbee | ||
|
f795781d2a | ||
|
3cfde323a8 |
75
.gitignore
vendored
Normal file
75
.gitignore
vendored
Normal file
@@ -0,0 +1,75 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
|
||||
# Runtime data
|
||||
pids
|
||||
*.pid
|
||||
*.seed
|
||||
|
||||
# Directory for instrumented libs generated by jscoverage/JSCover
|
||||
lib-cov
|
||||
|
||||
# Coverage directory used by tools like istanbul
|
||||
coverage
|
||||
|
||||
# nyc test coverage
|
||||
.nyc_output
|
||||
|
||||
# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
|
||||
.grunt
|
||||
|
||||
# node-waf configuration
|
||||
.lock-wscript
|
||||
|
||||
# Compiled binary addons (http://nodejs.org/api/addons.html)
|
||||
build/Release
|
||||
|
||||
# Dependency directories
|
||||
node_modules
|
||||
jspm_packages
|
||||
|
||||
# Optional npm cache directory
|
||||
.npm
|
||||
|
||||
# Optional REPL history
|
||||
.node_repl_history
|
||||
# See http://help.github.com/ignore-files/ for more about ignoring files.
|
||||
|
||||
# compiled output
|
||||
/dist
|
||||
/dist-server
|
||||
/dist-e2e
|
||||
/tmp
|
||||
/out-tsc
|
||||
|
||||
# IDEs and editors
|
||||
/.idea
|
||||
.project
|
||||
.classpath
|
||||
.c9/
|
||||
*.launch
|
||||
.settings/
|
||||
*.sublime-workspace
|
||||
*.iml
|
||||
|
||||
# IDE - VSCode
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
|
||||
# misc
|
||||
/.sass-cache
|
||||
/connect.lock
|
||||
/libpeerconnection.log
|
||||
yarn-error.log
|
||||
testem.log
|
||||
/typings
|
||||
|
||||
# System Files
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
package-lock.json
|
@@ -83,3 +83,11 @@
|
||||
## 0.5.2
|
||||
|
||||
* Added schema file for use with homebridge-config-ui-x
|
||||
|
||||
## 0.6.0
|
||||
|
||||
* Added support for zone cleaning
|
||||
|
||||
## 0.6.1
|
||||
|
||||
* Fixed homebridge startup failed when robot does not support zone cleaning
|
70
index.js
70
index.js
@@ -4,13 +4,13 @@ var inherits = require('util').inherits,
|
||||
botvac = require('node-botvac'),
|
||||
|
||||
Service,
|
||||
Characteristic
|
||||
Characteristic;
|
||||
|
||||
module.exports = function (homebridge) {
|
||||
Service = homebridge.hap.Service;
|
||||
Characteristic = homebridge.hap.Characteristic;
|
||||
homebridge.registerPlatform("homebridge-neato", "NeatoVacuumRobot", NeatoVacuumRobotPlatform);
|
||||
}
|
||||
};
|
||||
|
||||
function NeatoVacuumRobotPlatform(log, config) {
|
||||
this.log = log;
|
||||
@@ -40,9 +40,9 @@ NeatoVacuumRobotPlatform.prototype = {
|
||||
|
||||
let that = this;
|
||||
this.getRobots(function () {
|
||||
for (var i = 0; i < that.robots.length; i++) {
|
||||
for (let i = 0; i < that.robots.length; i++) {
|
||||
that.log("Found robot #" + (i + 1) + " named \"" + that.robots[i].name + "\" with serial \"" + that.robots[i]._serial + "\"");
|
||||
var robotAccessory = new NeatoVacuumRobotAccessory(that.robots[i], that);
|
||||
let robotAccessory = new NeatoVacuumRobotAccessory(that.robots[i], that);
|
||||
accessories.push(robotAccessory);
|
||||
that.robots[i].maps.forEach((map) => {
|
||||
map.boundaries.forEach((boundary) => {
|
||||
@@ -65,21 +65,18 @@ NeatoVacuumRobotPlatform.prototype = {
|
||||
that.log(error);
|
||||
that.log.error("Can't log on to neato cloud. Please check your credentials.");
|
||||
callback();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
client.getRobots((error, robots) => {
|
||||
if (error) {
|
||||
that.log(error);
|
||||
that.log.error("Successful login but can't connect to your neato robot.");
|
||||
callback();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (robots.length === 0) {
|
||||
that.log.error("Successful login but no robots associated with your account.");
|
||||
that.robots = [];
|
||||
callback();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug("Found " + robots.length + " robots");
|
||||
let updatedRobotCount = 0;
|
||||
that.robots = robots;
|
||||
@@ -91,7 +88,11 @@ NeatoVacuumRobotPlatform.prototype = {
|
||||
return;
|
||||
}
|
||||
robot.maps = result;
|
||||
let processedMapCount = 0
|
||||
let processedMapCount = 0;
|
||||
if (robot.maps.length === 0)
|
||||
{
|
||||
callback();
|
||||
}
|
||||
robot.maps.forEach((map) => {
|
||||
robot.getMapBoundaries(map.id, (error, result) => {
|
||||
if (error) {
|
||||
@@ -101,7 +102,7 @@ NeatoVacuumRobotPlatform.prototype = {
|
||||
}
|
||||
processedMapCount++;
|
||||
if (processedMapCount == robot.maps.length) {
|
||||
updatedRobotCount++
|
||||
updatedRobotCount++;
|
||||
if (updatedRobotCount === that.robots.length) {
|
||||
callback();
|
||||
}
|
||||
@@ -116,7 +117,7 @@ NeatoVacuumRobotPlatform.prototype = {
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
function NeatoVacuumRobotAccessory(robot, platform, boundary) {
|
||||
this.platform = platform;
|
||||
@@ -231,10 +232,10 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
if (this.boundary) {
|
||||
this.vacuumRobotCleanBoundaryService.getCharacteristic(Characteristic.On).on('set', (on, serviceCallback) => {
|
||||
this.setCleanBoundary(this.boundary.id, on, serviceCallback)
|
||||
})
|
||||
});
|
||||
this.vacuumRobotCleanBoundaryService.getCharacteristic(Characteristic.On).on('get', (serviceCallback) => {
|
||||
this.getCleanBoundary(this.boundary.id, serviceCallback);
|
||||
})
|
||||
});
|
||||
this.services.push(this.vacuumRobotCleanBoundaryService);
|
||||
}
|
||||
|
||||
@@ -251,7 +252,7 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
this.log(error + ": " + JSON.stringify(result));
|
||||
}
|
||||
callback();
|
||||
})
|
||||
});
|
||||
return
|
||||
} else {
|
||||
this.log("Error, robot is already cleaning");
|
||||
@@ -261,8 +262,7 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
debug(this.name + ": Pause cleaning");
|
||||
this.robot.pauseCleaning(callback);
|
||||
return;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug(this.name + ": Already stopped");
|
||||
}
|
||||
}
|
||||
@@ -293,8 +293,7 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
if (that.robot.canResume) {
|
||||
debug(that.name + ": Resume cleaning");
|
||||
that.robot.resumeCleaning(callback);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
let eco = that.vacuumRobotEcoService.getCharacteristic(Characteristic.On).value;
|
||||
let extraCare = that.vacuumRobotExtraCareService.getCharacteristic(Characteristic.On).value;
|
||||
let nogoLines = that.vacuumRobotNoGoLinesService.getCharacteristic(Characteristic.On).value;
|
||||
@@ -307,24 +306,20 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
if (error) {
|
||||
that.log.error(error + ": " + result);
|
||||
callback(true);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
callback();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug(that.name + ": Cant start, maybe already cleaning");
|
||||
callback();
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
if (that.robot.canPause) {
|
||||
debug(that.name + ": Pause cleaning");
|
||||
that.robot.pauseCleaning(callback);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug(that.name + ": Already stopped");
|
||||
callback();
|
||||
}
|
||||
@@ -344,12 +339,10 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
that.robot.sendToBase(callback);
|
||||
}, 1000);
|
||||
});
|
||||
}
|
||||
else if (that.robot.canGoToBase) {
|
||||
} else if (that.robot.canGoToBase) {
|
||||
debug(that.name + ": Go to dock");
|
||||
that.robot.sendToBase(callback);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
that.log.warn(that.name + ": Can't go to dock at the moment");
|
||||
callback();
|
||||
}
|
||||
@@ -383,8 +376,7 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
if (on) {
|
||||
debug(that.name + ": Enable schedule");
|
||||
that.robot.enableSchedule(callback);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug(that.name + ": Disable schedule");
|
||||
that.robot.disableSchedule(callback);
|
||||
}
|
||||
@@ -464,8 +456,7 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
let that = this;
|
||||
if (this.lastUpdate !== null && new Date() - this.lastUpdate < 2000) {
|
||||
callback();
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug(this.name + ": Updating robot state");
|
||||
this.robot.getState(function (error, result) {
|
||||
if (error) {
|
||||
@@ -513,7 +504,7 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
|
||||
// robot is currently cleaning, update if refresh is set to auto or a specific interval
|
||||
if (that.robot.canPause && that.refresh !== 0) {
|
||||
let refreshTime = that.refresh === 'auto' ? 60 : that.refresh
|
||||
let refreshTime = that.refresh === 'auto' ? 60 : that.refresh;
|
||||
debug("Updating state in background every " + refreshTime + " seconds while cleaning");
|
||||
that.timer = setTimeout(that.updateRobotTimer.bind(that), refreshTime * 1000);
|
||||
}
|
||||
@@ -521,10 +512,9 @@ NeatoVacuumRobotAccessory.prototype = {
|
||||
else if (that.refresh !== 'auto' && that.refresh !== 0) {
|
||||
debug("Updating state in background every " + that.refresh + " seconds (user setting)");
|
||||
that.timer = setTimeout(that.updateRobotTimer.bind(that), that.refresh * 1000);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
debug("Updating state in background disabled");
|
||||
}
|
||||
});
|
||||
},
|
||||
}
|
||||
};
|
||||
|
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "homebridge-neato",
|
||||
"version": "0.6.0",
|
||||
"version": "0.6.1",
|
||||
"description": "A Neato vacuum robot plugin for homebridge.",
|
||||
"license": "MIT",
|
||||
"keywords": [
|
||||
|
Reference in New Issue
Block a user