Fixed typo, better error handling.
parent
42f2398ac1
commit
0ed8f0f28d
|
@ -6,7 +6,7 @@
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="tabbable">
|
<div class="tabbable">
|
||||||
<ul class="nav nav-list span4" id="settingsTabs">
|
<ul class="nav nav-list span4" id="settingsTabs">
|
||||||
<li class="active"><a href="#settings-serialConnection" data-toggle="tab">Serial Connection</a></li>
|
<li class="active"><a href="#settings_serialConnection" data-toggle="tab">Serial Connection</a></li>
|
||||||
<li><a href="#settings_printerParameters" data-toggle="tab">Printer Parameters</a></li>
|
<li><a href="#settings_printerParameters" data-toggle="tab">Printer Parameters</a></li>
|
||||||
<li><a href="#settings_webcam" data-toggle="tab">Webcam</a></li>
|
<li><a href="#settings_webcam" data-toggle="tab">Webcam</a></li>
|
||||||
<li><a href="#settings_features" data-toggle="tab">Features</a></li>
|
<li><a href="#settings_features" data-toggle="tab">Features</a></li>
|
||||||
|
|
|
@ -851,10 +851,13 @@ class MachineCom(object):
|
||||||
|
|
||||||
def _gcode_G0(self, cmd):
|
def _gcode_G0(self, cmd):
|
||||||
if 'Z' in cmd:
|
if 'Z' in cmd:
|
||||||
z = float(re.search('Z([0-9\.]*)', cmd).group(1))
|
try:
|
||||||
if self._currentZ != z:
|
z = float(re.search('Z([0-9\.]*)', cmd).group(1))
|
||||||
self._currentZ = z
|
if self._currentZ != z:
|
||||||
self._callback.mcZChange(z)
|
self._currentZ = z
|
||||||
|
self._callback.mcZChange(z)
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
return cmd
|
return cmd
|
||||||
_gcode_G1 = _gcode_G0
|
_gcode_G1 = _gcode_G0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue