Commit e3fe3259 authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

beginning to wire up gcode to send menu

parent b1368c1b
...@@ -297,10 +297,10 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel ...@@ -297,10 +297,10 @@ define(['underscore', 'three', 'backbone', 'appState', 'latticeCAM', 'threeModel
this.get("exporter").simulate(allLines[currentLine], this.get("assembler"), this.get("exporter").simulate(allLines[currentLine], this.get("assembler"),
scaledSettings, function(){ scaledSettings, function(){
currentLine++; currentLine++;
self.set("simLineNumber", currentLine); self.set("simLineNumber", currentLine);
self._stockSimulation(); self._stockSimulation();
}); });
} else { } else {
//finished simulation //finished simulation
this.resetSimulation(); this.resetSimulation();
......
...@@ -13,7 +13,8 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s ...@@ -13,7 +13,8 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
"click #pauseStream": "_pauseStream", "click #pauseStream": "_pauseStream",
"click #stopMachine": "_stopMachine", "click #stopMachine": "_stopMachine",
"click #previousLineButton": "_decrementLineNum", "click #previousLineButton": "_decrementLineNum",
"click #nextLineButton": "_incrementLineNum" "click #nextLineButton": "_incrementLineNum",
"click #openSerialMonitor": "_openSerialMonitor"
}, },
...@@ -23,18 +24,21 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s ...@@ -23,18 +24,21 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
_startStream: function(e){ _startStream: function(e){
e.preventDefault(); e.preventDefault();
this.model.set("stockSimulationPlaying", true);
this.isStreaming = true; this.isStreaming = true;
this.render(); this.render();
}, },
_pauseStream: function(e){ _pauseStream: function(e){
e.preventDefault(); e.preventDefault();
this.model.set("stockSimulationPlaying", false);
this.isStreaming = false; this.isStreaming = false;
this.render(); this.render();
}, },
_stopMachine: function(e){ _stopMachine: function(e){
e.preventDefault(); e.preventDefault();
this.model.set("stockSimulationPlaying", false);
this.isStreaming = false; this.isStreaming = false;
serialComm.send("!"); serialComm.send("!");
this.render(); this.render();
...@@ -50,6 +54,11 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s ...@@ -50,6 +54,11 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
console.log("next"); console.log("next");
}, },
_openSerialMonitor: function(e){
e.preventDefault();
serialComm.openSerialMonitor();
},
_makeTemplateJSON: function(){ _makeTemplateJSON: function(){
return _.extend(serialComm.toJSON(), commPlist, cam.toJSON(), camPlist, {streaming: this.isStreaming}); return _.extend(serialComm.toJSON(), commPlist, cam.toJSON(), camPlist, {streaming: this.isStreaming});
}, },
......
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
<a href="#" id="streamCommands" class="btn btn-block btn-lg btn-success">Stream</a> <a href="#" id="streamCommands" class="btn btn-block btn-lg btn-success">Stream</a>
<% } %> <% } %>
<br/> <br/>
<a href="#" id="openSerialMonitor" class="btn btn-block btn-lg btn-default">Open Serial Monitor</a><br/>
Next Line: &nbsp;&nbsp;<input id="nextLine" value="" placeholder="##" class="intInput form-control unresponsiveInput" type="text"> Next Line: &nbsp;&nbsp;<input id="nextLine" value="" placeholder="##" class="intInput form-control unresponsiveInput" type="text">
<a href="#" id="previousLineButton" class="btn btn-lg btn-default">Prev</a> &nbsp;&nbsp;<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/> &nbsp;&nbsp;<a href="#" id="nextLineButton" class="btn btn-lg btn-default">Next</a><br/><br/>
<div id="gcodeEditor"><%= dataOut %></div><br/> <div id="gcodeEditor"><%= dataOut %></div><br/>
<% } %> <% } %>
<% } else { %> <% } else { %>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment