I'm asking for review and merge into master of the following patches: 1. docs: fix iocontrol manpage - add missing tool-prep-pocket pin =================================================================
http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/fix-iocontrol-manpage --- 2. config: add missing osubdemo.ui file ================================================================= this file is needed for the configs/sim/owordm6-ui.ini demo of toolchange-with-gcode-subroutines - wont run without it: http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/add-missing-ui-file-candidate --- 3. iocontrol-v2: improve backwards compatibility ================================================================= A step towards iocontrol-v2 being a drop-in replacement for iocontrol. No functional changes, but reduce 'surprise factor' for folks migrating to iocontrol-v2. http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/iocontrol-optional-start-change-candidate --- 4. interp,iocontrol,iocontrol-v2: fix t handling of M61 in iocontrol, iocontrol-v2 and interpreter ================================================================================================== This fixes a bug (see recent -devel discussion). M61 wouldnt update the tool-loaded display in the UI, and param #5400 ff. It also improves handling of toolchange through G-code procedures by notifying the M6_COMMAND handler of an M61. http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/fix-m61-candidate --- 5. docs,build: source-highlighting for HAL cmd and G-code files in HTML. ======================================================================== Improve readability by syntax-highlighting halcmd and G-code files. Several manual changes I have in the queue depend on it. http://git.mah.priv.at/gitweb/emc2-dev.git/shortlog/refs/heads/asciidoc-ngc-hal-highlighting-candidate -------- scrutiny required on these patches: 1,2: minor 3: some 4: 'hard look suggested'. 5: 'deep hard look suggested' on commit 230915: (http://git.mah.priv.at/gitweb/emc2-dev.git/commit/2309150e53a0b266c6f76ff95e540422a45e0887) This modifies src/docs/Submakefile and I am unsure it reflects the proper jepler way of doing things. If the kind reader is surprised about build contortions src/docs/source-highlight/Makefile: let me assert that source-highlight ranks top among the 'packages most inflexible to integrate' hitlist. -- git-test-sequence master.. with runtests is fine. I'd be grateful if we could tick these off. thanks in advance, Michael ------------------------------------------------------------------------------ Enable your software for Intel(R) Active Management Technology to meet the growing manageability and security demands of your customers. Businesses are taking advantage of Intel(R) vPro (TM) technology - will your software be a part of the solution? Download the Intel(R) Manageability Checker today! http://p.sf.net/sfu/intel-dev2devmar _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
