diff options
| author | Sebastian Kuzminsky <seb@highlab.com> | 2013-07-31 09:57:02 -0600 |
|---|---|---|
| committer | Sebastian Kuzminsky <seb@highlab.com> | 2013-07-31 09:57:02 -0600 |
| commit | 46d8ef501d30a396b83e3f85ccc42ddf69a520bb (patch) | |
| tree | c999c04d06da027a7a84c16d34ec98d87f80799a | |
| parent | b64082b49dee06e3cf7840903aa036df58b82b14 (diff) | |
| parent | fe7cfe2407692de76f63d2930893afac7ed0cb0c (diff) | |
| download | linuxcnc-46d8ef501d30a396b83e3f85ccc42ddf69a520bb.tar.gz linuxcnc-46d8ef501d30a396b83e3f85ccc42ddf69a520bb.zip | |
Merge remote-tracking branch 'origin/v2.5_branch'
Conflicts:
VERSION
| -rw-r--r-- | debian/changelog | 30 | ||||
| -rw-r--r-- | docs/man/man9/motion.9 | 2 | ||||
| -rw-r--r-- | docs/src/code/Style_Guide.txt | 14 | ||||
| -rw-r--r-- | docs/src/gui/axis.txt | 6 | ||||
| -rw-r--r-- | docs/src/lathe/lathe-user.txt | 16 | ||||
| -rw-r--r-- | src/hal/drivers/pcl720.comp | 2 |
6 files changed, 60 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 41e629185..d98e368c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +linuxcnc (1:2.5.3) lucid; urgency=low + + * AXIS: fix disable/enable of the toolbar's reload button + * BUILD: fix linking on 32 bit x86 debian 7.1 + * Configs: use names= everywhere to make the sim configs clearer + * Docs: Many improvements + * HAL: clarkeinv: allow rotation of the input vector + * HAL: sim_pin: add support for u32, s32, float types + * HAL: abs_s32: don't unnecessarily require floating point + * HAL: comp: fix option userinit + * HAL: comp: improve handling of build failures and error reporting + * HAL: twopass: improve error reporting + * Hostmot2: fix smart serial port shutdown + * Interpreter: Fix bug 315 part 2, O-call through named parameter + * Kins: replace 5axiskins.c, used by a sample config + * Kins: 5axiskins: remove misleading tool-length pin + * Motion: allow for floating point in the base thread + * PPMC: add encoder timestamp velocity estimation + * PPMC: selectable encoder filter clock + * PyVCP: fix several behaviors in the dial widget + * Task: fix MDI-queueing problems + * USC: new sample config for Pico USC with encoders + * linuxcncrsh: many stability fixes + * pncconf: fix 5i25 GPIO numbering + * pncconf: fix default PDM rate + * pncconf: fix open loop test + * pncconf: fix incorrect zh_CN translation which broke millimeter mode + + -- Chris Radek <chris@timeguy.com> Tue, 23 Jul 2013 12:34:46 -0500 + linuxcnc (1:2.5.2) lucid; urgency=low * AXIS: Allow the setting of the top end of the Max Velocity slider diff --git a/docs/man/man9/motion.9 b/docs/man/man9/motion.9 index a03b475fb..212418461 100644 --- a/docs/man/man9/motion.9 +++ b/docs/man/man9/motion.9 @@ -90,7 +90,7 @@ Should be driven TRUE if the positive limit switch for this joint is tripped. .TP \fBaxis.\fIN\fB.unlock\fR OUT BIT -TRUE if the axis is a locked rotary and a move is commaned. +TRUE if the axis is a locked rotary and a move is commanded. .TP \fBmotion.adaptive-feed\fR IN FLOAT diff --git a/docs/src/code/Style_Guide.txt b/docs/src/code/Style_Guide.txt index 2a941ddcf..edbe44f10 100644 --- a/docs/src/code/Style_Guide.txt +++ b/docs/src/code/Style_Guide.txt @@ -32,7 +32,9 @@ Put the opening brace last on the line, and put the closing brace first: [source,c] ---- -if(x) { +if (x) { + // do something appropriate +} ---- The closing brace is on a line of its own, except in the cases where @@ -42,13 +44,21 @@ in a do-statement or an 'else' in an if-statement, like this: [source,c] ---- do { + // something important +} while (x > 0); ---- and [source,c] ---- -if(x == y) { +if (x == y) { + // do one thing +} else if (x < y) { + // do another thing +} else { + // do a third thing +} ---- This brace-placement also minimizes the number of empty (or almost diff --git a/docs/src/gui/axis.txt b/docs/src/gui/axis.txt index 4851465e5..ea033250f 100644 --- a/docs/src/gui/axis.txt +++ b/docs/src/gui/axis.txt @@ -79,6 +79,8 @@ The AXIS window contains the following elements: === Menu Items +[[sec:axis-menu]] (((Axis Menu))) + Some menu items might be grayed out depending on how you have your .ini file configured. For more information on configuration see the Integrator Manual. @@ -175,7 +177,9 @@ Do not use 'Run From Selected Line' if your g code program contains subroutin * 'Zero Coordinate System' - Clear (set to zero) a chosen offset. -* 'Tool touch off to workpiece' - When performing Touch Off, the value +[[sec:tool-touch-off]] (((Tool Touch Off))) + +* 'Tool touch off to workpiece' - When performing Touch Off, the value entered is relative to the current workpiece ('G5x') coordinate system, as modified by the axis offset ('G92'). When the Touch Off is complete, the Relative coordinate for the chosen axis will become the value entered. diff --git a/docs/src/lathe/lathe-user.txt b/docs/src/lathe/lathe-user.txt index 747b4b12d..b691d1a00 100644 --- a/docs/src/lathe/lathe-user.txt +++ b/docs/src/lathe/lathe-user.txt @@ -82,9 +82,15 @@ image::images/tool_pos_8.png[] == Tool Touch Off When running in lathe mode in AXIS you can set the X and Z in the tool -table using the Touch Off window. +table using the Touch Off window. If you have a tool turret you normally +have 'Touch off to fixture' selected when setting up your turret. When +setting the material Z zero you have 'Touch off to material' selected. +For more information on the G codes used for tools see +<<sec:M6-Tool-Change,M6>>, <<sec:T-Select-Tool,Tn>>, and <<sec:G43,G43>>. +For more information on tool touch off options in Axis see +<<sec:tool-touch-off,Tool Touch Off>>. -=== The X Tool Offset +=== X Touch Off The X axis offset for each tool is normally an offset from the center line of the spindle. @@ -105,7 +111,7 @@ so the current tool is the current offset. A typical session might be: . Home each axis if not homed. - . Set the current tool with "Tn M6" where "n" is the tool number. + . Set the current tool with 'Tn M6 G43' where 'n' is the tool number. . Select the X axis in the Manual Control window. . Move the X to a known position or take a test cut and measure the diameter. . Select Touch Off and pick Tool Table then enter the position or the diameter. @@ -113,7 +119,7 @@ A typical session might be: Note: if you are in Radius Mode you must enter the radius, not the diameter. -=== The Z Tool Offset +=== Z Touch Off The Z axis offsets can be a bit confusing at first because there are two elements to the Z offset. @@ -129,7 +135,7 @@ A typical session might be: . Home each axis if not homed. . Make sure no offsets are in effect for the current coordinate system. - . Set the current tool with "TnM6" where "n" is the tool number. + . Set the current tool with 'Tn M6 G43' where 'n' is the tool number. . Select the Z axis in the Manual Control window. . Bring the tool close to the control surface. Using a cylinder move the Z away from the control surface until the cylinder just passes between diff --git a/src/hal/drivers/pcl720.comp b/src/hal/drivers/pcl720.comp index 35fbca946..4e6da8bed 100644 --- a/src/hal/drivers/pcl720.comp +++ b/src/hal/drivers/pcl720.comp @@ -61,7 +61,7 @@ FUNCTION(read){ for (i = 0;i <= 31;i++){ pin_in(i) = R & (1 << i); - pin_in_not(i) = ~pin_in(i); + pin_in_not(i) = !pin_in(i); } } |