From: Sebastian K. <gi...@gi...> - 2011-04-08 00:50:02
|
Merge branch 'v2.5_branch' * v2.5_branch: (23 commits) Make a script to say the version of the software remove redundant initialization remove a redundant initialization fix a NULL pointer dereference fix a NULL pointer dereference Docs: adjust columns in table Docs: add halui section gcode doc markup fixes make AXIS and motion more likely to agree on what a full circle is Revert "gearchange: support up to 32 gears" add missing modal groups halui manpage: pin names use "-", not "_" tormach config: add config for the PCNC-770 tormach config: remove now-misleading comments about stepconf tormach config: correct travel limits & homing tormach config: use correct speed & accel tormach config: rename pcnc-1100 to pcnc-1100-seriesII tormach config: enable mdi when unhomed tormach config: add spindle speed display tormach config: fix spindle speed control ... http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=0c7d345 configs/tormach/README | 2 +- configs/tormach/custom.hal | 2 - configs/tormach/custom_postgui.hal | 3 +- configs/tormach/pcnc-1100-seriesII.ini | 134 ++++++++++++++++++++++++++ configs/tormach/pcnc-1100.hal | 29 ++++-- configs/tormach/pcnc-1100.ini | 122 ------------------------ configs/tormach/pcnc-1100.xml | 72 ++++++++++----- configs/tormach/pcnc-770.hal | 161 ++++++++++++++++++++++++++++++++ configs/tormach/pcnc-770.ini | 134 ++++++++++++++++++++++++++ configs/tormach/pcnc-770.xml | 52 ++++++++++ debian/update-dch-from-git | 21 +---- docs/man/man1/halui.1 | 10 +- docs/src/config/ini_config.txt | 10 ++- docs/src/gcode/main.txt | 4 +- docs/src/gcode/overview.txt | 29 +++--- scripts/get-version-from-git | 21 ++++ src/emc/rs274ngc/gcodemodule.cc | 4 +- src/hal/classicladder/drawing.c | 2 +- src/hal/classicladder/files.c | 2 +- src/hal/classicladder/files_project.c | 5 +- src/hal/components/gearchange.comp | 122 ++++++++---------------- src/hal/components/limit3.comp | 1 - 22 files changed, 653 insertions(+), 289 deletions(-) |