Compare commits
11 commits
stable-1.2
...
v2_proto2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7b283550cb | ||
|
|
f799a3285f | ||
|
|
26a5692543 | ||
|
|
7352c551ec | ||
|
|
19eb4b690a | ||
|
|
ca54be985e | ||
|
|
b105047cad | ||
|
|
89d493a33b | ||
|
|
d89ec331da | ||
|
|
f54d932928 | ||
|
|
14f83133b7 |
2 changed files with 10 additions and 4 deletions
|
|
@ -15,7 +15,7 @@
|
||||||
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="navbar">
|
<nav class="navbar navbar-default navbar-fixed-top" role="navigation" id="navbar">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="navbar-header brand" style="min-width: 272px;">
|
<div class="navbar-header brand" style="min-width: 272px;">
|
||||||
<a class="navbar-brand" href="#">
|
<a class="navbar-brand" href="#" >
|
||||||
<img alt="Mr Beam Logo" src="{{ url_for('static', filename='img/mr-typo-red_x120.png') }}">
|
<img alt="Mr Beam Logo" src="{{ url_for('static', filename='img/mr-typo-red_x120.png') }}">
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -160,7 +160,7 @@
|
||||||
-->
|
-->
|
||||||
{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
|
{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
|
||||||
<div data-bind="visible: isPrinting() || isPaused()">
|
<div data-bind="visible: isPrinting() || isPaused()">
|
||||||
|
|
||||||
<div class="progress">
|
<div class="progress">
|
||||||
<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }"> {{ _('Processed') }} : <strong data-bind="text: byteString"></strong></div>
|
<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }"> {{ _('Processed') }} : <strong data-bind="text: byteString"></strong></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -183,7 +183,7 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<span>Passes</span>
|
<span>Passes</span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -533,7 +533,7 @@
|
||||||
<i class="icon-camera icon-white"></i>
|
<i class="icon-camera icon-white"></i>
|
||||||
<span>{{ _('Photo') }}</span>
|
<span>{{ _('Photo') }}</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div id="gcode_upload_progress" class="progress" style="width: 100%;">
|
<div id="gcode_upload_progress" class="progress" style="width: 100%;">
|
||||||
<div class="bar" style="width: 0%"></div>
|
<div class="bar" style="width: 0%"></div>
|
||||||
|
|
|
||||||
|
|
@ -358,6 +358,7 @@ class MachineCom(object):
|
||||||
def _handle_ok_message(self):
|
def _handle_ok_message(self):
|
||||||
if self._state == self.STATE_HOMING:
|
if self._state == self.STATE_HOMING:
|
||||||
self._changeState(self.STATE_OPERATIONAL)
|
self._changeState(self.STATE_OPERATIONAL)
|
||||||
|
self._onHomingDone()
|
||||||
|
|
||||||
def _handle_error_message(self, line):
|
def _handle_error_message(self, line):
|
||||||
self._errorValue = line
|
self._errorValue = line
|
||||||
|
|
@ -557,6 +558,11 @@ class MachineCom(object):
|
||||||
payload = dict(port=self._port, baudrate=self._baudrate)
|
payload = dict(port=self._port, baudrate=self._baudrate)
|
||||||
eventManager().fire(Events.CONNECTED, payload)
|
eventManager().fire(Events.CONNECTED, payload)
|
||||||
|
|
||||||
|
def _onHomingDone(self):
|
||||||
|
self.sendCommand("G92X510Y400Z0")
|
||||||
|
self.sendCommand("G90")
|
||||||
|
self.sendCommand("G21")
|
||||||
|
|
||||||
def _detectPort(self, close):
|
def _detectPort(self, close):
|
||||||
self._log("Serial port list: %s" % (str(serialList())))
|
self._log("Serial port list: %s" % (str(serialList())))
|
||||||
for p in serialList():
|
for p in serialList():
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue