Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions backend/filereaders/svg_path_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,13 @@ def addCubicBezier(self, subpath, x1, y1, x2, y2, x3, y3, x4, y4, level):
# protect from deep recursion cases
# max 2**18 = 262144 segments
return
elif level == 0:
if (x1 == x2 and y1 == y2 and x2 == x3 and y2 == y3) or \
(x2 == x3 and y2 == y3 and x3 == x4 and y3 == y4):
# the tolerance would never reached, but it's a straight line
#subpath.append([x1, y1]) # probably not needed
subpath.append([x4, y4])
return

# Calculate all the mid-points of the line segments
x12 = (x1 + x2) / 2.0
Expand Down
1 change: 0 additions & 1 deletion frontend/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<script src="/js/jquery.toastmessage.js"></script>
<script src="/js/jquery.hotkeys.js"></script>
<script src="/js/settings.js"></script>
<script src="/js/app_svgreader.js"></script>
<script src="/js/app_datahandler.js"></script>
<script src="/js/app_canvas.js"></script>
<script src="/js/app.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion frontend/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ $(document).ready(function(){
// $().uxmessage('notice', gcode.replace(/\n/g, '<br>'));
send_gcode(gcode, "Stopping ...", false);
var delayedresume = setTimeout(function() {
var gcode = '~\nG90\nM81\nG0X0Y0F'+app_settings.max_seek_speed+'\n' // ~ is resume char
var gcode = '~\nG90\nG0X0Y0F'+app_settings.max_seek_speed+'\nM81\n' // ~ is resume char
// $().uxmessage('notice', gcode.replace(/\n/g, '<br>'));
send_gcode(gcode, "Resetting ...", false);
}, 1000);
Expand Down
2 changes: 1 addition & 1 deletion frontend/js/app_datahandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ DataHandler = {
}
}
// footer
glist.push("M81\nS0\nG0X0Y0F"+app_settings.max_seek_speed+"\n");
glist.push("S0\nG0X0Y0F"+app_settings.max_seek_speed+"\nM81\n");
// alert(JSON.stringify(glist.join('')))
return glist.join('');
},
Expand Down