Menu
▾
▴
[Emc-commit] master: Merge branch 'master' into gladevcp-modules
|
From: Pavel S. <gi...@gi...> - 2010-11-28 19:42:29
|
Merge branch 'master' into gladevcp-modules http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=ef46724 .gitignore | 3 + configs/smithy/1240.ini | 1 - configs/smithy/1240_4axis.ini | 1 - configs/smithy/1240combined.hal | 228 ++++++++ configs/smithy/1240combined.ini | 239 +++++++++ configs/smithy/1240gecko.ini | 1 - configs/smithy/1240rutex.ini | 1 - configs/smithy/1240rutex_4axis.ini | 1 - configs/smithy/516gecko.ini | 1 - configs/smithy/6130.ini | 1 - configs/smithy/622.ini | 1 - configs/smithy/622_4axis.ini | 1 - configs/smithy/622gecko.ini | 1 - configs/smithy/622leadshine.hal | 7 + configs/smithy/622leadshine.ini | 1 - configs/smithy/622leadshine_4axis.ini | 1 - configs/smithy/924.ini | 1 - configs/smithy/emc.nml | 47 -- docs/man/man9/hostmot2.9 | 17 +- docs/man/man9/pid.9 | 8 + docs/src/Master_Developer.lyx | 184 +++++-- docs/src/gcode/main.lyx | 91 ++-- docs/src/gui/halui.lyx | 5 +- docs/src/hal/pyvcp.lyx | 10 +- docs/src/hal/pyvcp_examples.lyx | 3 +- docs/src/index.tmpl | 2 +- scripts/realtime.in | 5 +- src/Makefile | 15 +- src/Makefile.modinc.in | 3 + src/configure.in | 4 +- src/emc/iotask/ioControl.cc | 8 +- src/emc/kinematics/genserkins.c | 20 +- src/emc/kinematics/genserkins.h | 5 +- src/emc/motion/stashf_wrap.h | 3 - src/emc/motion/usrmotintf.cc | 192 ++++---- src/emc/motion/usrmotintf.h | 4 +- src/emc/nml_intf/emcargs.cc | 5 + src/emc/rs274ngc/interp_o_word.cc | 4 +- src/emc/rs274ngc/rs274ngc_pre.cc | 1 + src/emc/usr_intf/halui.cc | 552 +++++++++----------- .../pncconf/pncconf-help/help-extcontrols.txt | 3 +- src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt | 2 + src/emc/usr_intf/pncconf/pncconf.glade | 13 +- src/emc/usr_intf/pncconf/pncconf.py | 234 ++++++--- src/emc/usr_intf/stepconf/stepconf.py | 26 +- src/emc/usr_intf/touchy/emc_interface.py | 17 +- src/emc/usr_intf/touchy/hal_interface.py | 3 +- src/emc/usr_intf/touchy/touchy.py | 36 ++- src/emc/usr_intf/usrmot.c | 6 +- src/hal/components/near.comp | 15 +- src/hal/components/pid.c | 6 +- src/hal/components/pwmgen.c | 10 +- src/hal/components/time.comp | 88 ++++ src/hal/drivers/hal_ppmc.c | 183 ++++++- src/hal/drivers/mesa-hostmot2/hm2_pci.c | 4 +- src/hal/drivers/mesa-hostmot2/tp_pwmgen.c | 4 - src/hal/drivers/parport_common.h | 23 +- src/hal/hal_lib.c | 7 +- src/hal/halmodule.cc | 7 +- src/hal/user_comps/modbus.c | 5 - src/hal/utils/comp.g | 4 +- src/hal/utils/meter.c | 4 +- src/libnml/buffer/tcpmem.cc | 213 ++++---- src/libnml/cms/cms.cc | 2 +- src/libnml/cms/tcp_srv.cc | 225 ++++----- src/libnml/nml/nml.cc | 2 +- src/libnml/nml/nml_mod.cc | 2 +- src/libnml/nml/nmlmsg.cc | 8 +- src/libnml/os_intf/_shm.c | 2 +- src/libnml/posemath/_posemath.c | 6 +- src/libnml/posemath/posemath.cc | 2 +- src/libnml/posemath/posemath.h | 3 +- src/module_helper/module_helper.c | 2 +- src/rtapi/rtai_rtapi.c | 12 +- src/rtapi/rtai_ulapi.c | 4 +- src/rtapi/rtapi_common.h | 43 +-- src/rtapi/rtapi_rtai_shm_wrap.h | 5 + src/rtapi/rtl_rtapi.c | 2 - src/rtapi/rtl_ulapi.c | 2 - src/rtapi/vsnprintf.h | 5 +- tests/hm2-idrom/broken-load-test.hal | 8 +- tests/hm2-idrom/expected | 2 +- tests/hm2-idrom/skip | 7 +- tests/hm2-idrom/test.sh | 2 +- tests/near.0/README | 1 + tests/near.0/expected | 122 +++++ tests/near.0/runstreamer | 124 +++++ tests/near.0/test.hal | 21 + 88 files changed, 2169 insertions(+), 1036 deletions(-) |