From 485ecc13c686a1819df8b5e6a013dc9189a904a2 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Sun, 15 Jul 2018 22:47:05 +0200
Subject: [PATCH] default channel on create node + send callback

---
 webroot/js/config.js | 2 ++
 webroot/js/store.js  | 7 ++++++-
 websocket/hd_node.go | 3 +--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/webroot/js/config.js b/webroot/js/config.js
index b0f2cb3..ae76573 100644
--- a/webroot/js/config.js
+++ b/webroot/js/config.js
@@ -5,6 +5,8 @@ export default {
 	'title': 'FreifunkManager - Breminale',
 	'backend': `ws${location.protocol == 'https:' ? 's' : ''}://${location.host}/ws`,
 	'node': {
+		'channel24': 6,
+		'channel5': 44,
 		// Minuten till is shown as offline
 		'offline': 5
 	},
diff --git a/webroot/js/store.js b/webroot/js/store.js
index 23aabc4..ab9b6b9 100644
--- a/webroot/js/store.js
+++ b/webroot/js/store.js
@@ -1,3 +1,5 @@
+import config from './config';
+
 const current = {},
 	list = {};
 
@@ -22,7 +24,10 @@ export function getNode (nodeid) {
 export function createNode (nodeid) {
 	return {
 		'node_id': nodeid,
-		'wireless': {},
+		'wireless': {
+			'channel24': config.node.channel24,
+			'channel5': config.node.channel5,
+		},
 		'location': {}
 	};
 };
diff --git a/websocket/hd_node.go b/websocket/hd_node.go
index c5fe2e4..3a0e65a 100644
--- a/websocket/hd_node.go
+++ b/websocket/hd_node.go
@@ -27,8 +27,7 @@ func (ws *WebsocketServer) nodeHandler(logger *log.Entry, msg *wsLib.Message) er
 		logger.Debugf("%v", node)
 		return nil
 	}
-	ws.nodes.UpdateNode(&node)
-	msg.Answer(msg.Subject, true)
+	msg.Answer(msg.Subject, ws.nodes.UpdateNode(&node))
 	logger.Infof("change %s", node.NodeID)
 	return nil
 }