From: Chris R. <gi...@gi...> - 2011-04-23 19:07:31
|
Merge branch 'v2.5_branch' Conflicts: VERSION docs/src/config/ini_config.txt http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=dc93387 .../common/configurable_options/pyvcp/spindle.xml | 16 + configs/plasma-5i20/README | 13 + configs/plasma-5i20/plasma-5i20.hal | 204 + configs/plasma-5i20/plasma-5i20.ini | 185 + configs/plasma-5i20/plasma-demo.hal | 108 + configs/plasma-5i20/plasma-demo.ini | 108 + configs/plasma-5i20/plasma.txt | 99 + configs/plasma-5i20/plasma.xml | 164 + configs/plasma-5i20/postgui.hal | 16 + configs/plasma-5i20/tool.tbl | 4 + docs/html/gcode.html | 2 +- docs/html/gcode_fr.html | 2 +- docs/man/man1/halui.1 | 505 +- docs/src/common/GPLD_Copyright.txt | 2 +- docs/src/config/ini_config.txt | 39 +- docs/src/config/stepconf.txt | 2 +- docs/src/gcode/main.txt | 28 +- docs/src/gcode/overview.txt | 7 +- docs/src/gui/touchy.txt | 4 + docs/src/hal/components.txt | 66 +- docs/src/ladder/classic_ladder.txt | 18 +- docs/src/lathe/lathe-user.txt | 1 + docs/src/motion/pid_theory.txt | 12 +- nc_files/touchoff.ngc | 18 + nc_files/x-trim.ngc | 16 + src/configure.in | 6 + src/emc/motion/control.c | 25 +- src/emc/rs274ngc/gcodemodule.cc | 4 + src/emc/rs274ngc/interp_arc.cc | 16 +- src/emc/rs274ngc/interp_check.cc | 8 +- src/emc/rs274ngc/interp_convert.cc | 36 +- src/emc/rs274ngc/interp_o_word.cc | 1 + src/emc/rs274ngc/interp_queue.cc | 2 +- src/emc/rs274ngc/rs274ngc_interp.hh | 6 +- .../pncconf/pncconf-help/help-advanced.txt | 4 +- .../pncconf/pncconf-help/help-axisconfig.txt | 62 +- .../pncconf/pncconf-help/help-axismotor.txt | 69 +- .../usr_intf/pncconf/pncconf-help/help-basic.txt | 21 +- .../pncconf/pncconf-help/help-extcontrols.txt | 86 +- src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt | 35 +- .../usr_intf/pncconf/pncconf-help/help-load.txt | 4 + .../usr_intf/pncconf/pncconf-help/help-mesa.txt | 150 +- src/emc/usr_intf/pncconf/pncconf.glade |44527 +++++++++++--------- src/emc/usr_intf/pncconf/pncconf.py | 4374 ++- src/hal/components/mux16.comp | 106 +- src/hal/components/thc.comp | 4 +- src/hal/halmodule.cc | 170 + src/hal/utils/halcmd.c | 4 + src/hal/utils/halcmd_commands.c | 3 +- src/hal/utils/halcmd_completion.c | 8 +- src/hal/utils/halrmt.c | 5 + src/hal/utils/scope_trig.c | 2 - 52 files changed, 28484 insertions(+), 22893 deletions(-) diff --cc docs/src/config/ini_config.txt index 38967b2,651a7aa..b4b20d2 --- a/docs/src/config/ini_config.txt +++ b/docs/src/config/ini_config.txt @@@ -43,10 -63,12 +63,10 @@@ NML: single computer but can be modified to communicate between several computers. - pass:[.emcrc]:: - (((\.emcrc))) This file saves user specific information and is created + emcrc:: + (((.emcrc))) This file saves user specific information and is created to save the name of the directory when the user first selects an EMC - configuration.footnote:[Usually this file is in the users home - directory (e.g. /home/user/ ) - ] + footnote:[Usually this file is in the users home directory (e.g. /home/user/)] Items marked *(hal)* are used only by the sample HAL files and are suggested as a good diff --cc docs/src/lathe/lathe-user.txt index d1bf1c2,f5628c6..43787ca --- a/docs/src/lathe/lathe-user.txt +++ b/docs/src/lathe/lathe-user.txt @@@ -90,10 -46,9 +90,11 @@@ The tool table line may have the follow - Q - tool orientation (lathe only) - integer, 0-9 - ; - beginning of comment - text +The tool orientation (Q field) describes the centerline angle of the tool as + The following figure shows the lathe tool orientations with the center line angle of each orientation and info on FRONTANGLE and BACKANGLE. + The FRONTANGLE and BACKANGLE are clockwise starting at a line parallel to Z+. .Lathe Tool Orientations[[cap:Lathe-Tool-Orientations]] |