martin/Aida-Server
martin/Aida-Server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

using a map in the lights

Browse Source
This commit is contained in:
Martin Donnelly 2017-11-10 21:33:14 +00:00
parent fbb7d8aaa9
commit d6ce365f25
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/aida.js
View File

@ -13,7 +13,7 @@ logger.level = 'debug';
const devices = { const devices = {
'sensors': {}, 'sensors': {},
'lights': {}, 'lights': new Map(),
'wemo': {}, 'wemo': {},
'heating': {} 'heating': {}
}; };
@ -39,9 +39,9 @@ Aida.prototype.init = function() {
this.mqtt = new MqttController(); this.mqtt = new MqttController();
this.lights.on('found', (d) => { this.lights.on('found', (d) => {
if (devices.lights[d.id] === undefined) { if (devices.lights.get(d.id) === undefined) {
logger.debug('Adding to light list'); logger.debug('Adding to light list');
devices.lights[d.id] = d; devices.lights.set(d.id, d);
} }
}); });

19
lib/light-controller.js
View File

@ -7,10 +7,8 @@ logger.level = 'debug';
const LightController = function() { const LightController = function() {
const _this = this; const _this = this;
const devices = []; const devices = new Map();
client.on('light-new', light => { client.on('light-new', light => {
_this.emit('found', light);
devices.push(light);
logger.debug('New light found.'); logger.debug('New light found.');
logger.debug(`ID: ${ light.id}`); logger.debug(`ID: ${ light.id}`);
logger.debug(`IP: ${ light.address }:${ light.port}`); logger.debug(`IP: ${ light.address }:${ light.port}`);
@ -19,10 +17,16 @@ const LightController = function() {
if (err) if (err)
logger.debug(err); logger.debug(err);
// if (devices.get(light.id) === undefined)
devices.set(light.id, Object.assign({}, light));
logger.debug(`Label: ${ info.label}`); logger.debug(`Label: ${ info.label}`);
logger.debug('Power:', (info.power === 1) ? 'on' : 'off'); logger.debug('Power:', (info.power === 1) ? 'on' : 'off');
logger.debug('Color:', info.color); logger.debug('Color:', info.color);
logger.debug('info', info); logger.debug('info', info);
_this.emit('found', light);
const label = light.label || '';
_this.emit(label.replace(' ', ''), { 'status':light.status, 'id':light.id });
// _this.emit(info.label.replace(' ',''), ) // _this.emit(info.label.replace(' ',''), )
}); });
@ -76,11 +80,10 @@ const LightController = function() {
}); });
this.on('setColour', (data) => { this.on('setColour', (data) => {
for(const light of devices) { const wLight = devices.get(data.id);
if (light.id === data.id) { if (wLight) {
logger.info('Setting color of ', light.label); logger.info('Setting color of ', wLight.label);
light.color(data.color.hue, data.color.saturation, data.color.brightness, data.color.kelvin); wLight.color(data.color.hue, data.color.saturation, data.color.brightness, data.color.kelvin);
}
} }
}); });

2
lib/recipes.js
View File

@ -1,6 +1,6 @@
const em = require('events').EventEmitter; const em = require('events').EventEmitter;
const util = require('util'); const util = require('util');
const logger = require('log4js').getLogger('BedroomRecipe'); const logger = require('log4js').getLogger('recipes');
logger.level = 'debug'; logger.level = 'debug';
const BedroomRecipe = function(devices) { const BedroomRecipe = function(devices) {