mle: fix up various issues with formatting and messages so messages appear in the ML tabHEADmain

2 files changed, 7 insertions, 21 deletions

diff --git a/static/js/base.js b/static/js/base.js
index 2920c25..f3d74d2 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -38,7 +38,7 @@ const PORT_PHY1 = 1;
 const PORT_PHY2 = 2;
 const PORT_PC = 10;
 
-const MSG_FORMAT_BASIC = 0;
+const MSG_FORMAT_INFO = 0;
 const MSG_FORMAT_CONTROLLER = 1;
 const MSG_FORMAT_MLE = 2;
 
diff --git a/static/js/ws.js b/static/js/ws.js
index bc814ff..664c729 100644
--- a/static/js/ws.js
+++ b/static/js/ws.js
@@ -73,7 +73,7 @@ socket.onmessage = function(event) {
 	let num_msgs = 0;
 
 	let msg = JSON.parse(event.data);
-	if (msg.format == MSG_FORMAT_BASIC) {
+	if (msg.format == MSG_FORMAT_INFO) {
 		if (typeof msg['mode'] !== "undefined") {
 			console.log("mode: ", msg['mode']);
 			update_mode(msg['mode']);
@@ -102,26 +102,12 @@ socket.onmessage = function(event) {
 	}
 
 	num_msgs += 1;
-	console.log("From server:", num_msgs, ': ', msg);
+	console.log("From server:", msg.data.substring(0,48));
 
-	if (msg.port == PORT_PC) {
-		log.innerHTML += '<div class="mc-log-row style=height:' + height.toString() + 'rem"><div class="mc-log-col-time">' + msg.time + '</div>' +
-			'<div class="mc-log-col-pc">' + log_msg(msg) + '</div>' +
-			'<div class="mc-log-col-phy0"></div>' +
-			'<div class="mc-log-col-phy1"></div></div>';
-	}
-	else if (msg.port == PORT_PHY0) {
-		log.innerHTML += '<div class="mc-log-row"><div class="mc-log-col-time">' + msg.time + '</div>' +
-			'<div class="mc-log-col-pc"></div>' +
-			'<div class="mc-log-col-phy0">' + log_msg(msg) +
-			'</div><div class="mc-log-col-phy1"></div></div>';
-	}
-	else if (msg.port == PORT_PHY1) {
-		log.innerHTML += '<div class="mc-log-row"><div class="mc-log-col-time">' + msg.time + '</div>' +
-			'<div class="mc-log-col-pc"></div>' +
-			'<div class="mc-log-col-phy0"></div>' +
-			'<div class="mc-log-col-phy1">' + log_msg(msg) + '</div></div>';
-	}
+	log.innerHTML += '<div class="mc-log-row style=height:' + height.toString() + 'rem"><div class="mc-log-col mc-log-col-time">' + msg.time + '</div>' +
+		'<div class="mc-log-col mc-log-col-token">' + msg.token + '</div>' +
+		'<div class="mc-log-col mc-log-col-data">' + msg.data.substring(0,48) + '</div>' + 
+		'</div>';
 
 	// socket.send("request");
 	state = "Request"