From: Chris R. <gi...@gi...> - 2011-11-08 04:25:03
|
Merge branch 'v2.5_branch' Conflicts: docs/src/gcode/main.txt docs/src/gcode/overview.txt http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=cda0ca5 docs/rtfaults.txt | 14 +- docs/src/common/Glossary.txt | 4 +- docs/src/common/Glossary_de.txt | 4 +- docs/src/common/Glossary_es.txt | 4 +- docs/src/common/Glossary_fr.txt | 4 +- docs/src/common/Linux_FAQ.txt | 36 +- docs/src/common/Linux_FAQ_de.txt | 40 +- docs/src/common/Linux_FAQ_es.txt | 40 +- docs/src/common/Linux_FAQ_fr.txt | 40 +- docs/src/common/machining_center.txt | 45 +- docs/src/common/machining_center_de.txt | 45 +- docs/src/common/machining_center_es.txt | 45 +- docs/src/common/machining_center_fr.txt | 42 +- docs/src/common/userforeword_fr.txt | 2 +- docs/src/config/ini_config.txt | 31 +- docs/src/config/ini_config_de.txt | 27 +- docs/src/config/ini_config_es.txt | 31 +- docs/src/config/ini_config_fr.txt | 36 +- docs/src/config/pncconf.txt | 9 +- docs/src/config/pncconf_de.txt | 854 +++++++++++++++++++- docs/src/config/pncconf_es.txt | 854 +++++++++++++++++++- docs/src/config/pncconf_fr.txt | 883 +++++++++++++++++++- docs/src/examples/gs2_example.txt | 2 +- docs/src/examples/gs2_example_de.txt | 2 +- docs/src/examples/gs2_example_es.txt | 2 +- docs/src/examples/gs2_example_fr.txt | 2 +- docs/src/examples/spindle.txt | 18 +- docs/src/examples/spindle_de.txt | 18 +- docs/src/examples/spindle_es.txt | 18 +- docs/src/examples/spindle_fr.txt | 167 +++- docs/src/gcode/coordinates.txt | 8 +- docs/src/gcode/coordinates_de.txt | 8 +- docs/src/gcode/coordinates_es.txt | 8 +- docs/src/gcode/coordinates_fr.txt | 2 + docs/src/gcode/main.txt | 332 ++++++-- docs/src/gcode/main_de.txt | 332 ++++++-- docs/src/gcode/main_es.txt | 394 +++++++--- docs/src/gcode/main_fr.txt | 300 ++++++-- docs/src/gcode/overview.txt | 37 +- docs/src/gcode/overview_de.txt | 40 +- docs/src/gcode/overview_es.txt | 40 +- docs/src/gcode/overview_fr.txt | 56 +- docs/src/gcode/tool_compensation.txt | 10 +- docs/src/gcode/tool_compensation_de.txt | 10 +- docs/src/gcode/tool_compensation_es.txt | 10 +- docs/src/gcode/tool_compensation_fr.txt | 16 +- docs/src/gui/axis.txt | 48 +- docs/src/gui/axis_de.txt | 48 +- docs/src/gui/axis_es.txt | 48 +- docs/src/gui/axis_fr.txt | 59 +- docs/src/gui/gladevcp.txt | 58 +- docs/src/gui/gladevcp_de.txt | 1090 ++++++++++++++++--------- docs/src/gui/gladevcp_es.txt | 1090 ++++++++++++++++--------- docs/src/gui/gladevcp_fr.txt | 1090 ++++++++++++++++--------- docs/src/gui/halui.txt | 13 +- docs/src/gui/halui_de.txt | 13 +- docs/src/gui/halui_es.txt | 13 +- docs/src/gui/halui_fr.txt | 13 +- docs/src/hal/basic_hal.txt | 11 +- docs/src/hal/basic_hal_de.txt | 11 +- docs/src/hal/basic_hal_es.txt | 11 +- docs/src/hal/basic_hal_fr.txt | 38 +- docs/src/hal/comp.txt | 4 +- docs/src/hal/comp_de.txt | 4 +- docs/src/hal/comp_es.txt | 4 +- docs/src/hal/comp_fr.txt | 22 +- docs/src/hal/general_ref.txt | 8 +- docs/src/hal/general_ref_de.txt | 8 +- docs/src/hal/general_ref_es.txt | 8 +- docs/src/hal/general_ref_fr.txt | 4 +- docs/src/hal/intro.txt | 8 +- docs/src/hal/intro_de.txt | 8 +- docs/src/hal/intro_es.txt | 8 +- docs/src/hal/parallel_port.txt | 7 +- docs/src/hal/parallel_port_de.txt | 7 +- docs/src/hal/parallel_port_es.txt | 7 +- docs/src/hal/parallel_port_fr.txt | 7 +- docs/src/hal/pyvcp.txt | 7 +- docs/src/hal/pyvcp_de.txt | 7 +- docs/src/hal/pyvcp_es.txt | 7 +- docs/src/hal/pyvcp_examples.txt | 3 +- docs/src/hal/pyvcp_examples_de.txt | 3 +- docs/src/hal/pyvcp_examples_es.txt | 3 +- docs/src/hal/pyvcp_examples_fr.txt | 3 +- docs/src/hal/pyvcp_fr.txt | 16 +- docs/src/hal/tools.txt | 7 +- docs/src/hal/tools_de.txt | 7 +- docs/src/hal/tools_es.txt | 7 +- docs/src/hal/tools_fr.txt | 7 +- docs/src/lathe/lathe-user.txt | 8 +- docs/src/lathe/lathe-user_de.txt | 8 +- docs/src/lathe/lathe-user_es.txt | 8 +- docs/src/lathe/lathe-user_fr.txt | 4 +- docs/src/motion/kinematics.txt | 6 +- docs/src/motion/kinematics_de.txt | 6 +- docs/src/motion/kinematics_es.txt | 6 +- docs/src/motion/kinematics_fr.txt | 6 +- docs/src/motion/tweaking_steppers.txt | 4 +- docs/src/motion/tweaking_steppers_de.txt | 4 +- docs/src/motion/tweaking_steppers_es.txt | 4 +- docs/src/motion/tweaking_steppers_fr.txt | 4 +- docs/src/quickstart/stepper_quickstart.txt | 8 +- docs/src/quickstart/stepper_quickstart_de.txt | 8 +- docs/src/quickstart/stepper_quickstart_es.txt | 8 +- docs/src/quickstart/stepper_quickstart_fr.txt | 8 +- src/Makefile | 1 + src/emc/usr_intf/pncconf/pncconf.py | 70 ++- src/hal/drivers/mesa-hostmot2/hostmot2.h | 73 ++- src/hal/drivers/mesa-hostmot2/mesa_7i64.c | 82 ++- src/hal/drivers/mesa-hostmot2/mesa_8i20.c | 93 ++- src/hal/drivers/mesa-hostmot2/mesa_autoconf.c | 765 +++++++++++++++++ src/hal/drivers/mesa-hostmot2/sserial.c | 336 ++++++--- 112 files changed, 8083 insertions(+), 2204 deletions(-) diff --cc docs/src/gcode/main.txt index 4863bcc,081da78..5c800bc --- a/docs/src/gcode/main.txt +++ b/docs/src/gcode/main.txt @@@ -1,8 -1,5 +1,9 @@@ +:ini: {basebackend@docbook:'':ini} +:hal: {basebackend@docbook:'':hal} +:ngc: {basebackend@docbook:'':ngc} + - = G Code Reference(((G Codes))) + = G Code Reference + (((G Codes))) Conventions used in this section @@@ -1705,13 -1814,11 +1818,16 @@@ after the M2 or M30 command is executed Pressing cycle start will start the program at the beginning of the file. +To abort a program if an error condition is detected in an oword NGC +routine, consider using the <<sub:Abort-with-message,ABORT>> +statement. + + == M3, M4, M5 Spindle Control[[sec:M3-M4-M5]] - (((M3 Spindle CW)))(((M4 Spindle CCW)))(((M5 Spindle Stop))) + + (((M3 Spindle CW))) + (((M4 Spindle CCW))) + (((M5 Spindle Stop))) To start the spindle clockwise at the "S" speed, program `M3`. + To start the spindle counterclockwise at the "S" speed, program `M4`. + @@@ -1777,50 -1889,11 +1898,52 @@@ To turn all coolant off, program `M9` It is always OK to use any of these commands, regardless of what coolant is on or off. +== M19 Orient Spindle [[sec:M19]] +(((M19 Orient Spindle))) + +To start spindle orientation mode, program `M19`. + + M19 R- P- Q- + + - The optional R- word specifies the desired angle in degrees (default 0). + - The optional P- word specifies the rotation direction (default 0). + - The optional Q- word specifies the timeout ins seconds to wait for orient to complete. + +M19 cancels spindle rotation mode and enters spindle orientation +mode. M19 turns off the spindle, unlocks the spindle brake and then starts the +orientation HAL pin protocol. See the motion manpage for the pin +description. + +The P parameter is interpreted as follows: + + - 0: rotate clockwise or counterclockwise for smallest angular movement + - 1: always rotate clockwise + - 2: always rotate counterclockwise + +Any M3,M4,M5 spindle command will cancel spindle orientation mode and +switch back to rotation mode, which is the default. + +The `[RS274NGC]ORIENT_OFFSET` value from the ini file is added to the +R word to define an arbitrary zero position. + +The Q word commands the spindle orient support to wait for the orient +cycle to complete. If no Q word is given, the orient cycle is +initiated but not waited for in order to allow parallel operations of +e.g. a rapid move and a spindle orient. + +An `M19` command with just a `Q` word, but no `R` and `P` words will +wait for the last M19 cycle to complete, which is considered complete +when the HAL logic asserts `motion.spindle-locked`. + +It is an error to specify a Q value less than 0. + +M19 is a modal group 7 command (same as M3,M4,M5). + - == Overrides [[sec:Overrides]] + == M48-M53 Overrides[[sec:Overrides]] - === M48, M49 Override Control[[sub:M48-Both-Override]][[sub:M49-Neither-Override]](((M48, M49 Override Control))) + === M48, M49 Override Control[[sub:M48-Both-Override]][[sub:M49-Neither-Override]] + + (((M48, M49 Override Control))) To enable the spindle speed and feed rate override controls, program `M48`. To disable both controls, program `M49`. @@@ -1980,9 -2071,10 +2121,12 @@@ more information on the Motion Controll M64-65. See the M62-65 section for information about immediate output commands. +include::saverestore.txt[] + - == M100 to M199 User Defined Commands[[sec:M100-to-M199]](((M100 to M199 User Defined Commands))) + == M100 to M199 User Defined Commands[[sec:M100-to-M199]] + + (((M100 to M199 User Defined Commands))) + (((User Defined Commands M100-M199))) To invoke a user-defined command, program `M1nn P- Q-` where `P-` and `Q-` are both optional and must be a number. The external program "M1nn" @@@ -2109,9 -2179,9 +2257,11 @@@ of parameters above #30 and those chang calling code. Subroutines may also change the value of global named parameters. + + - == Looping: do, while, endwhile, break, continue (((Looping: do, while, endwhile, break, continue))) + == Looping: do, while, endwhile, break, continue + (((Looping: do, while, endwhile, break, continue))) + (((do)))(((while)))(((endwhile)))(((break)))(((continue))) The "while loop" has two structures: while/endwhile, and do/while. In each case, the loop is exited when the "while" condition evaluates to diff --cc docs/src/gcode/overview.txt index 901399d,3b0697a..32332ff --- a/docs/src/gcode/overview.txt +++ b/docs/src/gcode/overview.txt @@@ -1,12 -1,4 +1,12 @@@ +:ini: {basebackend@docbook:'':ini} +:hal: {basebackend@docbook:'':hal} +:ngc: {basebackend@docbook:'':ngc} +// begin a listing of ini/hal/ngc files like so: +//[source,{ini}] +//[source,{hal}] +//[source,{ngc}] + - = G Code Overview [[cha:Language-Overview]] + = G Code Overview[[cha:Language-Overview]] The EMC2 G Code language is based on the RS274/NGC language. The G Code language is based on lines of code. Each line (also called a @@@ -241,107 -169,28 +244,107 @@@ parameter 1, no the value found in parameter 3. Of course, `#[1+2]` does mean the value found in parameter 3. The `#` character may be repeated; for example `##2` means the value of the parameter whose index is the - (integer) value - of parameter 2. + (integer) value of parameter 2. -The interpreter maintains a number of read-only parameters for a loaded -tool: +31-5000:: + G-Code user parameters. These parameters are global in the G Code file, + and available for general use. Volatile. + +5061-5069:: + Coordinates of a "G38.2" Probe result - X, Y, Z, A, B, C, U, V & W. + Volatile. + +5070:: + "G38" probe result - 1 if success, 0 if probe failed to close. + Used with G38.3 and G38.5. Volatile. + +5161-5169:: + "G28" Home for X, Y, Z, A, B, C, U, V & W. Persistent. + +5181-5189:: + "G30" Home for X, Y, Z, A, B, C, U, V & W. Persistent. + +5211-5219:: + "G92" offset for X, Y, Z, A, B, C, U, V & W. Persistent. + +5220:: + Coordinate System number 1 - 9 for G54 - G59.3. + +5221-5229:: + Coordinate System 1, G54 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5241-5249:: + Coordinate System 2, G55 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5261-5269:: + Coordinate System 3, G56 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5281-5289:: + Coordinate System 4, G57 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5301-5309:: + Coordinate System 5, G58 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5321-5329:: + Coordinate System 6, G59 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5341-5349:: + Coordinate System 7, G59.1 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5361-5369:: + Coordinate System 8, G59.2 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5381-5389:: + Coordinate System 9, G59.3 for X, Y, Z, A, B, C, U, V & W. Persistent. + +5399:: + Result of M66 - Check or wait for input. Volatile. + +5400:: + Tool Number. Volatile. + +5401-5409:: + Tool Offsets for X, Y, Z, A, B, C, U, V & W. Volatile. + +5410:: + Tool Diameter. Volatile. + +5411:: + Tool Front Angle. Volatile. + +5412:: + Tool Back Angle. Volatile. + +5413:: + Tool Orientation. Volatile. + +5420-5428:: + Current Position including all offsets and in the current program + units for X, Y, Z, A, B, C, U, V & W. In absolute machine coordinates, + volatile. + +5599:: + flag for controlling the output of (DEBUG,) statements. + 1=output, 0=no output; default=1. Volatile. + +5600:: + toolchanger fault indicator. Used with the iocontrol-v2 component. + 1: toolchanger faulted, 0: normal. Volatile. + +5601:: + toolchanger fault code. Used with the iocontrol-v2 component. + Reflects the value of the `toolchanger-reason` HAL pin if a fault occured. + Volatile. + +=== Subroutine Parameters [[sub:Subroutine-Parameters]] + +1-30:: + Subroutine local parameters of call arguments. These parameters are + local to the subroutine. Volatile. See also the chapter on <<cha:O-Codes,O-Codes>>. - - #5400 Tool number - - #5401 Tool X offset - - #5402 Tool Y offset - - #5403 Tool Z offset - - #5404 Tool A offset - - #5405 Tool B offset - - #5406 Tool C offset - - #5407 Tool U offset - - #5408 Tool V offset - - #5409 Tool W offset - - #5410 Tool Diameter - - #5411 Tool Frontangle - - #5412 Tool Backangle - - #5413 Tool Orientation - === Named Parameters [[sub:Named-Parameters]] + [[sub:Named-Parameters]] + == Named Parameters Named parameters work like numbered parameters but are easier to read. All parameter names are converted to lower case and have spaces and @@@ -373,250 -221,28 +376,251 @@@ Examples - Mixed literal and named parameters - o100 call [0.0] [0.0] [#<_inside_cutout>-#<_endmill_dia>] [#<_Zcut>] [#<_feedrate>] + ` o100 call [0.0] [0.0] [#<_inside_cutout>-#<_endmill_dia>] [#<_Zcut>] [#<_feedrate>]` + +Named parameters spring into existence when they are assigned a value +for the first time. Local named parameters vanish when their scope is +left: when a subroutine returns, all its local parameters are deleted +and cannot be referred to anymore. -Notes: +It is an error to use a non-existent named paramater within an +expression, or at the right-hand side of an assignment. Printing the +value of a non-existent named parameter with a DEBUG statement - like +'(DEBUG, #<no_such_parameter>)' will display the string +++######+++. -The global parameters _a, _b, _c, ... _z have been reserved for -special use. In the future, they may provide access to the last Aword, -Bword, Cword, etc. +Global parameters, as well as local parameters assigned to at the +global level, retain their value once assigned even when the program +ends, and have these values when the program is run again. -[[sec:System-Parameters]] -=== System Parameters +The <<EXISTS-Function,'EXISTS' function>> tests whether a given named parameter exists. -Two global read only named parameters are available to check which -version is running from G Code. +=== Predefined Named Parameters [[sec:Predefined-Named-Parameters]] + +The following global read only named parameters are available to +access internal state of the interpreter and machine state. They can +be used in arbitrary expressions, for instance to control flow of the +program with if-then-else statements. #<_vmajor>:: - Major package version. If current version was 2.6.2 would return 2.6. + Major package version. If current version was 2.6.2 it would return 2.6. #<_vminor>:: - Minor package version. If current version was 2.6.2 would return 0.2. + Minor package version. If current version was 2.6.2 it would return 0.2. + +#<_line>:: + Sequence number. If running a G-Code file, this returns the current line number. + +#<_motion_mode>:: + Return the interpreter's current motion mode: +[width="20%",options="header"] +|======================================== +|Motion mode | return value +|G1| 10 +|G2| 20 +|G3| 30 +|G33| 330 +|G38.2| 382 +|G38.3| 383 +|G38.4| 384 +|G38.5| 385 +|G5.2| 52 +|G73| 730 +|G76| 760 +|G80| 800 +|G81| 810 +|G82| 820 +|G83| 830 +|G84| 840 +|G85| 850 +|G86| 860 +|G87| 870 +|G88| 880 +|G89| 890 +|======================================== +#<_plane>:: + returns the value designating the current plane: +[width="20%",options="header"] +|======================================== +|Plane | return value +|G17| 170 +|G18| 180 +|G19| 190 +|G17.1| 171 +|G18.1| 181 +|G19.1| 191 +|======================================== + + +#<_ccomp>:: + Status of cutter compensation. Return values: +[width="20%",options="header"] +|======================================== +|Mode | return value +|G40 | 400 +|G41 | 410 +|G41.1| 411 +|G41 | 410 +|G42 | 420 +|G42.1 | 421 +|======================================== + +#<_metric>:: + Return 1 if G21 is on, else 0. + +#<_imperial>:: + Return 1 if G20 is on, else 0. + +#<_absolute>:: + Return 1 if G90 is on, else 0. + +#<_incremental>:: + Return 1 if G91 is on, else 0. + +#<_inverse_time>:: + Return 1 if inverse feed mode (G93) is on, else 0. + +#<_units_per_minute>:: + Return 1 if Units/minute feed mode (G94) is on, else 0. + +#<_units_per_rev>:: + Return 1 if Units/revolution mode (G95) is on, else 0. + +#<_coord_system>:: + Return index of the current coordinate system (G54..G59.3) +[width="20%",options="header"] +|======================================== +|Mode | return value +|G54| 0 +|G55| 1 +|G56| 2 +|G57| 3 +|G58| 4 +|G59| 5 +|G59.1|6 +|G59.2|7 +|G59.3|8 +|======================================== + +#<_tool_offset>:: + Return 1 if tool offset (G43) is on, else 0. + +#<_retract_r_plane>:: + Return 1 if G98 is set, else 0. + +#<_retract_old_z>:: + Return 1 if G99 is on, else 0. + +#<_spindle_rpm_mode>:: + Return 1 if spindle rpm mode (G97) is on, else 0. + +#<_spindle_css_mode>:: + Return 1 if constant surface speed mode (G96) is on, else 0. + +#<_ijk_absolute_mode>:: + Return 1 if Absolute Arc distance mode (G90.1) is on, else 0. + +#<_lathe_diameter_mode>:: + Return 1 if this is a lathe configuration and diameter (G7) mode is on, else 0. + +#<_lathe_radius_mode>:: + Return 1 if this is a lathe configuration and radius (G8) mode is on, else 0. + +#<_spindle_on>:: + Return 1 if spindle currently running (M3 or M4) else 0. + +#<_spindle_cw>:: + Return 1 if spindle direction is clockwise (M3) else 0. + +#<_mist>:: + Return 1 if mist (M7) is on. + +#<_flood>:: + Return 1 if flood (M8) is on. + +#<_speed_override>:: + Return 1 if feed override (M48 or M50 P1) is on, else 0. + +#<_feed_override>:: + Return 1 if feed override (M48 or M51 P1) is on, else 0. + +#<_adaptive_feed>:: + Return 1 if adaptive feed (M52 or M52 P1) is on, else 0. + +#<_feed_hold>:: + Return 1 if feed hold switch is enabled (M53 P1), else 0. + +#<_feed>:: + Return the current feed value (F). + +#<_rpm>:: + Return the current spindle speed (S). + +#<_x>:: + Return absolute machine X coordinate. Same as #5420. + +#<_y>:: + Return absolute machine Y coordinate. Same as #5421. + +#<_z>:: + Return absolute machine Z coordinate. Same as #5422. + +#<_a>:: + Return absolute machine A coordinate. Same as #5423. + +#<_b>:: + Return absolute machine B coordinate. Same as #5424. + +#<_c>:: + Return absolute machine C coordinate. Same as #5425. + +#<_u>:: + Return absolute machine U coordinate. Same as #5426. + +#<_v>:: + Return absolute machine V coordinate. Same as #5427. + +#<_w>:: + Return absolute machine W coordinate. Same as #5428. + +#<_current_tool>:: + Return number of the current tool in spindle. Same as #5400. + +#<_current_pocket>:: + Return pocket number of the current tool. + +#<_selected_tool>:: + Return number of the selected tool post a T code. Default -1. + +#<_selected_pocket>:: + Return number of the selected pocket post a T code. Default -1 + (no pocket selected). + +#<_value>:: [[param:_value]] + Return value from the last O-word `return` or `endsub`. Default + value 0 if no expression after `return` or `endsub`. Initialized + to 0 on program start. See also + <<sec:Subroutine-return-values,Subroutine return values>>. + +#<_value_returned>:: + 1.0 if the last O-word `return` or `endsub` returned a value, 0 + otherwise. Cleared by the next O-word call. + +#<_task>:: + 1.0 if the executing interpreter instance is part of milltask, 0.0 + otherwise. Sometimes it is necessary to treat this case specially + to retain proper preview, for instance when testing the success of + a probe (G38.x) by inspecting #5070, which will always fail in the + preview interpreter (e.g. Axis). + +#<_call_level>:: + current nesting level of O-word procedures. For debugging. + +#<_remap_level>:: + current level of the remap stack. Each remap in a block adds one + to the remap level. For debugging. - == Expressions [[sub:Expressions]] + [[sub:Expressions]] + == Expressions An expression is a set of characters starting with a left bracket `[` and ending with a balancing right bracket `]` . In between the brackets @@@ -666,25 -293,18 +671,26 @@@ false, and any non-zero number is equiv |AND OR XOR | 'lowest' |======================================== +=== Equality and floating-point values + +The RS274/NGC language only supports floating-point values of finite +precision. Therefore, testing for equality or inequality of two +floating-point values is inherently problematic. The interpreter +solves this problem by considering values equal if their absolute +difference is less than 0.0001 (this value is defined as +`TOLERANCE_EQUAL` in src/emc/rs274ngc/interp_internal.h). + - == Functions [[sub:Unary-Operation-Value]] + [[sub:Unary-Operation-Value]] + == Functions A function is either "`ATAN` " followed by one expression divided by -another expression (for - example "`ATAN[2]/[1+3]`") or any other function name followed by an -expression (for example "`SIN[90]` "). The available functions are -shown in table <<cap:Functions>>. - Arguments to unary operations which take angle measures (`COS`, `SIN`, -and `TAN` ) are in degrees. Values returned by unary operations which -return -angle measures (`ACOS`, `ASIN`, and `ATAN`) are also in degrees. +another expression (for example "`ATAN[2]/[1+3]`") or any other +function name followed by an expression (for example "`SIN[90]` +"). The available functions are shown in table +<<cap:Functions,Functions>>. Arguments to unary operations which take +angle measures (`COS`, `SIN`, and `TAN` ) are in degrees. Values +returned by unary operations which return angle measures (`ACOS`, +`ASIN`, and `ATAN`) are also in degrees. .Functions[[cap:Functions]] @@@ -889,7 -490,9 +897,9 @@@ size. The preview can be turned off in part programs. In Axis sections of the preview can be turned off using special comments. - == G Code Order of Execution[[sec:Order-of-Execution]](((G Code Order of Execution))) + [[sec:Order-of-Execution]] -= G Code Order of Execution ++== G Code Order of Execution + (((G Code Order of Execution))) The order of execution of items on a line is defined not by the position of each item on the line, but by the following list: @@@ -918,12 -520,13 +928,13 @@@ . Set retract mode (G98, G99). . Go to reference location (G28, G30) or change coordinate system data (G10) or set axis offsets (G92, G92.1, G92.2, G94). - . Perform motion (G0 to G3, G33, G73, G76, G80 to G89), as modified (possibly) by G53. + . Perform motion (G0 to G3, G33, G38.x, G73, G76, G80 to G89), as modified (possibly) by G53. . Stop (M0, M1, M2, M30, M60). - == G Code Best Practices (((G Code Best Practices))) -= G Code Best Practices ++== G Code Best Practices + (((G Code Best Practices))) -== Use an appropriate decimal precision +=== Use an appropriate decimal precision Use at least 3 digits after the decimal when milling in millimeters, and at least 4 digits after the decimal when milling in inches. diff --cc docs/src/quickstart/stepper_quickstart_fr.txt index 991fea6,084e76d..b940c1c --- a/docs/src/quickstart/stepper_quickstart_fr.txt +++ b/docs/src/quickstart/stepper_quickstart_fr.txt @@@ -12,16 -12,24 +12,20 @@@ Le test de latence détermine la capaci requêtes qui lui sont faites. Certains matériels peuvent interrompre ce processus, causant des pertes de pas lorsqu'ils pilotent une machine CNC. Ce test est la toute première chose à faire pour valider un PC. -Pour le lancer, suivre les instructions de la -section (<<sec:Test-de-latence-GS>>). +Pour le lancer, suivre les instructions de la section (<<sec:Test-de-latence-GS>>). - == Sherline[[sec:Sherline]](((Sherline))) + [[sec:Sherline]] + == Sherline + (((Sherline))) -Si vous avez un Sherline plusieurs configurations prédéfinies sont fournies. -Ceci est le menu principal du CNC/EMC puis choisissez la configuration Sherline -que le vôtre allumettes et enregistrer une copie. +Si vous avez une machine Sherline plusieurs configurations prédéfinies sont fournies. +Au premier démarrage d'EMC2, le sélecteur de configuration s'ouvre, sélectionnez alors le modèle correspondant à votre machine Sherline, puis acceptez d'enregistrez une copie. - == Xylotex[[sec:Xylotex]](((Xylotex))) + [[sec:Xylotex]] + == Xylotex + (((Xylotex))) -Si vous avez un Xylotex vous pouvez sauter les sections suivantes et aller -directement à l'Assistant de configuration pas à pas dans la section (<<cha:Assistant-graphique-pas-a-pas>>). -EMC a fourni une installation rapide pour les machines Xylotex. +Si vous avez une machine Xylotex vous pouvez utiliser l'assistant graphique de configuration fourni par EMC2 et créer rapidement votre configuration personnalisée (<<cha:Assistant-graphique-pas-a-pas>>). == Informations relatives à la machine |