From 52785efeb425910cfdf8ead633917dbd29f412c9 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 10 Sep 2015 15:23:08 -0400
Subject: [PATCH] serial monitor working

---
 js/SerialMonitor/SerialMonitorView.js | 13 ++++++++++---
 js/menus/CommParentMenu.js            |  1 -
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/js/SerialMonitor/SerialMonitorView.js b/js/SerialMonitor/SerialMonitorView.js
index 1b035c78..31593129 100644
--- a/js/SerialMonitor/SerialMonitorView.js
+++ b/js/SerialMonitor/SerialMonitorView.js
@@ -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({
 
         el: "#serialMonitorView",
 
+        events: {
+        },
+
         __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(){
-            console.log("render");
             return this.model.toJSON();
         },
 
+        _updateIncomingMessage: function(){
+            $("#serialMonitorOutput").append(serialComm.get("lastMessageReceived") + "<br/>");
+        },
+
         template: _.template(template)
 
     });
diff --git a/js/menus/CommParentMenu.js b/js/menus/CommParentMenu.js
index 1395302d..3d3d8de9 100644
--- a/js/menus/CommParentMenu.js
+++ b/js/menus/CommParentMenu.js
@@ -32,7 +32,6 @@ define(['jquery', 'underscore', 'menuParent', 'plist', 'serialComm', 'commPlist'
         },
 
         _sendMessage: function(e){
-            console.log("here");
             e.preventDefault();
             var message = $("#sendSerialMessage").val();
             $("#sendSerialMessage").val("");
-- 
GitLab