grbl_G81_post.py   grbl_G81_post.py 
skipping to change at line 99 skipping to change at line 99
MOTION_COMMANDS = ['G0', 'G00', 'G1', 'G01', 'G2', 'G02', 'G3', 'G03'] # Motion gCode commands definition MOTION_COMMANDS = ['G0', 'G00', 'G1', 'G01', 'G2', 'G02', 'G3', 'G03'] # Motion gCode commands definition
RAPID_MOVES = ['G0', 'G00'] # Rapid moves gCode commands definition RAPID_MOVES = ['G0', 'G00'] # Rapid moves gCode commands definition
SUPPRESS_COMMANDS = ['G98', 'G80'] # These commands are ignored by commenting them out SUPPRESS_COMMANDS = ['G98', 'G80'] # These commands are ignored by commenting them out
COMMAND_SPACE = " " COMMAND_SPACE = " "
CURRENT_X = 0 # Global variable storing current position CURRENT_X = 0 # Global variable storing current position
CURRENT_Y = 0 CURRENT_Y = 0
CURRENT_Z = 0 CURRENT_Z = 0
#************************************************************************** ******************************* #************************************************************************** *******************************
# to distinguish python built-in open function from the one declared below # to distinguish python built-in open function from the one declared below
if open.__module__ == '__builtin__': if open.__module__ in ['__builtin__','io']:
pythonopen = open pythonopen = open
def processArguments(argstring): def processArguments(argstring):
global OUTPUT_HEADER global OUTPUT_HEADER
global OUTPUT_COMMENTS global OUTPUT_COMMENTS
global OUTPUT_LINE_NUMBERS global OUTPUT_LINE_NUMBERS
global SHOW_EDITOR global SHOW_EDITOR
global PRECISION global PRECISION
global PREAMBLE global PREAMBLE
skipping to change at line 384 skipping to change at line 384
else: # G91 Deplacements relatifs else: # G91 Deplacements relatifs
drill_X = CURRENT_X + params['X'] drill_X = CURRENT_X + params['X']
drill_Y = CURRENT_Y + params['Y'] drill_Y = CURRENT_Y + params['Y']
drill_Z = CURRENT_Z + params['Z'] drill_Z = CURRENT_Z + params['Z']
RETRACT_Z = CURRENT_Z + params['R'] RETRACT_Z = CURRENT_Z + params['R']
if DRILL_RETRACT_MODE == 'G98' and CURRENT_Z >= RETRACT_Z: if DRILL_RETRACT_MODE == 'G98' and CURRENT_Z >= RETRACT_Z:
RETRACT_Z = CURRENT_Z RETRACT_Z = CURRENT_Z
# Recupere les valeurs des autres parametres # Recupere les valeurs des autres parametres
drill_Speed = params['F'] drill_Speed = params['F'] * SPEED_MULTIPLIER
if cmd == 'G83': if cmd == 'G83':
drill_Step = params['Q'] drill_Step = params['Q']
elif cmd == 'G82': elif cmd == 'G82':
drill_DwellTime = params['P'] drill_DwellTime = params['P']
if MOTION_MODE == 'G91': if MOTION_MODE == 'G91':
trBuff += linenumber() + "G90" + "\n" # Force des deplacements en coord onnees absolues pendant les cycles trBuff += linenumber() + "G90" + "\n" # Force des deplacements en coord onnees absolues pendant les cycles
# Mouvement(s) preliminaire(s)) # Mouvement(s) preliminaire(s))
if CURRENT_Z < RETRACT_Z: if CURRENT_Z < RETRACT_Z:
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/