From e3fe325927541e6327aada3dc075d23ce9ba3378 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 11 Sep 2015 01:48:23 -0400
Subject: [PATCH] beginning to wire up gcode to send menu
---
js/cam/Cam.js | 8 ++++----
js/menus/SendMenuView.js | 11 ++++++++++-
js/menus/templates/SendMenuView.html | 5 +++--
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/js/cam/Cam.js b/js/cam/Cam.js
index 7320fce5..7fd68bb6 100644
--- a/js/cam/Cam.js
+++ b/js/cam/Cam.js
@@ -297,10 +297,10 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
this.get("exporter").simulate(allLines[currentLine], this.get("assembler"),
scaledSettings, function(){
- currentLine++;
- self.set("simLineNumber", currentLine);
- self._stockSimulation();
- });
+ currentLine++;
+ self.set("simLineNumber", currentLine);
+ self._stockSimulation();
+ });
} else {
//finished simulation
this.resetSimulation();
diff --git a/js/menus/SendMenuView.js b/js/menus/SendMenuView.js
index 85eefd67..34566d91 100644
--- a/js/menus/SendMenuView.js
+++ b/js/menus/SendMenuView.js
@@ -13,7 +13,8 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
"click #pauseStream": "_pauseStream",
"click #stopMachine": "_stopMachine",
"click #previousLineButton": "_decrementLineNum",
- "click #nextLineButton": "_incrementLineNum"
+ "click #nextLineButton": "_incrementLineNum",
+ "click #openSerialMonitor": "_openSerialMonitor"
},
@@ -23,18 +24,21 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
_startStream: function(e){
e.preventDefault();
+ this.model.set("stockSimulationPlaying", true);
this.isStreaming = true;
this.render();
},
_pauseStream: function(e){
e.preventDefault();
+ this.model.set("stockSimulationPlaying", false);
this.isStreaming = false;
this.render();
},
_stopMachine: function(e){
e.preventDefault();
+ this.model.set("stockSimulationPlaying", false);
this.isStreaming = false;
serialComm.send("!");
this.render();
@@ -50,6 +54,11 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
console.log("next");
},
+ _openSerialMonitor: function(e){
+ e.preventDefault();
+ serialComm.openSerialMonitor();
+ },
+
_makeTemplateJSON: function(){
return _.extend(serialComm.toJSON(), commPlist, cam.toJSON(), camPlist, {streaming: this.isStreaming});
},
diff --git a/js/menus/templates/SendMenuView.html b/js/menus/templates/SendMenuView.html
index f71756ed..010546f9 100644
--- a/js/menus/templates/SendMenuView.html
+++ b/js/menus/templates/SendMenuView.html
@@ -9,9 +9,10 @@
<a href="#" id="streamCommands" class="btn btn-block btn-lg btn-success">Stream</a>
<% } %>
<br/>
+ <a href="#" id="openSerialMonitor" class="btn btn-block btn-lg btn-default">Open Serial Monitor</a><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>
- <a href="#" id="nextLineButton" class="btn btn-lg btn-default">Next</a><br/><br/>
+ <a href="#" id="previousLineButton" class="btn btn-lg btn-default">Prev</a>
+ <a href="#" id="nextLineButton" class="btn btn-lg btn-default">Next</a><br/><br/>
<div id="gcodeEditor"><%= dataOut %></div><br/>
<% } %>
<% } else { %>
--
GitLab