Merge remote-tracking branch 'remotes/jpcgt/flatcam/Beta' into Beta

# Conflicts:
#	tclCommands/TclCommandMillDrills.py
This commit is contained in:
Marius Stanciu
2019-11-19 23:20:09 +02:00
committed by Marius
5 changed files with 6 additions and 7 deletions

View File

@@ -78,7 +78,7 @@ class TclCommandCncjob(TclCommandSignaled):
('pp', 'Name of the Geometry postprocessor. No quotes, case sensitive'),
('muted', 'It will not put errors in the Shell.')
]),
'examples': ['cncjob geo_name -tooldia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -ppname_g default']
'examples': ['cncjob geo_name -dia 0.5 -z_cut -1.7 -z_move 2 -feedrate 120 -pp default']
}
def execute(self, args, unnamed_args):