pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mrbeam' into stable-1.2.2

Browse source
This commit is contained in:
Teja 2015-11-16 16:01:54 +01:00
commit be5fd41f61
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/octoprint/plugins/lasercutterprofiles/profile.py
View file

@ -32,8 +32,8 @@ class LaserCutterProfileManager(object):
width = 217, width = 217,
depth = 298, depth = 298,
height = 0, height = 0,
origin_offset_x = 1, origin_offset_x = 1.1,
origin_offset_y = 1, origin_offset_y = 1.1,
), ),
zAxis = False, zAxis = False,
axes=dict( axes=dict(

2
src/octoprint/plugins/svgtogcode/static/js/convert.js
View file

@ -110,7 +110,7 @@ $(function(){
self.cancel_conversion = function(){ self.cancel_conversion = function(){
if(self.slicing_in_progress()){ if(self.slicing_in_progress()){
console.log('cancel slicing', self.slicing_in_progress()); //console.log('cancel slicing', self.slicing_in_progress());
// TODO cancel slicing properly // TODO cancel slicing properly
} }
}; };

2
src/octoprint/plugins/svgtogcode/static/js/working_area.js
View file

@ -335,7 +335,7 @@ $(function(){
var tooHigh = svgBB.h > waBB.h; var tooHigh = svgBB.h > waBB.h;
var scale = 1; var scale = 1;
if(tooWide || tooHigh){ if(tooWide || tooHigh){
scale = Math.min(waBB.w / svgBB.w, waBB.h / svgBB.h) - 0.01; // scale minimal smaller to avoid rounding errors scale = Math.min(waBB.w / svgBB.w, waBB.h / svgBB.h) - 0.0001; // scale minimal smaller to avoid rounding errors
} }
var dx = 0; var dx = 0;

4
src/octoprint/util/comm_acc2.py
View file

@ -377,6 +377,10 @@ class MachineCom(object):
self._send_event.clear(completely=True) self._send_event.clear(completely=True)
self._changeState(self.STATE_LOCKED) self._changeState(self.STATE_LOCKED)
# close and open serial port to reset arduino
self._serial.close()
self._openSerial()
def _handle_feedback_message(self, line): def _handle_feedback_message(self, line):
if line[1:].startswith('Res'): # [Reset to continue] if line[1:].startswith('Res'): # [Reset to continue]
pass pass