diff --git a/css/main.css b/css/main.css index b878da648a1b49055cf64cffa2e18d0ee8eef2bd..87c0c8c31f145f486613e5ec374c31ab0c316550 100644 --- a/css/main.css +++ b/css/main.css @@ -498,4 +498,14 @@ label { .navbar-inverse .navbar-nav > .dropdown > a:hover .caret { border-top-color: #aaa; border-bottom-color: #aaa; +} + +#incomingSerialMessage{ + background-color: white; + white-space: nowrap; + max-width: 250px; + overflow: hidden; + display: inline-block; + text-overflow: ellipsis; + position: absolute; } \ No newline at end of file diff --git a/js/menus/CommParentMenu.js b/js/menus/CommParentMenu.js index 34c7e90fb3022b16c4c358aceab20fef50685422..f71e66d9bec210791fa5156648545bced5c31730 100644 --- a/js/menus/CommParentMenu.js +++ b/js/menus/CommParentMenu.js @@ -41,10 +41,10 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist' _updateIncomingMessage: function(){ var message = serialComm.get("lastMessageReceived"); - console.log(message); var $message = $("#incomingSerialMessage"); $message.html(message); $message.css("background", "#ffff99"); + $message.css('display', 'inline-block'); if (!this.inTimeout) { this.inTimeout = true; var self = this; diff --git a/js/menus/SendMenuView.js b/js/menus/SendMenuView.js index 57da9db0111e778b1064ff47a60554d7c7863530..f47b837bdee591fdb3874ee99784e0e601fc243a 100644 --- a/js/menus/SendMenuView.js +++ b/js/menus/SendMenuView.js @@ -54,6 +54,10 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'commPlist', 'te return _.extend(serialComm.toJSON(), commPlist, cam.toJSON(), camPlist, {streaming: this.isStreaming}); }, + _render: function(){ + if (serialComm.get("lastMessageReceived") === null) $("#incomingSerialMessage").hide(); + }, + template: _.template(template) }); diff --git a/js/menus/SetupCommMenuView.js b/js/menus/SetupCommMenuView.js index 6c569e1683b4f395d6d32efd363428e382bf3d1a..cd8531ae11971ec6e1c0884209e91fdd544f49e0 100644 --- a/js/menus/SetupCommMenuView.js +++ b/js/menus/SetupCommMenuView.js @@ -56,6 +56,10 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!setupCommM return _.extend(serialComm.toJSON(), commPlist); }, + _render: function(){ + if (serialComm.get("lastMessageReceived") === null) $("#incomingSerialMessage").hide(); + }, + template: _.template(template), helpFile: "" + diff --git a/js/menus/templates/SendMenuView.html b/js/menus/templates/SendMenuView.html index 7cbcb7ea52dda4a25504955f49ab3a4df5a724e7..1ec28eb65eec66b3aa25a7bade76b1df3bd4d8d8 100644 --- a/js/menus/templates/SendMenuView.html +++ b/js/menus/templates/SendMenuView.html @@ -9,7 +9,7 @@ <a href="#" id="streamCommands" class="btn btn-block btn-lg btn-success">Stream</a> <% } %> <br/> - Incoming: <pre id="incomingSerialMessage"><br/></pre><br/> + Incoming: <pre id="incomingSerialMessage"><%= lastMessageReceived %></pre><br/><br/> Out: <input id="sendSerialMessage" value="" placeholder="Send Message" class="seventyFiveWidth form-control unresponsiveInput" type="text"><br/><br/> Next Line: <input id="nextLine" value="" placeholder="##" class="intInput form-control unresponsiveInput" type="text"> <a href="#" id="previousLineButton" class="btn btn-lg btn-default">Prev</a> diff --git a/js/menus/templates/SetupCommMenuView.html b/js/menus/templates/SetupCommMenuView.html index 6490b72f808c7c17c1b4d71cd6b4eb35ad4933ea..713101f303b7319cc79af692cc3f7da2e50a8b08 100644 --- a/js/menus/templates/SetupCommMenuView.html +++ b/js/menus/templates/SetupCommMenuView.html @@ -23,7 +23,7 @@ </div> <a href="#" id="refreshPorts" class="btn btn-lg btn-default btn-icon"><img src="assets/imgs/refreshIcon.png"></a><br/><br/> <a href="#" id="openSerialMonitor" class="btn btn-block btn-lg btn-default">Open Serial Monitor</a><br/> - Incoming: <pre id="incomingSerialMessage"><br/></pre><br/> + Incoming: <pre id="incomingSerialMessage"><%= lastMessageReceived %></pre><br/><br/> Out: <input id="sendSerialMessage" value="" placeholder="Send Message" class="seventyFiveWidth form-control unresponsiveInput" type="text"><br/><br/> <a href="#" id="serialFlushBuffer" class="btn btn-block btn-lg btn-danger">Flush Buffer</a><br/> <% }else{ %> diff --git a/js/models/SerialComm.js b/js/models/SerialComm.js index 86691d989951e965eb9459be7639949fc9809ac6..68c0ee4abf328800df93ab26644918d4eee51855 100644 --- a/js/models/SerialComm.js +++ b/js/models/SerialComm.js @@ -13,7 +13,7 @@ define(['underscore', 'backbone', 'socketio'], function(_, Backbone, io){ portName: "Select Port", baudRate: 200, error: null, - lastMessageReceived: "", + lastMessageReceived: null, lastMessageSent: "" }, @@ -73,6 +73,7 @@ define(['underscore', 'backbone', 'socketio'], function(_, Backbone, io){ }); socket.on('dataIn', function(data){ + if (data == "" || data == '\n' || data == "\r") return; serialComm.set("lastMessageReceived", data, {silent:true}); serialComm.trigger("change:lastMessageReceived"); });