From: Chris R. <gi...@gi...> - 2012-03-21 20:59:41
|
Merge branch 'v2.5_branch' Conflicts: docs/src/config/ini_config.txt http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=7a84454 .gitignore | 3 +- configs/sim/ngcgui/ngcgui.ini | 3 +- docs/man/man1/axis-remote.1 | 2 +- docs/man/man1/halmeter.1 | 4 +- docs/man/man1/halsampler.1 | 4 +- docs/man/man1/halstreamer.1 | 4 +- docs/man/man1/iocontrol.1 | 3 - docs/man/man1/linuxcncrsh.1 | 2 +- docs/man/man9/at_pid.9 | 6 +- docs/man/man9/classicladder.9 | 4 +- docs/man/man9/gantrykins.9 | 14 +- docs/man/man9/kins.9 | 4 +- docs/man/man9/motion.9 | 3 - docs/man/man9/opto_ac5.9 | 2 +- docs/man/man9/sampler.9 | 6 +- docs/man/man9/streamer.9 | 6 +- docs/src/config/ini_config.txt | 14 +- docs/src/config/ini_config_de.txt | 12 +- docs/src/config/ini_config_es.txt | 12 +- docs/src/config/ini_config_fr.txt | 10 +- docs/src/config/ini_config_pl.txt | 12 +- docs/src/gcode/gcode.txt | 4 +- docs/src/gcode/gcode_de.txt | 4 +- docs/src/gcode/gcode_es.txt | 4 +- docs/src/gcode/gcode_fr.txt | 8 +- docs/src/gcode/gcode_pl.txt | 4 +- docs/src/gcode/overview.txt | 1 + docs/src/gcode/overview_fr.txt | 3 +- docs/src/gui/axis.txt | 3 + docs/src/gui/axis_de.txt | 3 + docs/src/gui/axis_es.txt | 3 + docs/src/gui/axis_fr.txt | 3 + docs/src/gui/axis_pl.txt | 4 +- docs/src/gui/ngcgui.txt | 2 +- docs/src/gui/ngcgui_de.txt | 2 +- docs/src/gui/ngcgui_es.txt | 2 +- docs/src/gui/ngcgui_pl.txt | 2 +- docs/src/hal/comp.txt | 19 +- docs/src/motion/kinematics.txt | 72 ++-- docs/src/motion/kinematics_de.txt | 72 ++-- docs/src/motion/kinematics_es.txt | 72 ++-- docs/src/motion/kinematics_fr.txt | 42 ++-- docs/src/motion/kinematics_pl.txt | 72 ++-- nc_files/ngcgui_lib/backlash.ngc | 14 +- nc_files/ngcgui_lib/db25.ngc | 4 +- nc_files/ngcgui_lib/helix.ngc | 20 +- nc_files/ngcgui_lib/ihex.ngc | 19 +- nc_files/ngcgui_lib/iquad.ngc | 9 +- nc_files/ngcgui_lib/ohex.ngc | 9 +- nc_files/ngcgui_lib/oquad.ngc | 9 +- nc_files/ngcgui_lib/qpex.ngc | 130 +++++++ nc_files/ngcgui_lib/qpocket.ngc | 449 ++++++++++++++++++++++++ nc_files/ngcgui_lib/qpocket.png | Bin 0 -> 12102 bytes nc_files/ngcgui_lib/rectangle_probe.ngc | 4 +- nc_files/ngcgui_lib/utilitysubs/dir.ngc | 179 ++++++---- nc_files/ngcgui_lib/utilitysubs/pointsdata.ngc | 53 +++ src/emc/usr_intf/pncconf/pncconf.py | 118 ++++--- src/hal/components/logic.comp | 2 +- src/hal/components/scale.comp | 2 +- src/hal/components/thc.comp | 2 +- src/hal/components/threadtest.comp | 2 +- src/hal/components/timedelta.comp | 2 +- src/hal/drivers/pluto_servo.comp | 6 +- src/hal/drivers/pluto_step.comp | 6 +- src/hal/utils/comp.g | 82 +++-- 65 files changed, 1217 insertions(+), 435 deletions(-) diff --cc docs/src/config/ini_config.txt index a80325c,0c667ed..a4ba2b6 --- a/docs/src/config/ini_config.txt +++ b/docs/src/config/ini_config.txt @@@ -331,12 -331,7 +331,12 @@@ should be used by any filter that runs file which contains the parameters used by the interpreter (saved between runs). -* 'RS274NGC_STARTUP_CODE = G01 G17 G20 G40 G49 G64 P0.001 G80 G90 G92 G94 G97 G98' - +* 'ORIENT_OFFSET = 0' - + (((ORIENT OFFSET ))) A float value added to the R word parameter + of an <<sec:M19,M19 Orient Spindle> operation. Used to define an arbitrary + zero position regardless of encoder mount orientation. + - * 'RS274NGC_STARTUP_CODE = G01 G17 G20 G40 G49 G64.1 P0.001 G80 G90 G92 G94 G97 G98' - ++* 'RS274NGC_STARTUP_CODE = G01 G17 G20 G40 G49 G64 P0.001 G80 G90 G92 G94 G97 G98' - (((RS274NGC STARTUP CODE))) A string of NC codes that the interpreter is initialized with. This is not a substitute for specifying modal g-codes at the top of each ngc file, because the modal codes of |