Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pponce light fix #16

Merged
merged 18 commits into from
May 23, 2017
Merged

Pponce light fix #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
507bddc
Hack to prevent callback from being called multiple times
sean9keenan Feb 28, 2017
c50d93b
Update package.json
pponce Apr 1, 2017
0c53501
Update index.js
pponce Apr 1, 2017
ce43b9d
Update index.js
pponce Apr 2, 2017
dbacc8d
Update index.js
pponce Apr 2, 2017
b723b6d
Update index.js
pponce Apr 2, 2017
44ccc92
Update index.js
pponce Apr 2, 2017
9316c69
Update index.js
pponce Apr 2, 2017
64e4edb
Update index.js
pponce Apr 2, 2017
72d6ca3
Update index.js
pponce Apr 2, 2017
fac288a
Update index.js
pponce Apr 2, 2017
13a3b65
Update index.js
pponce Apr 2, 2017
23c48ec
Update index.js
pponce Apr 2, 2017
7eaec2e
Update index.js
pponce Apr 2, 2017
dc54505
Update package.json
pponce Apr 2, 2017
02654ff
Update index.js
pponce Apr 2, 2017
261a2f0
Merge pull request #1 from pponce/callbackOnceHack
pponce Apr 2, 2017
861ef08
added legacy light_exists configuration variable
pponce Apr 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ You must also set the fan_name to the name returned here.
| fan_name | _*Required*_ | Must get this from `getFanInfo.js` |
| fan_id | _*Required*_ | Must get this from `getFanInfo.js` |
| fan_ip_address | Optional | IP address of fan, defaults to broadcast |
| light_exists | Optional | Has light? set to true - default false |
| light_on | Optional | What "On" means - default Max |
| fan_on | Optional | What "On" means - default 3/7 |
| homekit_fan_name | Optional | Name to call the Fan in Homekit |
Expand Down
13 changes: 11 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ BigAssFansPlatform.prototype.addAccessory = function(theFan) {
"fan_name" : theFan.name,
"fan_id" : theFan.id,
"fan_ip_address" : theFan.address,
"light_exists" : theFan.light.exists,
"light_on" : platform.config.light_on,
"fan_on" : platform.config.fan_on,
"homekit_fan_name" : platform.config.homekit_fan_name,
Expand Down Expand Up @@ -122,6 +123,7 @@ function BigAssFanAccessory(log, config, existingAccessory) {
this.fanName = config["fan_name"]; // TODO: Allow this to be null
this.fanID = config["fan_id"];
this.fanIPAddress = config["fan_ip_address"]; // Can be null - resorts to broadcasting
this.lightExists = config["light_exists"] // Can be null - default is below
this.lightOn = config["light_on"]; // Can be null - default is below
this.fanOn = config["fan_on"]; // Can be null - default is below
this.homekitFanName = config["homekit_fan_name"]
Expand All @@ -136,6 +138,7 @@ function BigAssFanAccessory(log, config, existingAccessory) {
setDefault("fanIPAddress", "255.255.255.255");
setDefault("lightOn", 16);
setDefault("fanOn", 3);
setDefault("lightExists", false);

setDefault("name", this.fanName);
setDefault("homekitFanName", this.name + " Fan");
Expand Down Expand Up @@ -248,7 +251,7 @@ function BigAssFanAccessory(log, config, existingAccessory) {
var lightMaxBrightness = this.myBigAss.light.max ? this.myBigAss.light.max : 16;
var fanMaxSpeed = this.myBigAss.fan.max ? this.myBigAss.fan.max : 7;

if (this.myBigAss.light.exists) {
if (this.lightExists) {
this.log("Found a light for: " + this.homekitLightName);

var existingLightBulbService;
Expand Down Expand Up @@ -319,9 +322,15 @@ function BigAssFanAccessory(log, config, existingAccessory) {

BigAssFanAccessory.prototype.getStateFactory = function(propertyToWrap, subProperty, outputMapping) {
return function(callback) {
// TODO: Determine why update can callback multiple times
// This temporarily prevents multiple calls to the callback
var callbackCalled = false;
this.myBigAss[propertyToWrap].update(subProperty, function(err, value) {
var returnVal = outputMapping(value);
callback(err, returnVal);
if (!callbackCalled) { // TODO: remove after bug is found
callbackCalled = true;
callback(err, returnVal);
}
});
}
}
Expand Down