Menu
▾
▴
[Emc-commit] joints_axes3: Merge branch 'master' into joints_axes3
|
From: Michael G. <gi...@gi...> - 2013-03-30 01:28:51
|
Merge branch 'master' into joints_axes3 Conflicts: src/emc/motion/command.c src/emc/motion/control.c src/emc/motion/motion.c src/emc/motion/motion.h src/emc/task/emccanon.cc src/emc/usr_intf/usrmot.c tcl/bin/emccalib.tcl Signed-off-by: Michael Geszkiewicz <mi...@wp...> http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=52a0964 configs/GM6-PCI/3-axis-servo.hal | 182 + configs/GM6-PCI/3-axis-servo.ini | 220 + configs/GM6-PCI/3-axis-stepper.hal | 114 + configs/GM6-PCI/3-axis-stepper.ini | 190 + configs/GM6-PCI/README | 12 + configs/GM6-PCI/touchy.hal | 2 + configs/USC_encod/README | 6 + configs/USC_encod/univstep.ini | 241 + configs/USC_encod/univstep.tbl | 4 + configs/USC_encod/univstep_io.hal | 82 + configs/USC_encod/univstep_load.hal | 35 + configs/USC_encod/univstep_motion.hal | 47 + configs/USC_encod/univstep_servo.hal | 95 + configs/etch-servo/etch.ini | 2 + configs/gecko/Gecko_540B3/Gecko_540B3.hal | 83 + configs/gecko/Gecko_540B3/Gecko_540B3.ini | 98 + configs/gecko/Gecko_540B3/Gecko_540B3.stepconf | 140 + configs/gecko/Gecko_540B3/README | 19 + configs/gecko/Gecko_540B3/custom.hal | 2 + configs/gecko/Gecko_540B3/custom_postgui.hal | 3 + configs/gecko/Gecko_540B3/tool.tbl | 4 + configs/gecko/Gecko_540B4/Gecko_540B4.hal | 86 + configs/gecko/Gecko_540B4/Gecko_540B4.ini | 98 + configs/gecko/Gecko_540B4/Gecko_540B4.stepconf | 140 + configs/gecko/Gecko_540B4/README | 19 + configs/gecko/Gecko_540B4/custom.hal | 2 + configs/gecko/Gecko_540B4/custom_postgui.hal | 3 + configs/gecko/Gecko_540B4/tool.tbl | 4 + configs/gecko/README | 9 + configs/gladevcp/by-widget/sourceview/README | 8 + .../gladevcp/by-widget/sourceview/sourceview.py | 56 + .../gladevcp/by-widget/sourceview/sourceview.ui | 126 + configs/gladevcp/by-widget/spinbutton/README | 6 + .../gladevcp/by-widget/spinbutton/spinbutton.py | 16 + .../gladevcp/by-widget/spinbutton/spinbutton.ui | 37 + configs/gladevcp/class-callback/class_callback.py | 2 - configs/gladevcp/hitcounter.py | 2 - configs/gladevcp/probe/probe.py | 4 +- configs/gladevcp/templates/classhandler.py | 3 - configs/sim/axis/axis.ini | 17 +- configs/sim/axis/axis_9axis.ini | 2 +- configs/sim/axis/axis_foam.ini | 1 + configs/sim/axis/check_constraints.hal | 63 + configs/sim/check_constraints.hal | 63 - configs/sim/gmoccapy/README | 15 + configs/sim/gmoccapy/axis_manualtoolchange.hal | 1 + configs/sim/gmoccapy/core_sim.hal | 1 + configs/sim/gmoccapy/dro.glade | 278 + configs/sim/gmoccapy/gmoccapy.glade | 5213 ++ configs/sim/gmoccapy/gmoccapy.ini | 200 + configs/sim/gmoccapy/gmoccapy_handler.py | 1674 + configs/sim/gmoccapy/gmoccapy_hw_btn_postgui.hal | 36 + configs/sim/gmoccapy/gmoccapy_left_panel.ini | 201 + configs/sim/gmoccapy/gmoccapy_postgui.hal | 68 + configs/sim/gmoccapy/gmoccapy_right_panel.ini | 200 + .../gmoccapy_with_simulated_hardware_buttons.ini | 200 + configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini | 204 + configs/sim/gmoccapy/h_buttonlist.glade | 169 + configs/sim/gmoccapy/icon/Auto.gif | Bin 0 -> 780 bytes configs/sim/gmoccapy/icon/E-Stop.gif | Bin 0 -> 2181 bytes configs/sim/gmoccapy/icon/Logo.png | Bin 0 -> 500 bytes configs/sim/gmoccapy/icon/clear.png | Bin 0 -> 2088 bytes configs/sim/gmoccapy/icon/configure-2.png | Bin 0 -> 5145 bytes configs/sim/gmoccapy/icon/coolant_off.png | Bin 0 -> 1159 bytes configs/sim/gmoccapy/icon/coolant_on.gif | Bin 0 -> 1669 bytes configs/sim/gmoccapy/icon/dimensions.png | Bin 0 -> 2802 bytes configs/sim/gmoccapy/icon/editor.png | Bin 0 -> 2535 bytes configs/sim/gmoccapy/icon/enter.png | Bin 0 -> 1230 bytes configs/sim/gmoccapy/icon/estopred.png | Bin 0 -> 3509 bytes configs/sim/gmoccapy/icon/exit.png | Bin 0 -> 3998 bytes configs/sim/gmoccapy/icon/exit_application.png | Bin 0 -> 2989 bytes configs/sim/gmoccapy/icon/forward.png | Bin 0 -> 1098 bytes configs/sim/gmoccapy/icon/forward_on.gif | Bin 0 -> 1634 bytes .../sim/gmoccapy/icon/from where are the icons.txt | 73 + configs/sim/gmoccapy/icon/index_tool.svg | 83 + configs/sim/gmoccapy/icon/jog.png | Bin 0 -> 1317 bytes configs/sim/gmoccapy/icon/keyboard.png | Bin 0 -> 4136 bytes configs/sim/gmoccapy/icon/machineonoff.png | Bin 0 -> 896 bytes configs/sim/gmoccapy/icon/mdi.png | Bin 0 -> 1394 bytes configs/sim/gmoccapy/icon/mist_off.png | Bin 0 -> 1341 bytes configs/sim/gmoccapy/icon/mist_on.gif | Bin 0 -> 1743 bytes configs/sim/gmoccapy/icon/pause.png | Bin 0 -> 1391 bytes configs/sim/gmoccapy/icon/refall.png | Bin 0 -> 1858 bytes configs/sim/gmoccapy/icon/refx.png | Bin 0 -> 1850 bytes configs/sim/gmoccapy/icon/refy.png | Bin 0 -> 1742 bytes configs/sim/gmoccapy/icon/refz.png | Bin 0 -> 1732 bytes configs/sim/gmoccapy/icon/reload.png | Bin 0 -> 4065 bytes configs/sim/gmoccapy/icon/reverse.png | Bin 0 -> 1098 bytes configs/sim/gmoccapy/icon/reverse_on.gif | Bin 0 -> 1656 bytes configs/sim/gmoccapy/icon/run.png | Bin 0 -> 1091 bytes configs/sim/gmoccapy/icon/runfrom.png | Bin 0 -> 1245 bytes configs/sim/gmoccapy/icon/save-as.png | Bin 0 -> 4233 bytes configs/sim/gmoccapy/icon/save.png | Bin 0 -> 3886 bytes configs/sim/gmoccapy/icon/start.png | Bin 0 -> 2276 bytes configs/sim/gmoccapy/icon/step.png | Bin 0 -> 1171 bytes configs/sim/gmoccapy/icon/stop.gif | Bin 0 -> 1325 bytes configs/sim/gmoccapy/icon/stop.png | Bin 0 -> 3200 bytes configs/sim/gmoccapy/icon/stop_on.gif | Bin 0 -> 1301 bytes configs/sim/gmoccapy/icon/tool_blockdelete.gif | Bin 0 -> 350 bytes configs/sim/gmoccapy/icon/tool_rotate.gif | Bin 0 -> 1285 bytes configs/sim/gmoccapy/icon/toolaxisp.png | Bin 0 -> 990 bytes configs/sim/gmoccapy/icon/toolaxisx.png | Bin 0 -> 511 bytes configs/sim/gmoccapy/icon/toolaxisy.png | Bin 0 -> 423 bytes configs/sim/gmoccapy/icon/toolaxisz.png | Bin 0 -> 499 bytes configs/sim/gmoccapy/icon/toolchange.png | Bin 0 -> 2937 bytes configs/sim/gmoccapy/icon/toolpath.png | Bin 0 -> 971 bytes configs/sim/gmoccapy/icon/tools.png | Bin 0 -> 1905 bytes configs/sim/gmoccapy/icon/touchoffwz.png | Bin 0 -> 3207 bytes configs/sim/gmoccapy/icon/touchoffx.png | Bin 0 -> 3224 bytes configs/sim/gmoccapy/icon/touchoffx_value.png | Bin 0 -> 2570 bytes configs/sim/gmoccapy/icon/touchoffy.png | Bin 0 -> 2961 bytes configs/sim/gmoccapy/icon/touchoffy_value.png | Bin 0 -> 2474 bytes configs/sim/gmoccapy/icon/touchoffz.png | Bin 0 -> 2969 bytes configs/sim/gmoccapy/icon/touchoffz_value.png | Bin 0 -> 2476 bytes configs/sim/gmoccapy/icon/unhome.png | Bin 0 -> 1871 bytes configs/sim/gmoccapy/icon/zoom-in.png | Bin 0 -> 2879 bytes configs/sim/gmoccapy/icon/zoom-out.png | Bin 0 -> 2783 bytes .../Gmoccapy_2_tools_with compensation.ngc | 95 + configs/sim/gmoccapy/nc_files/diferent speeds.ngc | 36 + .../nc_files/subroutines/go_to_position.ngc | 24 + .../gmoccapy/nc_files/subroutines/halo_world.ngc | 26 + .../gmoccapy/nc_files/subroutines/i_am_lost.ngc | 24 + .../gmoccapy/nc_files/subroutines/increment.ngc | 22 + .../gmoccapy/nc_files/subroutines/jog_around.ngc | 29 + .../nc_files/subroutines/macro_Instructions.txt | 44 + configs/sim/gmoccapy/release_notes.txt | 256 + configs/sim/gmoccapy/sim_spindle_encoder.hal | 1 + configs/sim/gmoccapy/simulated_home.hal | 1 + configs/sim/gmoccapy/tool.tbl | 24 + configs/sim/gmoccapy/v_buttonlist.glade | 122 + configs/sim/gmoccapy/vcp_box.glade | 66 + configs/sim/gscreen/README | 12 + configs/sim/gscreen/axis_manualtoolchange.hal | 1 + configs/sim/gscreen/core_sim.hal | 1 + configs/sim/gscreen/gladevcp-test.ui | 1 + configs/sim/gscreen/gscreen.ini | 233 + configs/sim/gscreen/gscreen_lathe.ini | 190 + configs/sim/gscreen/gscreen_mm.ini | 205 + configs/sim/gscreen/lathe.tbl | 1 + configs/sim/gscreen/lathe_postgui.hal | 3 + configs/sim/gscreen/sim.tbl | 1 + configs/sim/gscreen/sim_mm.tbl | 1 + configs/sim/gscreen/sim_spindle_encoder.hal | 1 + configs/sim/gscreen/simulated_home.hal | 1 + configs/sim/gscreen/test_postgui.hal | 12 + configs/sim/gscreen/vcp_box.glade | 69 + configs/sim/gscreen_custom/README | 12 + .../sim/gscreen_custom/axis_manualtoolchange.hal | 1 + configs/sim/gscreen_custom/core_sim.hal | 1 + configs/sim/gscreen_custom/core_sim9.hal | 1 + configs/sim/gscreen_custom/gaxis.glade | 872 + configs/sim/gscreen_custom/gaxis_handler.py | 76 + configs/sim/gscreen_custom/gaxis_postgui.hal | 12 + configs/sim/gscreen_custom/gladevcp-test.ui | 1 + configs/sim/gscreen_custom/gscreen.glade | 3642 ++ configs/sim/gscreen_custom/gscreen2.glade | 81 + configs/sim/gscreen_custom/gscreen_custom.ini | 320 + configs/sim/gscreen_custom/gscreen_gaxis.ini | 191 + configs/sim/gscreen_custom/gscreen_handler.py | 76 + configs/sim/gscreen_custom/industrial.glade | 3503 ++ configs/sim/gscreen_custom/industrial.ini | 202 + configs/sim/gscreen_custom/industrial_handler.py | 353 + configs/sim/gscreen_custom/industrial_postgui.hal | 13 + configs/sim/gscreen_custom/lathe.tbl | 1 + configs/sim/gscreen_custom/locking_indexer.hal | 1 + configs/sim/gscreen_custom/sim.tbl | 1 + configs/sim/gscreen_custom/sim.tbl.bak | 1 + configs/sim/gscreen_custom/sim_spindle_encoder.hal | 1 + configs/sim/gscreen_custom/simulated_home.hal | 1 + configs/sim/gscreen_custom/test_postgui.hal | 2 + configs/sim/gscreen_custom/vcp_box.glade | 69 + configs/sim/lathe.tbl | 1 + configs/sim/ngcgui/README | 26 +- configs/sim/ngcgui/ngcgui.ini | 4 +- configs/sim/ngcgui/ngcgui_lathe.ini | 6 +- .../nc_subroutines/manual_change.ngc | 14 +- .../nc_subroutines/restore.ngc | 26 + configs/sim/remap/python-stdglue/stdglue.py | 4 +- configs/sim/remap/stop-lookahead/README | 14 + configs/sim/remap/stop-lookahead/demo.ini | 248 + .../sim/remap/stop-lookahead/nc_files/examples.ngc | 24 + configs/sim/remap/stop-lookahead/python/remap.py | 6 + .../sim/remap/stop-lookahead/python/toplevel.py | 1 + configs/sim/remap/stop-lookahead/tool.tbl | 7 + configs/smithy/1240.hal | 12 +- configs/smithy/1240_4axis.hal | 12 +- configs/smithy/1240combined.hal | 92 +- configs/smithy/1240combined.ini | 16 +- configs/smithy/1240combined_4axis.hal | 92 +- configs/smithy/1240combined_4axis.ini | 16 +- configs/smithy/1240combined_mm.ini | 259 + configs/smithy/1240gecko.hal | 18 +- configs/smithy/1240gecko.ini | 3 +- configs/smithy/1315.hal | 99 +- configs/smithy/1315.ini | 13 +- configs/smithy/1315.xml | 0 configs/smithy/1315postgui.hal | 9 +- configs/smithy/622.hal | 2 + configs/smithy/622_4axis.hal | 2 + configs/smithy/622keyence.hal | 2 + configs/smithy/622leadshine.hal | 2 + configs/smithy/622leadshine_4axis.hal | 2 + configs/smithy/8i20.xml | 4 +- configs/smithy/8i20postgui.hal | 8 +- configs/smithy/924.hal | 3 + configs/smithy/924.ini | 0 configs/smithy/README | 6 + configs/smithy/gecko.xml | 12 + configs/smithy/gecko_postgui.hal | 14 + configs/smithy/naiky_4axis.hal | 44 + configs/smithy/naiky_test.hal | 2 + debian/changelog | 68 + debian/configure | 6 + debian/control.in | 4 +- debian/linuxcnc-sim.sharedmimeinfo | 2 +- debian/linuxcnc.files.in | 2 + docs/AUTHORS | 2 + docs/html/gcode.html | 49 +- docs/html/gcode_fr.html | 79 +- docs/html/linuxcnc.css | 37 + docs/man/man1/halui.1 | 42 +- docs/man/man1/linuxcncrsh.1 | 8 +- docs/man/man1/shuttlexpress.1 | 2 +- docs/man/man3/hm2_bspi_set_read_function.3hm2 | 2 +- docs/man/man3/hm2_uart_read.3hm2 | 30 + docs/man/man3/hm2_uart_send.3hm2 | 30 + docs/man/man3/hm2_uart_setup.3hm2 | 58 + docs/man/man3/intro.3rtapi | 5 + docs/man/man9/.gitignore | 2 + docs/man/man9/hostmot2.9 | 190 +- docs/man/man9/lcd.9 | 166 + docs/man/man9/matrix_kb.9 | 105 + docs/man/man9/motion.9 | 29 +- docs/man/man9/pid.9 | 12 +- docs/man/man9/setsserial.9 | 105 + docs/man/man9/sserial.9 | 533 + docs/src/Master_Getting_Started_de.txt | 16 +- docs/src/Master_Getting_Started_es.txt | 6 +- docs/src/Master_Getting_Started_pl.txt | 18 +- docs/src/Master_HAL.txt | 6 +- docs/src/Master_HAL_de.txt | 46 +- docs/src/Master_HAL_es.txt | 44 +- docs/src/Master_HAL_fr.txt | 14 - docs/src/Master_HAL_pl.txt | 48 +- docs/src/Master_Integrator.txt | 6 + docs/src/Master_Integrator_de.txt | 70 +- docs/src/Master_Integrator_es.txt | 70 +- docs/src/Master_Integrator_fr.txt | 1 + docs/src/Master_Integrator_pl.txt | 72 +- docs/src/Master_User.txt | 2 +- docs/src/Master_User_de.txt | 46 +- docs/src/Master_User_es.txt | 48 +- docs/src/Master_User_pl.txt | 48 +- docs/src/Submakefile | 74 +- docs/src/checkref | 43 + docs/src/code/Code_Notes.txt | 438 +- docs/src/code/LinuxCNC-block-diagram-small.png | Bin 0 -> 27032 bytes docs/src/code/LinuxCNC-block-diagram.png | Bin 0 -> 23010 bytes docs/src/code/LinuxCNC-motion-controller-small.png | Bin 0 -> 28556 bytes docs/src/code/LinuxCNC-motion-controller.png | Bin 0 -> 24942 bytes docs/src/common/Document_Header.txt | 20 - docs/src/common/Document_Header_de.txt | 20 - docs/src/common/Document_Header_es.txt | 20 - docs/src/common/Document_Header_fr.txt | 20 - docs/src/common/Document_Header_pl.txt | 20 - docs/src/common/GPLD_Copyright.txt | 4 +- docs/src/common/GPLD_Copyright_fr.txt | 2 +- docs/src/common/Getting_EMC.txt | 28 +- docs/src/common/Getting_linuxcnc_fr.txt | 74 +- docs/src/common/Linux_FAQ_es.txt | 262 +- docs/src/common/Updating_linuxcnc_fr.txt | 2 +- docs/src/common/User_Concepts.txt | 21 +- docs/src/common/User_Concepts_de.txt | 7 +- docs/src/common/User_Concepts_es.txt | 7 +- docs/src/common/User_Concepts_fr.txt | 40 +- docs/src/common/User_Concepts_pl.txt | 7 +- docs/src/common/images/configuration-selector.png | Bin 64386 -> 68184 bytes docs/src/common/images/lathe-diagram.png | Bin 0 -> 45678 bytes docs/src/common/images/mill-diagram.png | Bin 0 -> 43945 bytes docs/src/common/overleaf.txt | 4 +- docs/src/common/overleaf_fr.txt | 2 +- docs/src/common/python-interface.txt | 746 + docs/src/common/starting-emc.txt | 26 +- docs/src/common/user_intro_fr.txt | 2 +- docs/src/config/copy_and_run_es.txt | 71 +- docs/src/config/emc2hal.txt | 5 +- docs/src/config/images/configuration-selector.png | Bin 53762 -> 68184 bytes docs/src/config/images/pncconf-basic_fr.png | Bin 25319 -> 27403 bytes docs/src/config/images/pncconf-file_fr.png | Bin 29479 -> 16250 bytes docs/src/config/images/pncconf-splash_fr.png | Bin 14694 -> 16609 bytes docs/src/config/ini_config.txt | 84 +- docs/src/config/ini_config_fr.txt | 1524 +- docs/src/config/ini_homing.txt | 21 +- docs/src/config/ini_homing_fr.txt | 91 +- docs/src/config/pncconf_fr.txt | 60 +- docs/src/config/stepconf.txt | 623 +- docs/src/config/stepconf_fr.txt | 691 +- docs/src/config/stepper_fr.txt | 37 +- docs/src/docs.xml | 3 +- docs/src/drivers/GM.txt | 865 + docs/src/drivers/images/GM_AXISpinout.png | Bin 0 -> 8882 bytes docs/src/drivers/images/GM_AxisInterface.png | Bin 0 -> 235202 bytes docs/src/drivers/images/GM_ENDSWpinout.png | Bin 0 -> 8834 bytes docs/src/drivers/images/GM_IOpinout.png | Bin 0 -> 16206 bytes docs/src/drivers/images/GM_PCIpinout.png | Bin 0 -> 73241 bytes docs/src/drivers/images/GM_RS485topology.png | Bin 0 -> 34888 bytes docs/src/drivers/images/GM_RefSignals.png | Bin 0 -> 35158 bytes docs/src/drivers/images/GMsystem.png | Bin 0 -> 222708 bytes docs/src/drivers/shuttlexpress.txt | 55 +- docs/src/drivers/shuttlexpress_de.txt | 56 +- docs/src/drivers/shuttlexpress_es.txt | 56 +- docs/src/drivers/shuttlexpress_pl.txt | 56 +- docs/src/examples/misc_fr.txt | 5 +- docs/src/examples/mpg.txt | 133 +- docs/src/examples/mpg_fr.txt | 51 +- docs/src/examples/spindle.txt | 22 +- docs/src/gcode/coordinates.txt | 23 +- docs/src/gcode/coordinates_fr.txt | 18 +- docs/src/gcode/gcode.txt | 905 +- docs/src/gcode/gcode_de.txt | 33 +- docs/src/gcode/gcode_es.txt | 33 +- docs/src/gcode/gcode_fr.txt | 880 +- docs/src/gcode/gcode_pl.txt | 33 +- docs/src/gcode/m-code.txt | 117 +- docs/src/gcode/m-code_fr.txt | 119 +- docs/src/gcode/machining_center.txt | 38 +- docs/src/gcode/machining_center_fr.txt | 9 +- docs/src/gcode/o-code.txt | 35 +- docs/src/gcode/o-code_fr.txt | 12 +- docs/src/gcode/other-code.txt | 55 +- docs/src/gcode/other-code_fr.txt | 2 +- docs/src/gcode/overview.txt | 93 +- docs/src/gcode/tool_compensation.txt | 38 +- docs/src/gcode/tool_compensation_de.txt | 14 +- docs/src/gcode/tool_compensation_es.txt | 14 +- docs/src/gcode/tool_compensation_fr.txt | 39 +- docs/src/gcode/tool_compensation_pl.txt | 14 +- docs/src/gui/axis.txt | 57 +- docs/src/gui/axis_de.txt | 2 +- docs/src/gui/axis_es.txt | 2 +- docs/src/gui/axis_fr.txt | 2 +- docs/src/gui/axis_pl.txt | 2 +- docs/src/gui/gladevcp.txt | 437 +- docs/src/gui/halui.txt | 33 +- docs/src/gui/image-to-gcode_fr.txt | 4 +- docs/src/gui/images/tooledit-columns.png | Bin 0 -> 9360 bytes docs/src/gui/images/tooledit-columns_fr.png | Bin 0 -> 8526 bytes docs/src/gui/images/tooledit-sort.png | Bin 0 -> 23534 bytes docs/src/gui/images/tooledit-sort_fr.png | Bin 0 -> 8648 bytes docs/src/gui/images/tooledit-warning_fr.png | Bin 0 -> 9039 bytes docs/src/gui/images/tooledit.png | Bin 0 -> 25534 bytes docs/src/gui/images/tooledit_fr.png | Bin 0 -> 9989 bytes docs/src/gui/ngcgui.txt | 10 +- docs/src/gui/ngcgui_fr.txt | 7 +- docs/src/gui/tooledit.txt | 105 + docs/src/gui/tooledit_fr.txt | 113 + docs/src/gui/touchy.txt | 2 +- docs/src/hal/basic_hal.txt | 32 +- docs/src/hal/basic_hal_fr.txt | 85 +- docs/src/hal/canonical-devices.txt | 4 +- docs/src/hal/comp.txt | 12 +- docs/src/hal/comp_fr.txt | 6 +- docs/src/hal/components.txt | 312 +- docs/src/hal/components_fr.txt | 644 +- docs/src/hal/hal-examples.txt | 50 + docs/src/hal/hal-examples_fr.txt | 48 + docs/src/hal/halui_examples.txt | 3 +- docs/src/hal/halui_fr.txt | 40 +- docs/src/hal/images/stepgen-type11-14.png | Bin 100754 -> 101153 bytes docs/src/hal/images/stepgen-type11-14.svg | 10 +- docs/src/hal/images/stepgen-type2-4.png | Bin 53625 -> 57495 bytes docs/src/hal/images/stepgen-type2-4.svg | 8 +- docs/src/hal/images/stepgen-type5-10.png | Bin 68115 -> 103678 bytes docs/src/hal/images/stepgen-type5-10.svg | 14 +- docs/src/hal/intro.txt | 6 +- docs/src/hal/intro_fr.txt | 37 +- docs/src/hal/parallel_port.txt | 14 +- docs/src/hal/rtcomps.txt | 280 +- docs/src/hal/rtcomps_fr.txt | 18 +- docs/src/hal/tutorial.txt | 4 +- docs/src/index.foot | 3 +- docs/src/index.tmpl | 206 +- docs/src/index_de.tmpl | 157 +- docs/src/index_es.tmpl | 147 +- docs/src/index_fr.tmpl | 38 +- docs/src/index_pl.tmpl | 157 +- docs/src/ladder/classic_ladder.txt | 33 +- docs/src/ladder/classic_ladder_fr.txt | 596 +- docs/src/linuxcnc.css | 37 - docs/src/quickstart/stepper_quickstart.txt | 2 +- docs/src/quickstart/stepper_quickstart_fr.txt | 6 +- docs/src/remap/structure.txt | 80 +- lib/python/gladevcp/calculator.glade | 351 + lib/python/gladevcp/calculatorwidget.py | 243 + lib/python/gladevcp/drowidget.py | 199 + lib/python/gladevcp/gtksourceview.xml | 31 + lib/python/gladevcp/hal_actions.py | 2 +- lib/python/gladevcp/hal_bar.py | 54 +- lib/python/gladevcp/hal_filechooser.py | 23 +- lib/python/gladevcp/hal_gremlin.py | 116 +- lib/python/gladevcp/hal_mdihistory.py | 5 +- lib/python/gladevcp/hal_python.xml | 36 +- lib/python/gladevcp/hal_pythonplugin.py | 5 + lib/python/gladevcp/hal_sourceview.py | 44 +- lib/python/gladevcp/offsetpage.glade | 271 + lib/python/gladevcp/offsetpage_widget.py | 430 + lib/python/gladevcp/offsetwidget.py | 177 + lib/python/gladevcp/tooledit_gtk.glade | 357 + lib/python/gladevcp/tooledit_widget.py | 363 + lib/python/gladevcp/widget-gladevcp-calc.png | Bin 0 -> 883 bytes lib/python/gladevcp/widget-gladevcp-hal_dro.png | Bin 0 -> 238 bytes lib/python/gladevcp/widget-gladevcp-hal_offset.png | Bin 0 -> 293 bytes lib/python/gladevcp/widget-gladevcp-tooledit.png | Bin 0 -> 135 bytes lib/python/glnav.py | 21 + lib/python/hal_glib.py | 35 + lib/python/rs274/glcanon.py | 199 +- nc_files/ngcgui_lib/arc1.ngc | 298 + nc_files/ngcgui_lib/arc1.png | Bin 0 -> 6732 bytes nc_files/ngcgui_lib/arc2.ngc | 51 + nc_files/ngcgui_lib/arc2.png | Bin 0 -> 5848 bytes nc_files/ngcgui_lib/hole_circle.ngc | 8 - nc_files/ngcgui_lib/lathe/g76base.ngc | 119 + nc_files/ngcgui_lib/lathe/g76base.png | Bin 0 -> 5870 bytes nc_files/ngcgui_lib/lathe/g76diam.ngc | 69 + nc_files/ngcgui_lib/lathe/g76diam.png | Bin 0 -> 7364 bytes nc_files/ngcgui_lib/rectangle_probe.ngc | 2 +- nc_files/ngcgui_lib/utilitysubs/dot.ngc | 4 +- nc_files/ngcgui_lib/utilitysubs/entry.ngc | 10 +- nc_files/ngcgui_lib/utilitysubs/loadtool.ngc | 4 +- nc_files/ngcgui_lib/utilitysubs/pointsdata.ngc | 4 +- scripts/.gitignore | 1 + scripts/get-version-from-git | 7 +- scripts/latency-test | 8 +- scripts/latencyhistogram.in | 807 + scripts/linuxcnc.in | 2 + scripts/runtests | 10 + scripts/sim_pin | 128 + share/axis/tcl/axis.tcl | 44 +- share/axis/tcl/combobox.tcl | 10 +- share/gscreen/images/applet-critical.png | Bin 0 -> 1411 bytes share/gscreen/images/coolant_flood.xcf | Bin 0 -> 4455 bytes share/gscreen/images/coolant_flood_plain.gif | Bin 0 -> 1330 bytes share/gscreen/images/coolant_flood_plain.xcf | Bin 0 -> 2947 bytes share/gscreen/images/coolant_mist.xcf | Bin 0 -> 4644 bytes share/gscreen/images/coolant_mist_plain.gif | Bin 0 -> 1317 bytes share/gscreen/images/coolant_mist_plain.xcf | Bin 0 -> 2994 bytes share/gscreen/images/linuxcnc-wizard.gif | Bin 0 -> 6971 bytes share/gscreen/images/spindle_ccw.gif | Bin 0 -> 209 bytes share/gscreen/images/spindle_cw.gif | Bin 0 -> 209 bytes share/gscreen/images/std_info.gif | Bin 0 -> 659 bytes share/gscreen/images/tool_clear.gif | Bin 0 -> 1458 bytes share/gscreen/images/tool_reload.gif | Bin 0 -> 1458 bytes src/Makefile | 118 +- src/Makefile.inc.in | 6 +- src/Makefile.modinc.in | 2 +- src/configure.in | 5 +- src/emc/iotask/ioControl.cc | 3 +- src/emc/kinematics/5axiskins.c | 130 - src/emc/motion/command.c | 22 +- src/emc/motion/motion.h | 5 +- src/emc/nml_intf/canon.hh | 4 +- src/emc/nml_intf/emc.hh | 1 + src/emc/nml_intf/emc_nml.hh | 1 + src/emc/nml_intf/emcops.cc | 1 + src/emc/nml_intf/interpl.cc | 52 +- src/emc/pythonplugin/python_plugin.cc | 119 +- src/emc/pythonplugin/python_plugin.hh | 13 +- src/emc/pythonplugin/testpp.cc | 34 +- src/emc/rs274ngc/interp_check.cc | 4 +- src/emc/rs274ngc/interp_check.cc.rej | 22 - src/emc/rs274ngc/interp_convert.cc | 112 +- src/emc/rs274ngc/interp_internal.cc | 3 +- src/emc/rs274ngc/interp_internal.hh | 12 + src/emc/rs274ngc/interp_namedparams.cc | 8 +- src/emc/rs274ngc/interp_o_word.cc | 103 +- src/emc/rs274ngc/interp_python.cc | 3 +- src/emc/rs274ngc/interp_remap.cc | 13 +- src/emc/rs274ngc/interpmodule.cc | 4 +- src/emc/rs274ngc/rs274ngc_pre.cc | 100 +- src/emc/task/emccanon.cc | 68 +- src/emc/task/emctask.cc | 2 + src/emc/task/emctaskmain.cc | 109 +- src/emc/task/taskclass.cc | 7 +- src/emc/task/taskintf.cc | 16 +- src/emc/usr_intf/Submakefile | 13 - src/emc/usr_intf/axis/extensions/emcmodule.cc | 32 +- src/emc/usr_intf/axis/scripts/axis.py | 117 +- src/emc/usr_intf/emcrsh.cc | 141 +- src/emc/usr_intf/gremlin/gremlin-run | 30 +- src/emc/usr_intf/gremlin/gremlin.py | 87 +- src/emc/usr_intf/gscreen/Submakefile | 35 + src/emc/usr_intf/gscreen/emc_interface.py | 404 + src/emc/usr_intf/gscreen/gscreen.glade | 3466 ++ src/emc/usr_intf/gscreen/gscreen.py | 3071 + src/emc/usr_intf/gscreen/gscreen2.glade | 79 + src/emc/usr_intf/gscreen/mdi.py | 388 + src/emc/usr_intf/gscreen/preferences.py | 50 + src/emc/usr_intf/halui.cc | 21 +- .../pncconf/pncconf-help/help-axismotor.txt | 62 +- .../pncconf/pncconf-help/help-extcontrols.txt | 5 + src/emc/usr_intf/pncconf/pncconf-help/help-gui.txt | 9 + .../usr_intf/pncconf/pncconf-help/help-mesa.txt | 44 +- src/emc/usr_intf/pncconf/pncconf.glade | 59468 ++++++++++--------- src/emc/usr_intf/pncconf/pncconf.py | 859 +- src/emc/usr_intf/schedrmt.cc | 2 +- src/emc/usr_intf/tooledit.tcl | 462 +- src/emc/usr_intf/touchy/filechooser.py | 2 +- src/emc/usr_intf/usrmot.c | 1027 - src/hal/classicladder/Submakefile | 2 +- src/hal/classicladder/classicladder.c | 124 +- src/hal/classicladder/classicladder.h | 1 + src/hal/classicladder/classicladder_gtk.c | 8 + src/hal/classicladder/manager_gtk.c | 12 +- src/hal/classicladder/manager_gtk.h | 1 + src/hal/classicladder/module_hal.c | 79 +- src/hal/classicladder/print_gnome.c | 2 +- src/hal/classicladder/vars_access.c | 1 + src/hal/components/charge_pump.comp | 6 + src/hal/components/encoder.c | 8 +- src/hal/components/encoder_ratio.c | 8 +- src/hal/components/latencybins.comp | 110 + src/hal/components/lcd.c | 611 + src/hal/components/logic.comp | 16 +- src/hal/components/lowpass.comp | 2 +- src/hal/components/lut5.comp | 25 +- src/hal/components/matrix_kb.c | 422 + src/hal/components/message.comp | 0 src/hal/components/multiclick.comp | 387 + src/hal/components/mux16.comp | 23 +- src/hal/components/oneshot.comp | 7 + src/hal/components/pid.c | 28 +- src/hal/components/siggen.c | 8 +- src/hal/components/sim_encoder.c | 8 +- src/hal/components/thc.comp | 31 +- src/hal/components/time.comp | 81 +- src/hal/drivers/gm.h | 82 + src/hal/drivers/hal_gm.c | 1824 + src/hal/drivers/hal_ppmc.c | 20 +- src/hal/drivers/mesa-hostmot2/encoder.c | 25 + src/hal/drivers/mesa-hostmot2/hm2_pci.c | 33 +- src/hal/drivers/mesa-hostmot2/hm2_pci.h | 2 + src/hal/drivers/mesa-hostmot2/hostmot2.c | 82 +- src/hal/drivers/mesa-hostmot2/hostmot2.h | 292 +- src/hal/drivers/mesa-hostmot2/mesa_7i64.c | 280 - src/hal/drivers/mesa-hostmot2/mesa_8i20.c | 356 - src/hal/drivers/mesa-hostmot2/mesa_autoconf.c | 770 - src/hal/drivers/mesa-hostmot2/pins.c | 15 + src/hal/drivers/mesa-hostmot2/resolver.c | 25 +- src/hal/drivers/mesa-hostmot2/setsserial.c | 503 + src/hal/drivers/mesa-hostmot2/sserial.c | 1961 +- src/hal/drivers/mesa-hostmot2/sserial.h | 228 + src/hal/drivers/mesa-hostmot2/uart.c | 367 + src/hal/drivers/mesa_uart.comp | 107 + src/hal/simdrivers/README.uparport | 25 + src/hal/simdrivers/Submakefile | 21 + src/hal/simdrivers/ppioctl.c | 226 + src/hal/simdrivers/signal.hal | 28 + src/hal/simdrivers/signal.ui | 66 + src/hal/simdrivers/uparport.c | 807 + src/hal/simdrivers/uparport.h | 354 + src/hal/user_comps/gladevcp.py | 11 +- src/hal/user_comps/mb2hal/LogBook.txt | 100 + src/hal/user_comps/mb2hal/Submakefile | 28 + .../mb2hal/examples/mb2hal_example_01_arduino.ini | 48 + .../Modbusino/Modbusino.cpp | 301 + .../Modbusino/Modbusino.h | 38 + .../mb2hal_example_01_arduino.ino | 35 + src/hal/user_comps/mb2hal/mb2hal.c | 442 + src/hal/user_comps/mb2hal/mb2hal.h | 183 + src/hal/user_comps/mb2hal/mb2hal_HOWTO.ini | 223 + src/hal/user_comps/mb2hal/mb2hal_hal.c | 168 + src/hal/user_comps/mb2hal/mb2hal_init.c | 726 + src/hal/user_comps/mb2hal/mb2hal_modbus.c | 188 + src/hal/user_comps/mb2hal/tests/mb2hal_test_01.ini | 88 + src/hal/user_comps/mb2hal/tests/mb2hal_test_02.ini | 19 + src/hal/user_comps/mb2hal/tests/mb2hal_test_03.ini | 23 + src/hal/user_comps/mb2hal/tests/mb2hal_test_04.ini | 59 + src/hal/user_comps/modbus.c | 7 +- src/hal/utils/halcmd_commands.c | 2 +- src/hal/utils/halsh.c | 6 +- src/hal/utils/meter.c | 5 +- src/hal/utils/scope.c | 2 +- src/hal/utils/scope_vert.c | 1 - src/hal/utils/upci.c | 20 +- src/libnml/rcs/rcs_print.cc | 13 +- src/module_helper/module_helper.c | 24 +- src/po/Submakefile | 4 +- src/po/de.po | 5068 +- src/po/es.po | 8 +- src/po/fi.po | 129 +- src/po/fr.po | 3782 +- src/po/hu.po | 554 +- src/po/it.po | 10 +- src/po/ja.po | 2 +- src/po/pl.po | 2 +- src/po/pt_BR.po | 8 +- src/po/ro.po | 10 +- src/po/ru.po | 10 +- src/po/sk.po | 2 +- src/po/sr.po | 12 +- src/po/sv.po | 2 +- src/po/zh_CN.po | 10 +- src/po/zh_HK.po | 42 +- src/po/zh_TW.po | 2 +- src/rtapi/rtai_ulapi.c | 2 + src/rtapi/rtapi.h | 6 +- src/rtapi/rtapi_limits.h | 10 + tcl/bin/emccalib.tcl | 19 +- tcl/bin/pickconfig.tcl | 25 +- tcl/ngcgui.tcl | 23 +- tcl/twopass.tcl | 24 +- tests/halui-jogging/.gitignore | 1 + tests/halui-jogging/core_sim.hal | 53 + tests/halui-jogging/expected | 0 tests/halui-jogging/halui.ini | 82 + tests/halui-jogging/postgui.hal | 38 + tests/halui-jogging/sim.var | 119 + tests/halui-jogging/test-ui.py | 320 + tests/halui-jogging/test.sh | 5 + tests/interp/sequence-number/README | 1 + tests/interp/sequence-number/expected | 15 + tests/interp/sequence-number/rm400.ngc | 5 + tests/interp/sequence-number/test.ini | 2 + tests/interp/sequence-number/test.ngc | 10 + tests/interp/sequence-number/test.sh | 3 + tests/linuxcncrsh/.gitignore | 3 + tests/linuxcncrsh/checkresult | 6 + tests/linuxcncrsh/core_sim.hal | 53 + tests/linuxcncrsh/expected-gcode-output | 406 + tests/linuxcncrsh/linuxcncrsh-test.ini | 78 + tests/linuxcncrsh/lots-of-gcode | 201 + tests/linuxcncrsh/subs/M100 | 20 + tests/linuxcncrsh/test.sh | 62 + tests/mdi-queue/.gitignore | 6 + tests/mdi-queue/core_sim.hal | 53 + tests/mdi-queue/linuxcncrsh-test.ini | 81 + tests/mdi-queue/oword-queue-buster/checkresult | 1 + tests/mdi-queue/oword-queue-buster/core_sim.hal | 1 + tests/mdi-queue/oword-queue-buster/dummy.ngc | 5 + .../oword-queue-buster/linuxcncrsh-test.ini | 1 + tests/mdi-queue/oword-queue-buster/test.sh | 93 + tests/mdi-queue/oword-queue-buster/tool.tbl | 1 + tests/mdi-queue/shared-checkresult | 6 + tests/mdi-queue/simple-queue-buster/checkresult | 1 + tests/mdi-queue/simple-queue-buster/core_sim.hal | 1 + .../simple-queue-buster/linuxcncrsh-test.ini | 1 + tests/mdi-queue/simple-queue-buster/test.sh | 90 + tests/mdi-queue/simple-queue-buster/tool.tbl | 1 + tests/mdi-queue/subs/M100 | 17 + tests/mdi-queue/subs/queue-buster.ngc | 11 + tests/mdi-queue/tool.tbl | 2 + tests/module-loading/.gitignore | 1 + tests/module-loading/encoder/1-names/NUM_PINS | 1 + .../module-loading/encoder/1-names/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/1-names/RESULT | 1 + tests/module-loading/encoder/1-names/expected | 0 tests/module-loading/encoder/1-names/setup.hal | 4 + tests/module-loading/encoder/1-names/test.sh | 1 + tests/module-loading/encoder/8-names/NUM_PINS | 1 + .../module-loading/encoder/8-names/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/8-names/RESULT | 1 + tests/module-loading/encoder/8-names/expected | 0 tests/module-loading/encoder/8-names/setup.hal | 4 + tests/module-loading/encoder/8-names/test.sh | 1 + tests/module-loading/encoder/9-names/NUM_PINS | 1 + .../module-loading/encoder/9-names/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/9-names/RESULT | 1 + tests/module-loading/encoder/9-names/expected | 0 tests/module-loading/encoder/9-names/setup.hal | 4 + tests/module-loading/encoder/9-names/test.sh | 1 + tests/module-loading/encoder/PIN_NAME_REGEX.names | 1 + .../module-loading/encoder/PIN_NAME_REGEX.num_chan | 1 + tests/module-loading/encoder/num_chan=0/NUM_PINS | 1 + .../encoder/num_chan=0/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/num_chan=0/RESULT | 1 + tests/module-loading/encoder/num_chan=0/expected | 0 tests/module-loading/encoder/num_chan=0/setup.hal | 4 + tests/module-loading/encoder/num_chan=0/test.sh | 1 + tests/module-loading/encoder/num_chan=1/NUM_PINS | 1 + .../encoder/num_chan=1/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/num_chan=1/RESULT | 1 + tests/module-loading/encoder/num_chan=1/expected | 0 tests/module-loading/encoder/num_chan=1/setup.hal | 4 + tests/module-loading/encoder/num_chan=1/test.sh | 1 + tests/module-loading/encoder/num_chan=8/NUM_PINS | 1 + .../encoder/num_chan=8/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/num_chan=8/RESULT | 1 + tests/module-loading/encoder/num_chan=8/expected | 0 tests/module-loading/encoder/num_chan=8/setup.hal | 4 + tests/module-loading/encoder/num_chan=8/test.sh | 1 + tests/module-loading/encoder/num_chan=9/NUM_PINS | 1 + .../encoder/num_chan=9/PIN_NAME_REGEX | 1 + tests/module-loading/encoder/num_chan=9/RESULT | 1 + tests/module-loading/encoder/num_chan=9/expected | 0 tests/module-loading/encoder/num_chan=9/setup.hal | 4 + tests/module-loading/encoder/num_chan=9/test.sh | 1 + .../module-loading/encoder_ratio/1-names/NUM_PINS | 1 + .../encoder_ratio/1-names/PIN_NAME_REGEX | 1 + tests/module-loading/encoder_ratio/1-names/RESULT | 1 + .../module-loading/encoder_ratio/1-names/expected | 0 .../module-loading/encoder_ratio/1-names/setup.hal | 4 + tests/module-loading/encoder_ratio/1-names/test.sh | 1 + .../module-loading/encoder_ratio/8-names/NUM_PINS | 1 + .../encoder_ratio/8-names/PIN_NAME_REGEX | 1 + tests/module-loading/encoder_ratio/8-names/RESULT | 1 + .../module-loading/encoder_ratio/8-names/expected | 0 .../module-loading/encoder_ratio/8-names/setup.hal | 4 + tests/module-loading/encoder_ratio/8-names/test.sh | 1 + .../module-loading/encoder_ratio/9-names/NUM_PINS | 1 + .../encoder_ratio/9-names/PIN_NAME_REGEX | 1 + tests/module-loading/encoder_ratio/9-names/RESULT | 1 + .../module-loading/encoder_ratio/9-names/expected | 0 .../module-loading/encoder_ratio/9-names/setup.hal | 4 + tests/module-loading/encoder_ratio/9-names/test.sh | 1 + .../encoder_ratio/PIN_NAME_REGEX.names | 1 + .../encoder_ratio/PIN_NAME_REGEX.num_chan | 1 + .../encoder_ratio/num_chan=0/NUM_PINS | 1 + .../encoder_ratio/num_chan=0/PIN_NAME_REGEX | 1 + .../module-loading/encoder_ratio/num_chan=0/RESULT | 1 + .../encoder_ratio/num_chan=0/expected | 0 .../encoder_ratio/num_chan=0/setup.hal | 4 + .../encoder_ratio/num_chan=0/test.sh | 1 + .../encoder_ratio/num_chan=1/NUM_PINS | 1 + .../encoder_ratio/num_chan=1/PIN_NAME_REGEX | 1 + .../module-loading/encoder_ratio/num_chan=1/RESULT | 1 + .../encoder_ratio/num_chan=1/expected | 0 .../encoder_ratio/num_chan=1/setup.hal | 4 + .../encoder_ratio/num_chan=1/test.sh | 1 + .../encoder_ratio/num_chan=8/NUM_PINS | 1 + .../encoder_ratio/num_chan=8/PIN_NAME_REGEX | 1 + .../module-loading/encoder_ratio/num_chan=8/RESULT | 1 + .../encoder_ratio/num_chan=8/expected | 0 .../encoder_ratio/num_chan=8/setup.hal | 4 + .../encoder_ratio/num_chan=8/test.sh | 1 + .../encoder_ratio/num_chan=9/NUM_PINS | 1 + .../encoder_ratio/num_chan=9/PIN_NAME_REGEX | 1 + .../module-loading/encoder_ratio/num_chan=9/RESULT | 1 + .../encoder_ratio/num_chan=9/expected | 0 .../encoder_ratio/num_chan=9/setup.hal | 4 + .../encoder_ratio/num_chan=9/test.sh | 1 + tests/module-loading/pid/1-names/NUM_PINS | 1 + tests/module-loading/pid/1-names/PIN_NAME_REGEX | 1 + tests/module-loading/pid/1-names/RESULT | 1 + tests/module-loading/pid/1-names/expected | 0 tests/module-loading/pid/1-names/setup.hal | 4 + tests/module-loading/pid/1-names/test.sh | 1 + tests/module-loading/pid/16-names/NUM_PINS | 1 + tests/module-loading/pid/16-names/PIN_NAME_REGEX | 1 + tests/module-loading/pid/16-names/RESULT | 1 + tests/module-loading/pid/16-names/expected | 0 tests/module-loading/pid/16-names/setup.hal | 4 + tests/module-loading/pid/16-names/test.sh | 1 + tests/module-loading/pid/17-names/NUM_PINS | 1 + tests/module-loading/pid/17-names/PIN_NAME_REGEX | 1 + tests/module-loading/pid/17-names/RESULT | 1 + tests/module-loading/pid/17-names/expected | 0 tests/module-loading/pid/17-names/setup.hal | 4 + tests/module-loading/pid/17-names/test.sh | 1 + tests/module-loading/pid/PIN_NAME_REGEX.names | 1 + tests/module-loading/pid/PIN_NAME_REGEX.num_chan | 1 + tests/module-loading/pid/num_chan=0/NUM_PINS | 1 + tests/module-loading/pid/num_chan=0/PIN_NAME_REGEX | 1 + tests/module-loading/pid/num_chan=0/RESULT | 1 + tests/module-loading/pid/num_chan=0/expected | 0 tests/module-loading/pid/num_chan=0/setup.hal | 4 + tests/module-loading/pid/num_chan=0/test.sh | 1 + tests/module-loading/pid/num_chan=1/NUM_PINS | 1 + tests/module-loading/pid/num_chan=1/PIN_NAME_REGEX | 1 + tests/module-loading/pid/num_chan=1/RESULT | 1 + tests/module-loading/pid/num_chan=1/expected | 0 tests/module-loading/pid/num_chan=1/setup.hal | 4 + tests/module-loading/pid/num_chan=1/test.sh | 1 + tests/module-loading/pid/num_chan=16/NUM_PINS | 1 + .../module-loading/pid/num_chan=16/PIN_NAME_REGEX | 1 + tests/module-loading/pid/num_chan=16/RESULT | 1 + tests/module-loading/pid/num_chan=16/expected | 0 tests/module-loading/pid/num_chan=16/setup.hal | 4 + tests/module-loading/pid/num_chan=16/test.sh | 1 + tests/module-loading/pid/num_chan=17/NUM_PINS | 1 + .../module-loading/pid/num_chan=17/PIN_NAME_REGEX | 1 + tests/module-loading/pid/num_chan=17/RESULT | 1 + tests/module-loading/pid/num_chan=17/expected | 0 tests/module-loading/pid/num_chan=17/setup.hal | 4 + tests/module-loading/pid/num_chan=17/test.sh | 1 + tests/module-loading/shared-test.sh | 17 + tests/module-loading/siggen/1-names/NUM_PINS | 1 + tests/module-loading/siggen/1-names/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/1-names/RESULT | 1 + tests/module-loading/siggen/1-names/expected | 0 tests/module-loading/siggen/1-names/setup.hal | 4 + tests/module-loading/siggen/1-names/test.sh | 1 + tests/module-loading/siggen/16-names/NUM_PINS | 1 + .../module-loading/siggen/16-names/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/16-names/RESULT | 1 + tests/module-loading/siggen/16-names/expected | 0 tests/module-loading/siggen/16-names/setup.hal | 4 + tests/module-loading/siggen/16-names/test.sh | 1 + tests/module-loading/siggen/17-names/NUM_PINS | 1 + .../module-loading/siggen/17-names/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/17-names/RESULT | 1 + tests/module-loading/siggen/17-names/expected | 0 tests/module-loading/siggen/17-names/setup.hal | 4 + tests/module-loading/siggen/17-names/test.sh | 1 + tests/module-loading/siggen/PIN_NAME_REGEX.names | 1 + .../module-loading/siggen/PIN_NAME_REGEX.num_chan | 1 + tests/module-loading/siggen/num_chan=0/NUM_PINS | 1 + .../siggen/num_chan=0/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/num_chan=0/RESULT | 1 + tests/module-loading/siggen/num_chan=0/expected | 0 tests/module-loading/siggen/num_chan=0/setup.hal | 4 + tests/module-loading/siggen/num_chan=0/test.sh | 1 + tests/module-loading/siggen/num_chan=1/NUM_PINS | 1 + .../siggen/num_chan=1/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/num_chan=1/RESULT | 1 + tests/module-loading/siggen/num_chan=1/expected | 0 tests/module-loading/siggen/num_chan=1/setup.hal | 4 + tests/module-loading/siggen/num_chan=1/test.sh | 1 + tests/module-loading/siggen/num_chan=16/NUM_PINS | 1 + .../siggen/num_chan=16/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/num_chan=16/RESULT | 1 + tests/module-loading/siggen/num_chan=16/expected | 0 tests/module-loading/siggen/num_chan=16/setup.hal | 4 + tests/module-loading/siggen/num_chan=16/test.sh | 1 + tests/module-loading/siggen/num_chan=17/NUM_PINS | 1 + .../siggen/num_chan=17/PIN_NAME_REGEX | 1 + tests/module-loading/siggen/num_chan=17/RESULT | 1 + tests/module-loading/siggen/num_chan=17/expected | 0 tests/module-loading/siggen/num_chan=17/setup.hal | 4 + tests/module-loading/siggen/num_chan=17/test.sh | 1 + tests/module-loading/sim_encoder/1-names/NUM_PINS | 1 + .../sim_encoder/1-names/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/1-names/RESULT | 1 + tests/module-loading/sim_encoder/1-names/expected | 0 tests/module-loading/sim_encoder/1-names/setup.hal | 4 + tests/module-loading/sim_encoder/1-names/test.sh | 1 + tests/module-loading/sim_encoder/8-names/NUM_PINS | 1 + .../sim_encoder/8-names/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/8-names/RESULT | 1 + tests/module-loading/sim_encoder/8-names/expected | 0 tests/module-loading/sim_encoder/8-names/setup.hal | 4 + tests/module-loading/sim_encoder/8-names/test.sh | 1 + tests/module-loading/sim_encoder/9-names/NUM_PINS | 1 + .../sim_encoder/9-names/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/9-names/RESULT | 1 + tests/module-loading/sim_encoder/9-names/expected | 0 tests/module-loading/sim_encoder/9-names/setup.hal | 4 + tests/module-loading/sim_encoder/9-names/test.sh | 1 + .../sim_encoder/PIN_NAME_REGEX.names | 1 + .../sim_encoder/PIN_NAME_REGEX.num_chan | 1 + .../module-loading/sim_encoder/num_chan=0/NUM_PINS | 1 + .../sim_encoder/num_chan=0/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/num_chan=0/RESULT | 1 + .../module-loading/sim_encoder/num_chan=0/expected | 0 .../sim_encoder/num_chan=0/setup.hal | 4 + .../module-loading/sim_encoder/num_chan=0/test.sh | 1 + .../module-loading/sim_encoder/num_chan=1/NUM_PINS | 1 + .../sim_encoder/num_chan=1/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/num_chan=1/RESULT | 1 + .../module-loading/sim_encoder/num_chan=1/expected | 0 .../sim_encoder/num_chan=1/setup.hal | 4 + .../module-loading/sim_encoder/num_chan=1/test.sh | 1 + .../module-loading/sim_encoder/num_chan=8/NUM_PINS | 1 + .../sim_encoder/num_chan=8/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/num_chan=8/RESULT | 1 + .../module-loading/sim_encoder/num_chan=8/expected | 0 .../sim_encoder/num_chan=8/setup.hal | 4 + .../module-loading/sim_encoder/num_chan=8/test.sh | 1 + .../module-loading/sim_encoder/num_chan=9/NUM_PINS | 1 + .../sim_encoder/num_chan=9/PIN_NAME_REGEX | 1 + tests/module-loading/sim_encoder/num_chan=9/RESULT | 1 + .../module-loading/sim_encoder/num_chan=9/expected | 0 .../sim_encoder/num_chan=9/setup.hal | 4 + .../module-loading/sim_encoder/num_chan=9/test.sh | 1 + tests/multiclick/README | 1 + tests/multiclick/expected | 105 + tests/multiclick/input-signals | 119 + tests/multiclick/test.hal | 59 + tests/t0/.gitignore | 5 + tests/t0/README | 15 + tests/t0/core_sim.hal | 53 + tests/t0/nonrandom/checkresult | 1 + tests/t0/nonrandom/expected-gcode-output | 434 + tests/t0/nonrandom/sim.ini | 83 + tests/t0/nonrandom/test.sh | 1 + tests/t0/nonrandom/tool.tbl.orig | 50 + tests/t0/random-with-t0/checkresult | 1 + tests/t0/random-with-t0/expected-gcode-output | 434 + tests/t0/random-with-t0/sim.ini | 83 + tests/t0/random-with-t0/test.sh | 1 + tests/t0/random-with-t0/tool.tbl.orig | 4 + tests/t0/random-without-t0/checkresult | 1 + tests/t0/random-without-t0/expected-gcode-output | 434 + tests/t0/random-without-t0/sim.ini | 83 + tests/t0/random-without-t0/test.sh | 1 + tests/t0/random-without-t0/tool.tbl.orig | 3 + tests/t0/shared-checkresult | 7 + tests/t0/shared-test.sh | 680 + tests/t0/subs/M100 | 29 + tests/toolchanger/.gitignore | 5 + tests/toolchanger/README | 14 + tests/toolchanger/core_sim.hal | 53 + tests/toolchanger/shared-checkresult | 6 + tests/toolchanger/subs/M100 | 29 + .../toolno-pocket-differ/nonrandom/checkresult | 1 + .../nonrandom/expected-gcode-output | 217 + .../toolno-pocket-differ/nonrandom/sim.ini | 83 + .../toolno-pocket-differ/nonrandom/test.sh | 1 + .../toolno-pocket-differ/random/checkresult | 1 + .../random/expected-gcode-output | 217 + .../toolno-pocket-differ/random/sim.ini | 83 + .../toolno-pocket-differ/random/test.sh | 1 + .../toolno-pocket-differ/shared-test.sh | 151 + .../toolno-pocket-differ/simpockets.tbl.orig | 3 + 913 files changed, 100677 insertions(+), 41539 deletions(-) diff --cc src/emc/motion/motion.h index 07897ef,435eac7..714fe49 --- a/src/emc/motion/motion.h +++ b/src/emc/motion/motion.h @@@ -76,7 -78,7 +76,8 @@@ to another #include "cubic.h" /* CUBIC_STRUCT, CUBIC_COEFF */ #include "emcmotcfg.h" /* EMCMOT_MAX_JOINTS */ #include "kinematics.h" +#include "simple_tp.h" + #include "rtapi_limits.h" #include <stdarg.h> @@@ -139,8 -163,7 +140,6 @@@ extern "C" EMCMOT_SET_DOUT, /* sets or unsets a DIO, this can be imediate or synched with motion */ EMCMOT_SET_AOUT, /* sets or unsets a AIO, this can be imediate or synched with motion */ EMCMOT_SET_SPINDLESYNC, /* syncronize motion to spindle encoder */ - - EMCMOT_SET_SPINDLE_VEL, /* set the spindle vel (>0 means forward, <0 means backward) */ - EMCMOT_SPINDLE_ON, /* start the spindle */ EMCMOT_SPINDLE_OFF, /* stop the spindle */ EMCMOT_SPINDLE_INCREASE, /* spindle faster */ diff --cc src/emc/nml_intf/canon.hh index e78a77a,93bab0e..0a69b06 --- a/src/emc/nml_intf/canon.hh +++ b/src/emc/nml_intf/canon.hh @@@ -154,60 -154,6 +154,61 @@@ struct CANON_POSITION double x, y, z, a, b, c, u, v, w; }; +typedef struct CanonConfig_t { + double xy_rotation; + int rotary_unlock_for_traverse; + double css_maximum; + double css_numerator; + int feed_mode; + int synched; + CANON_POSITION g5xOffset; + CANON_POSITION g92Offset; +/* + canonEndPoint is the last programmed end point, stored in case it's + needed for subsequent calculations. It's in absolute frame, mm units. + + note that when segments are queued for the naive cam detector that the + canonEndPoint may not be the last programmed endpoint. get_last_pos() + retrieves the xyz position after the last of the queued segments. these + are also in absolute frame, mm units. + */ + CANON_POSITION endPoint; + CANON_UNITS lengthUnits; + CANON_PLANE activePlane; +/* Tool length offset is saved here... [truncated message content] |