Menu
▾
▴
[Emc-commit] 3x20: merge
|
From: Sebastian K. <gi...@gi...> - 2009-11-29 01:56:13
|
merge http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=1840597 .gitignore | 1 + configs/5axis/5axis.tbl | 12 +- configs/Sherline3Axis/stepper.tbl | 13 +- configs/Sherline4Axis/stepper.tbl | 12 +- configs/SherlineLathe/stepper.tbl | 13 +- configs/boss/boss.tbl | 12 +- configs/classicladder/cl-estop/tool.tbl | 14 +- .../configurable_options/pyvcp/parportpanel.xml | 16 +- configs/common/tool.tbl | 12 +- configs/cooltool/stepper.tbl | 13 +- configs/dallur-thc/dallur-advanced.tbl | 12 +- configs/demo_mazak/demo_mazak.tbl | 13 +- configs/demo_sim_cl/demo_sim_cl.tbl | 12 +- configs/demo_step_cl/demo_step_cl.tbl | 12 +- configs/etch-servo/etch.tbl | 12 +- configs/halui_pyvcp/sim.tbl | 12 +- configs/hexapod-sim/hexapod.tbl | 12 +- configs/hm2-servo/4i65.ini | 91 +- configs/hm2-servo/4i68.ini | 91 +- configs/hm2-servo/5i20.ini | 91 +- configs/hm2-servo/5i22-big.ini | 91 +- configs/hm2-servo/5i22-small.ini | 91 +- configs/hm2-servo/5i23.ini | 91 +- configs/hm2-servo/7i43-big.ini | 91 +- configs/hm2-servo/7i43-small.ini | 91 +- configs/hm2-servo/README | 14 +- configs/hm2-servo/hm2-servo.hal | 30 + configs/hm2-servo/tool.tbl | 13 +- configs/hm2-stepper/tool.tbl | 13 +- configs/lathe-pluto/emc.tbl | 32 +- configs/m5i20/m5i20.tbl | 12 +- configs/max/max.tbl | 12 +- configs/motenc/motenc.tbl | 12 +- configs/nist-lathe/nist-lathe.tbl | 32 +- configs/plasma-thc-sim/torches.tbl | 12 +- configs/plasma-thc/torches.tbl | 12 +- configs/ppmc/ppmc.tbl | 12 +- configs/puma/puma.tbl | 12 +- configs/scara/scara.tbl | 12 +- configs/sim/axis.ini | 10 +- configs/sim/axis_9axis.ini | 1 + configs/sim/lathe.tbl | 21 +- configs/sim/random_tc.ini | 211 + configs/sim/servo_sim.hal | 26 +- configs/sim/sim.tbl | 12 +- configs/sim/sim_mm.tbl | 13 +- configs/sim/simpockets.tbl | 6 + configs/sim/touchy.ini | 138 + configs/smithy/1240.hal | 2 +- configs/smithy/1240.ini | 24 +- configs/smithy/1240_4axis.hal | 183 + configs/smithy/1240_4axis.ini | 216 + configs/smithy/1240eztrol.hal | 14 +- configs/smithy/1240gecko.ini | 2 +- configs/smithy/1240rutex.hal | 8 +- configs/smithy/1240rutex.ini | 2 +- configs/smithy/1240rutex_4axis.hal | 8 +- configs/smithy/1240rutex_4axis.ini | 2 +- configs/smithy/516gecko.hal | 121 + configs/smithy/516gecko.ini | 216 + configs/smithy/6130.hal | 4 +- configs/smithy/622.hal | 7 +- configs/smithy/622.ini | 2 +- configs/smithy/622_4axis.hal | 7 +- configs/smithy/622_4axis.ini | 11 +- configs/smithy/622eztrol.hal | 14 +- configs/smithy/622gecko.hal | 9 + configs/smithy/622gecko.ini | 5 +- configs/smithy/924.hal | 7 +- configs/smithy/924eztrol.hal | 18 + configs/smithy/README | 4 + configs/smithy/axis_manualtoolchange.hal | 2 +- configs/smithy/eztrol.hal | 14 +- configs/smithy/lathe.tbl | 11 +- configs/smithy/mill.tbl | 9 +- configs/smithy/naiky.hal | 2 +- configs/stepper-gantry/stepper.tbl | 12 +- configs/stepper-xyza/stepper.tbl | 12 +- configs/stepper/stepper.tbl | 13 +- configs/stg/stg.tbl | 12 +- configs/tormach/tool.tbl | 12 +- configs/univpwm/univpwm.tbl | 12 +- configs/univstep/univstep.tbl | 12 +- configs/vismach/hbm.tbl | 12 +- configs/vismach/max5kins.tbl | 12 +- configs/vismach/max5triv.tbl | 12 +- configs/vti/vti.tbl | 12 +- debian/configure | 37 +- debian/control.in | 9 +- debian/emc2.files.in | 4 + debian/extras-Ubuntu-6.06/emc2.files | 7 - debian/extras-Ubuntu-6.06/etc/modprobe.d/emc2 | 4 - .../extras-Ubuntu-6.06/etc/udev/rules.d/emc2.rules | 2 - .../etc/udev/scripts/rtai_fifos.sh | 15 - .../etc/xdg/menus/applications-merged/cnc.menu | 14 - .../usr/share/applications/emc2-gcoderef.desktop | 12 - .../share/applications/emc2-gettingstarted.desktop | 12 - .../usr/share/applications/emc2-halmanual.desktop | 12 - .../applications/emc2-integratormanual.desktop | 14 - .../usr/share/applications/emc2-latency.desktop | 12 - .../usr/share/applications/emc2-stepconf.desktop | 12 - .../usr/share/applications/emc2-usermanual.desktop | 12 - .../usr/share/applications/emc2.desktop | 12 - .../usr/share/desktop-directories/cnc.directory | 6 - .../usr/share/pixmaps/emc2icon.png | Bin 4198 -> 0 bytes debian/extras-Ubuntu-7.10/emc2.files | 6 - debian/extras-Ubuntu-7.10/etc/modprobe.d/emc2 | 4 - .../extras-Ubuntu-7.10/etc/udev/rules.d/emc2.rules | 1 - .../etc/xdg/menus/applications-merged/cnc.menu | 14 - .../usr/share/applications/emc2-gcoderef.desktop | 12 - .../share/applications/emc2-gettingstarted.desktop | 12 - .../usr/share/applications/emc2-halmanual.desktop | 12 - .../applications/emc2-integratormanual.desktop | 14 - .../usr/share/applications/emc2-latency.desktop | 12 - .../usr/share/applications/emc2-stepconf.desktop | 12 - .../usr/share/applications/emc2-usermanual.desktop | 12 - .../usr/share/applications/emc2.desktop | 12 - .../usr/share/desktop-directories/cnc.directory | 6 - .../usr/share/pixmaps/emc2icon.png | Bin 4198 -> 0 bytes debian/extras-Ubuntu-8.04/emc2.files | 5 - debian/extras-Ubuntu-8.04/etc/modprobe.d/emc2 | 4 - .../etc/xdg/menus/applications-merged/cnc.menu | 14 - .../usr/share/applications/emc2-gcoderef.desktop | 12 - .../share/applications/emc2-gettingstarted.desktop | 13 - .../usr/share/applications/emc2-halmanual.desktop | 13 - .../applications/emc2-integratormanual.desktop | 14 - .../usr/share/applications/emc2-latency.desktop | 12 - .../usr/share/applications/emc2-stepconf.desktop | 12 - .../usr/share/applications/emc2-usermanual.desktop | 12 - .../usr/share/applications/emc2.desktop | 12 - .../usr/share/desktop-directories/cnc.directory | 6 - .../usr/share/pixmaps/emc2icon.png | Bin 4198 -> 0 bytes debian/extras-sim-Ubuntu-6.06/emc2.files | 4 - .../etc/xdg/menus/applications-merged/cnc.menu | 14 - .../usr/share/applications/emc2-gcoderef.desktop | 12 - .../share/applications/emc2-gettingstarted.desktop | 12 - .../usr/share/applications/emc2-halmanual.desktop | 12 - .../applications/emc2-integratormanual.desktop | 14 - .../usr/share/applications/emc2-stepconf.desktop | 12 - .../usr/share/applications/emc2-usermanual.desktop | 12 - .../usr/share/applications/emc2.desktop | 12 - .../usr/share/desktop-directories/cnc.directory | 6 - .../usr/share/pixmaps/emc2icon.png | Bin 4198 -> 0 bytes debian/extras-sim-Ubuntu-8.04/emc2.files | 4 - .../etc/xdg/menus/applications-merged/cnc.menu | 14 - .../usr/share/applications/emc2-gcoderef.desktop | 12 - .../share/applications/emc2-gettingstarted.desktop | 12 - .../usr/share/applications/emc2-halmanual.desktop | 12 - .../applications/emc2-integratormanual.desktop | 14 - .../usr/share/applications/emc2-latency.desktop | 12 - .../usr/share/applications/emc2-stepconf.desktop | 12 - .../usr/share/applications/emc2-usermanual.desktop | 12 - .../usr/share/applications/emc2.desktop | 12 - .../usr/share/desktop-directories/cnc.directory | 6 - .../usr/share/pixmaps/emc2icon.png | Bin 4198 -> 0 bytes debian/extras/emc2.files | 5 + debian/extras/etc/modprobe.d/emc2 | 4 + .../etc/xdg/menus/applications-merged/cnc.menu | 14 + .../usr/share/applications/emc2-gcoderef.desktop | 12 + .../share/applications/emc2-gettingstarted.desktop | 13 + .../usr/share/applications/emc2-halmanual.desktop | 13 + .../applications/emc2-integratormanual.desktop | 14 + .../usr/share/applications/emc2-latency.desktop | 12 + .../usr/share/applications/emc2-stepconf.desktop | 12 + .../usr/share/applications/emc2-usermanual.desktop | 12 + debian/extras/usr/share/applications/emc2.desktop | 12 + .../usr/share/desktop-directories/cnc.directory | 6 + debian/extras/usr/share/pixmaps/emc2icon.png | Bin 0 -> 4198 bytes debian/rules.in | 5 +- docs/html/gcode.html | 2 + docs/man/man9/.gitignore | 1 + docs/man/man9/encoder.9 | 16 +- docs/man/man9/motion.9 | 11 + docs/src/Master_Integrator.lyx | 8 +- docs/src/Master_User.lyx | 10 + docs/src/Submakefile | 1 + docs/src/common/Linux_FAQ.lyx | 42 +- docs/src/common/User_Concepts.lyx | 2 +- docs/src/config/ini_config.lyx | 26 +- docs/src/drivers/hostmot2.lyx | 11 +- docs/src/examples/spindle.lyx | 85 + docs/src/gcode/images/g2-3.dxf | 2750 +++ docs/src/gcode/images/g2-3.png | Bin 0 -> 4780 bytes docs/src/gcode/images/g2.dxf | 2404 +++ docs/src/gcode/images/g2.png | Bin 0 -> 5384 bytes docs/src/gcode/main.lyx | 348 +- docs/src/gui/images/touchy.png | Bin 0 -> 46861 bytes docs/src/gui/touchy.lyx | 186 + docs/src/hal/basic_hal.lyx | 75 +- docs/src/hal/components.lyx | 17 +- docs/src/hal/general_ref.lyx | 299 +- docs/src/hal/images/hal-meter01.png | Bin 0 -> 24365 bytes docs/src/hal/images/hal-meter02.png | Bin 0 -> 6810 bytes docs/src/hal/images/signal-direction.odg | Bin 10029 -> 10226 bytes docs/src/hal/images/signal-direction.png | Bin 10112 -> 9080 bytes docs/src/hal/rtcomps.lyx | 117 +- docs/src/index.tmpl | 2 + docs/src/ladder/classic_ladder.lyx | 141 +- lib/python/rs274/interpret.py | 24 +- lib/python/vcpparse.py | 2 - scripts/emc.in | 18 +- scripts/halrun.in | 7 +- scripts/haltcl.in | 7 +- src/Makefile | 2 +- src/emc/canterp/canterp.cc | 4 +- src/emc/iotask/ioControl.cc | 239 +- src/emc/kinematics/rotatekins.c | 2 +- src/emc/kinematics/tp.c | 25 +- src/emc/motion/control.c | 30 +- src/emc/motion/mot_priv.h | 1 + src/emc/motion/motion.c | 7 + src/emc/motion/motion.h | 2 + src/emc/nml_intf/canon.hh | 14 +- src/emc/nml_intf/emc.cc | 17 +- src/emc/nml_intf/emc.hh | 2 +- src/emc/nml_intf/emc_nml.hh | 9 +- src/emc/nml_intf/emcops.cc | 14 +- src/emc/rs274ngc/gcodemodule.cc | 12 +- src/emc/rs274ngc/interp_check.cc | 2 +- src/emc/rs274ngc/interp_convert.cc | 333 +- src/emc/rs274ngc/interp_find.cc | 171 +- src/emc/rs274ngc/interp_internal.cc | 26 +- src/emc/rs274ngc/interp_internal.hh | 12 +- src/emc/rs274ngc/interp_queue.cc | 5 +- src/emc/rs274ngc/interp_read.cc | 7 +- src/emc/rs274ngc/interp_write.cc | 1 + src/emc/rs274ngc/rs274ngc_interp.hh | 5 + src/emc/rs274ngc/rs274ngc_pre.cc | 21 +- src/emc/rs274ngc/rs274ngc_return.hh | 2 +- src/emc/sai/driver.cc | 41 +- src/emc/sai/saicanon.cc | 19 +- src/emc/task/emccanon.cc | 34 +- src/emc/task/emctaskmain.cc | 3 +- src/emc/task/iotaskintf.cc | 5 +- src/emc/task/taskintf.cc | 5 +- src/emc/usr_intf/axis/Submakefile | 2 +- src/emc/usr_intf/axis/extensions/emcmodule.cc | 22 +- src/emc/usr_intf/axis/scripts/axis.py | 69 +- src/emc/usr_intf/axis/scripts/emctop.py | 2 +- src/emc/usr_intf/keystick.cc | 8 +- .../pncconf/pncconf-help/help-axisconfig.txt | 9 +- .../pncconf/pncconf-help/help-axismotor.txt | 69 +- src/emc/usr_intf/pncconf/pncconf.glade |18872 ++++++++++---------- src/emc/usr_intf/pncconf/pncconf.py | 906 +- src/emc/usr_intf/shcom.cc | 8 +- src/emc/usr_intf/stepconf/stepconf.py | 4 +- src/emc/usr_intf/tooledit.tcl | 38 +- src/emc/usr_intf/touchy/Submakefile | 24 + src/emc/usr_intf/touchy/design.notes | 98 + src/emc/usr_intf/touchy/emc_interface.py | 428 + src/emc/usr_intf/touchy/filechooser.py | 67 + src/emc/usr_intf/touchy/hal_interface.py | 211 + src/emc/usr_intf/touchy/listing.py | 108 + src/emc/usr_intf/touchy/mdi.py | 251 + src/emc/usr_intf/touchy/preferences.py | 45 + src/emc/usr_intf/touchy/touchy.glade | 6066 +++++++ src/emc/usr_intf/touchy/touchy.gladep | 8 + src/emc/usr_intf/touchy/touchy.hal.example | 31 + src/emc/usr_intf/touchy/touchy.py | 614 + src/emc/usr_intf/xemc.cc | 4 +- src/hal/components/encoder.c | 122 +- src/hal/components/pid.c | 22 +- src/hal/components/sim_encoder.c | 9 + src/hal/components/sphereprobe.comp | 31 + src/hal/drivers/mesa-hostmot2/encoder.c | 131 +- src/hal/drivers/mesa-hostmot2/hostmot2.c | 167 +- src/hal/drivers/mesa-hostmot2/hostmot2.h | 33 +- src/hal/drivers/mesa-hostmot2/pins.c | 41 +- src/hal/hal.h | 2 +- src/hal/hal_lib.c | 6 + src/hal/hal_priv.h | 4 +- src/hal/utils/scope_disp.c | 65 +- tcl/bin/popimage | 2 +- tests/ccomp/lathe-comp/expected | 8 +- tests/ccomp/mill-g90g91g92/expected | 2 +- tests/ccomp/mill-line-arc-entry/expected | 2 +- tests/counter-encoder.0/test.hal | 15 +- tests/interp/cam-nisley/expected | 2 +- tests/interp/g76/expected | 2 +- 279 files changed, 27713 insertions(+), 12077 deletions(-) |