Skip to content

Commit

Permalink
Dont add advanced configuration by default.
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed May 24, 2018
1 parent fb27bd2 commit 312ed03
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 21 deletions.
5 changes: 0 additions & 5 deletions data/configuration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,3 @@ mqtt:
serial:
# Location of CC2531 USB sniffer
port: /dev/ttyACM0

# Advanced configuration
advanced:
version: 1
pan_id: 0x1a62
14 changes: 0 additions & 14 deletions lib/util/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,9 @@ const YAWN = require('yawn-yaml/cjs');
const fs = require('fs');
const data = require('./data');
const file = data.joinPath('configuration.yaml');
const logger = require('./logger');

let yawn = read();

// Migrate configuration.
if (!yawn.json.advanced) {
// 1: Add advanced section to configuration.yaml
logger.info('Migrating configuration.yaml to version 1...');
yawn.yaml += '\n\n' +
'# Advanced configuration\n' +
'advanced:\n' +
' version: 1\n' +
' pan_id: 0x1a62\n';

writeRead();
}

function writeRead() {
write();
yawn = read();
Expand Down
6 changes: 4 additions & 2 deletions lib/zigbee.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ const settings = require('./util/settings');
const data = require('./util/data');
const debug = require('debug')('zigbee2mqtt:zigbee');

const advancedSettings = settings.get().advanced;

const shepherdSettings = {
net: {
panId: settings.get().advanced.pan_id,
channelList: [settings.get().advanced.hasOwnProperty('channel') ? settings.get().advanced.channel : 11],
panId: advancedSettings && advancedSettings.pan_id ? advancedSettings.pan_id : 0x1a62,
channelList: [advancedSettings && advancedSettings.channel ? advancedSettings.channel : 11],
},
dbPath: data.joinPath('database.db'),
};
Expand Down

0 comments on commit 312ed03

Please sign in to comment.