mtan93/homebridge
1
0
Fork 0
mirror of https://github.com/mtan93/homebridge.git synced 2026-05-30 22:07:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MiLight] Correctly reference light object, and also fix bug with brightness=0 setting the lamp to night mode

Browse Source
This commit is contained in:
Sam Edwards
2015-09-07 16:45:27 -07:00
parent a4c3f73eb5
commit 2710412ca6
1 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
accessories/MiLight.js
+25 -21
View File
@@ -69,60 +69,62 @@ function MiLight(log, config) {
this.delay = config["delay"]; this.delay = config["delay"];
this.repeat = config["repeat"]; this.repeat = config["repeat"];
var light = new Milight({ this.light = new Milight({
ip: this.ip_address, ip: this.ip_address,
port: this.port, port: this.port,
delayBetweenCommands: this.delay, delayBetweenCommands: this.delay,
commandRepeat: this.repeat commandRepeat: this.repeat
}); });
} }
MiLight.prototype = { MiLight.prototype = {
setPowerState: function(powerOn, callback) { setPowerState: function(powerOn, callback) {
if (powerOn) { if (powerOn) {
light.sendCommands(commands[this.type].on(this.zone));
this.log("Setting power state to on"); this.log("Setting power state to on");
this.light.sendCommands(commands[this.type].on(this.zone));
} else { } else {
light.sendCommands(commands[this.type].off(this.zone));
this.log("Setting power state to off"); this.log("Setting power state to off");
this.light.sendCommands(commands[this.type].off(this.zone));
} }
callback(); callback();
}, },
setBrightness: function(level, callback) { setBrightness: function(level, callback) {
if (level <= 2 && (this.type == "rgbw" || this.type == "white")) { if (level == 0) {
// If brightness is set to 0, turn off the lamp
this.log("Setting brightness to 0 (off)");
this.light.sendCommands(commands[this.type].off(this.zone));
} else if (level <= 2 && (this.type == "rgbw" || this.type == "white")) {
// If setting brightness to 2 or lower, instead set night mode for lamps that support it // If setting brightness to 2 or lower, instead set night mode for lamps that support it
this.log("Setting night mode", level); this.log("Setting night mode", level);
light.sendCommands(commands[this.type].off(this.zone)); this.light.sendCommands(commands[this.type].off(this.zone));
// Ensure we're pausing for 100ms between these commands as per the spec // Ensure we're pausing for 100ms between these commands as per the spec
light.pause(100); this.light.pause(100);
light.sendCommands(commands[this.type].nightMode(this.zone)); this.light.sendCommands(commands[this.type].nightMode(this.zone));
} else { } else {
this.log("Setting brightness to %s", level); this.log("Setting brightness to %s", level);
// Send on command to ensure we're addressing the right bulb // Send on command to ensure we're addressing the right bulb
light.sendCommands(commands[this.type].on(this.zone)); this.light.sendCommands(commands[this.type].on(this.zone));
// If this is an rgbw lamp, set the absolute brightness specified // If this is an rgbw lamp, set the absolute brightness specified
if (this.type == "rgbw") { if (this.type == "rgbw") {
light.sendCommands(commands.rgbw.brightness(level)); this.light.sendCommands(commands.rgbw.brightness(level));
} else { } else {
// If this is an rgb or a white lamp, they only support brightness up and down. // If this is an rgb or a white lamp, they only support brightness up and down.
// Set brightness up when value is >50 and down otherwise. Not sure how well this works real-world. // Set brightness up when value is >50 and down otherwise. Not sure how well this works real-world.
if (level >= 50) { if (level >= 50) {
if (this.type == "white" && level == 100) { if (this.type == "white" && level == 100) {
// But the white lamps do have a "maximum brightness" command // But the white lamps do have a "maximum brightness" command
light.sendCommands(commands.white.maxBright(this.zone)); this.light.sendCommands(commands.white.maxBright(this.zone));
} else { } else {
light.sendCommands(commands[this.type].brightUp()); this.light.sendCommands(commands[this.type].brightUp());
} }
} else { } else {
light.sendCommands(commands[this.type].brightDown()); this.light.sendCommands(commands[this.type].brightDown());
} }
} }
} }
@@ -132,23 +134,25 @@ MiLight.prototype = {
setHue: function(value, callback) { setHue: function(value, callback) {
this.log("Setting hue to %s", value); this.log("Setting hue to %s", value);
var hue = Array(value, 0, 0);
// Send on command to ensure we're addressing the right bulb // Send on command to ensure we're addressing the right bulb
light.sendCommands(commands[this.type].on(this.zone)); this.light.sendCommands(commands[this.type].on(this.zone));
if (this.type == "rgbw") { if (this.type == "rgbw") {
if (value == 0) { if (value == 0) {
light.sendCommands(commands.rgbw.whiteMode(this.zone)); this.light.sendCommands(commands.rgbw.whiteMode(this.zone));
} else { } else {
light.sendCommands(commands.rgbw.hue(commands.rgbw.hsvToMilightColor(Array(value, 0, 0)))); this.light.sendCommands(commands.rgbw.hue(commands.rgbw.hsvToMilightColor(hue)));
} }
} else if (this.type == "rgb") { } else if (this.type == "rgb") {
light.sendCommands(commands.rgb.hue(commands.rgbw.hsvToMilightColor(Array(value, 0, 0)))); this.light.sendCommands(commands.rgb.hue(commands.rgbw.hsvToMilightColor(hue)));
} else if (this.type == "white") { } else if (this.type == "white") {
// Again, white lamps don't support setting an absolue colour temp, so trying to do warmer/cooler step at a time based on colour // Again, white lamps don't support setting an absolue colour temp, so trying to do warmer/cooler step at a time based on colour
if (value >= 180) { if (value >= 180) {
light.sendCommands(commands.white.warmer()); this.light.sendCommands(commands.white.warmer());
} else { } else {
light.sendCommands(commands.white.cooler()); this.light.sendCommands(commands.white.cooler());
} }
} }