Skip to content

Commit

Permalink
Fix typo availablility -> availability. #777 #775
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Dec 30, 2018
1 parent 07fbc1b commit 5453c08
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion lib/controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class Controller {
));
}

if (settings.get().experimental.availablility_timeout) {
if (settings.get().experimental.availability_timeout) {
this.extensions.push(new DeviceAvailability(
this.zigbee, this.mqtt, this.state, this.publishDeviceState
));
Expand Down
8 changes: 4 additions & 4 deletions lib/extension/deviceAvailability.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ const utils = require('../util/utils');
const Queue = require('queue');

/**
* This extensions set availablity based on optionally polling router devices
* This extensions set availability based on optionally polling router devices
* and optionally check device publish with attribute reporting
*/
class DeviceAvailabilityHandler {
constructor(zigbee, mqtt, state, publishDeviceState) {
this.zigbee = zigbee;
this.mqtt = mqtt;
this.availablility_timeout = settings.get().experimental.availablility_timeout;
this.availability_timeout = settings.get().experimental.availability_timeout;
this.timers = {};
this.pending = [];

Expand Down Expand Up @@ -80,7 +80,7 @@ class DeviceAvailabilityHandler {

this.timers[ieeeAddr] = setTimeout(() => {
this.handleInterval(ieeeAddr);
}, utils.secondsToMilliseconds(this.availablility_timeout));
}, utils.secondsToMilliseconds(this.availability_timeout));
}

stop() {
Expand All @@ -94,7 +94,7 @@ class DeviceAvailabilityHandler {
publishAvailability(ieeeAddr, available) {
const deviceSettings = settings.getDevice(ieeeAddr);
const name = deviceSettings ? deviceSettings.friendly_name : ieeeAddr;
const topic = `${name}/availablility`;
const topic = `${name}/availability`;
const payload = available ? 'online' : 'offline';
this.mqtt.publish(topic, payload, {retain: true, qos: 0});
}
Expand Down
10 changes: 5 additions & 5 deletions lib/extension/homeassistant.js
Original file line number Diff line number Diff line change
Expand Up @@ -516,11 +516,11 @@ class HomeAssistant {
manufacturer: mappedModel.vendor,
};

// Set availablility payload
// When using experimental availablility_timeout each device has it's own availablility topic.
// If not, use the availablility topic of zigbee2mqtt.
if (settings.get().experimental.availablility_timeout) {
payload.availability_topic = `${settings.get().mqtt.base_topic}/${friendlyName}/availablility`;
// Set availability payload
// When using experimental availability_timeout each device has it's own availability topic.
// If not, use the availability topic of zigbee2mqtt.
if (settings.get().experimental.availability_timeout) {
payload.availability_topic = `${settings.get().mqtt.base_topic}/${friendlyName}/availability`;
} else {
payload.availability_topic = `${settings.get().mqtt.base_topic}/bridge/state`;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/util/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const defaults = {
},
experimental: {
// Availability timeout in seconds, disabled by default.
availablility_timeout: 0,
availability_timeout: 0,
},
};

Expand Down

0 comments on commit 5453c08

Please sign in to comment.