Skip to content
Snippets Groups Projects
Commit 52785efe authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

serial monitor working

parent 27758ff4
Branches
No related tags found
No related merge requests found
...@@ -3,21 +3,28 @@ ...@@ -3,21 +3,28 @@
*/ */
define(['jquery', 'underscore', 'commParentMenu', 'text!SerialMonitorView.html'], function($, _, CommParentMenu, template){ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!SerialMonitorView.html'],
function($, _, CommParentMenu, serialComm, template){
return CommParentMenu.extend({ return CommParentMenu.extend({
el: "#serialMonitorView", el: "#serialMonitorView",
events: {
},
__initialize: function(){ __initialize: function(){
$("#serialMonitorOutput").html("flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>)flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>)flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>flksadlfkj<br/>"); this.render();
}, },
_makeTemplateJSON: function(){ _makeTemplateJSON: function(){
console.log("render");
return this.model.toJSON(); return this.model.toJSON();
}, },
_updateIncomingMessage: function(){
$("#serialMonitorOutput").append(serialComm.get("lastMessageReceived") + "<br/>");
},
template: _.template(template) template: _.template(template)
}); });
......
...@@ -32,7 +32,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist' ...@@ -32,7 +32,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist'
}, },
_sendMessage: function(e){ _sendMessage: function(e){
console.log("here");
e.preventDefault(); e.preventDefault();
var message = $("#sendSerialMessage").val(); var message = $("#sendSerialMessage").val();
$("#sendSerialMessage").val(""); $("#sendSerialMessage").val("");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment