[Emc-commit] master: Merge remote branch 'origin/v2.4_branch'

[Jeff E. <gi...@gi...>]

Merge remote branch 'origin/v2.4_branch'

Conflicts:
	VERSION
	debian/changelog
	src/emc/usr_intf/axis/scripts/axis.py
	src/hal/user_comps/devices/Submakefile


http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=f69625b


 configs/sim/axis_9axis.ini                         |    2 +-
 configs/sim/lathe.ini                              |    2 +-
 debian/changelog                                   |   27 +
 debian/emc2.files.in                               |    1 -
 debian/emc2.postinst                               |    2 +-
 docs/man/man1/hal_input.1                          |    2 +-
 docs/man/man1/hal_joystick.1                       |   91 -
 docs/man/man9/encoder.9                            |    1 +
 docs/src/drivers/pluto_p.lyx                       |   12 +-
 docs/src/gcode/main.lyx                            |  180 ++-
 docs/src/hal/components.lyx                        |    5 -
 docs/src/hal/components_fr.lyx                     |    5 -
 scripts/emc.in                                     |    2 +-
 share/axis/images/axis.ngc                         | 3067 +++++++++++++++++---
 src/Makefile.inc.in                                |    1 -
 src/configure.in                                   |   25 +-
 src/emc/task/emccanon.cc                           |   29 +-
 src/emc/usr_intf/axis/scripts/axis.py              |    6 +-
 .../usr_intf/pncconf/pncconf-help/axisdiagram1.png |  Bin 6519 -> 5104 bytes
 src/emc/usr_intf/pncconf/pncconf.py                |   43 +-
 src/hal/components/integ.comp                      |    7 +-
 src/hal/user_comps/devices/Submakefile             |   11 -
 src/hal/user_comps/devices/hal_joystick.c          |  263 --
 src/hal/user_comps/modbus.c                        |    1 +
 src/libnml/rcs/rcs_print.cc                        |   14 +-
 src/rtapi/rtai_rtapi.c                             |    2 +-
 src/rtapi/rtai_ulapi.c                             |   11 +-
 27 files changed, 2958 insertions(+), 854 deletions(-)

diff --cc debian/changelog
index 0ff73b3,828a71a..f507533
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,30 +1,36 @@@
 +emc2 (1:2.5.0~pre) hardy; urgency=low
 +
 +  * (fill out this changelog before releasing) 
 +
 + -- Jeff Epler <je...@un...>  Wed, 03 Feb 2010 18:58:59 -0600
 +
+ emc2 (1:2.4.1) hardy; urgency=low
+ 
+   * tooledit: fix display of angles for lathe tools
+   * tkemc: fix "Tool Table Editor" menu item
+   * tkemc: remove 'balloon' and 'emchelp' menu items which should not have
+     appeared
+   * parport: make it a warning, not an error, if EPP is not detected by Linux
+   * pncconf: various improvements
+   * configs: various improvements to the smithy configurations
+   * axis: fix "touch off" when loaded program starts with "%"
+   * axis: fix click-to-select in preview on Ubuntu 10.04 in
+     focus-follows-mouse mode
+   * axis: new splash screen
+   * hostmot2: fix undesired motion of steppers immediately after enabling them
+   * fixed several buffer overflows in error routines
+   * NURBS: fix several bugs and document it
+   * hal_joystick: remove as it no longer works.  Use hal_input instead.
+   * Documentation improvements
+   * Remove several debugging messages and warnings
+   * Change the default message level from ALL to ERR, which was the default
+     in version 2.3.x.
+   * Locked memory: improve locked memory setup and locked memory error
+     messages
+   * integ: new 'gain' pin
+ 
+  -- Jeff Epler <je...@un...>  Sat, 29 May 2010 10:17:11 -0500
+ 
  emc2 (1:2.4.0) hardy; urgency=low
  
    * configs: add GEOMETRY=AXYZ to Sherline4Axis so A rotates
diff --cc src/emc/usr_intf/axis/scripts/axis.py
index 6cff9f1,7a6857b..3b73753
--- a/src/emc/usr_intf/axis/scripts/axis.py
+++ b/src/emc/usr_intf/axis/scripts/axis.py
@@@ -342,13 -352,24 +342,14 @@@ class MyOpengl(GlCanonDraw, Opengl)
          self.motion_after = None
          self.perspective = False
          Opengl.__init__(self, *args, **kw)
 -        self.bind('<Button-4>', self.zoomin)
 -        self.bind('<Button-5>', self.zoomout)
 -        self.bind('<MouseWheel>', self.zoomwheel)
 +        GlCanonDraw.__init__(self, s, None)
          self.bind('<Button-1>', self.select_prime, add=True)
          self.bind('<ButtonRelease-1>', self.select_fire, add=True)
 -        self.bind('<Button1-Motion>', self.translate_or_rotate)
          self.bind('<Button1-Motion>', self.select_cancel, add=True)
 -        self.bind("<Control-Button-1>", self.start_zoom)
 -        self.bind("<Control-B1-Motion>", self.continue_zoom)
 -        self.bind("<Button-3>", self.start_zoom)
 -        self.bind("<B3-Motion>", self.continue_zoom)
 -        self.bind("<Shift-Button-1>", self.StartRotate)
 -        self.bind("<Shift-B1-Motion>", self.rotate_or_translate)
 -        self.bind("<B2-Motion>", self.rotate_or_translate)
          self.highlight_line = None
          self.select_event = None
-         self.select_primed = False
+         self.select_buffer_size = 100
+         self.select_primed = None
          self.last_position = None
          self.last_homed = None
          self.last_origin = None