Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tp: fix for pause during spindle synced motion regression from 2.6 #12

Merged
merged 1 commit into from
Apr 3, 2015

Conversation

robEllenberg
Copy link
Collaborator

This fix restores 2.6's handling of pause during a spindle-synced move (i.e. don't pause during a spindle-synced move).

Signed-off-by: Robert W. Ellenberg <rwe24g@gmail.com>
@jepler jepler merged commit a468944 into LinuxCNC:2.7 Apr 3, 2015
robEllenberg pushed a commit to robEllenberg/linuxcnc-mirror that referenced this pull request Aug 25, 2015
2c88c39 Merge pull request LinuxCNC#13 from strahlex/mklauncher4
3afd7aa updating definitions for mklauncher
30ba664 added none to motion type to work with mkwrapper
0fa4107 updated mklauncher definitions
3a015e3 using index field for mklauncher
18e2954 updated definition for mklauncher
2a36b25 added definitions for mklauncher
c950308 fix missing msgid in value.proto
f9a759a Merge pull request LinuxCNC#12 from mhaberler/master
0a01fd2 object: add Vtable, Inst descriptions and msgid's
8ae9f49 HAL instantiation: update to new HAL objects, instance-related commands
9f35d82 proto definitions: add unique msgd options
9a4e3e0 README.msgid  - about protobuf type id's and their usage
4f854b3 README.style: remove obsolete file
d281116 nanopb.proto: bring in msgid changes from nanopb upstream
118f0e3 Merge pull request LinuxCNC#11 from mhaberler/prune-messages-for-nanopb
0674348 nanopb.proto: update to nanopb-0.3.2
5167bcb Merge pull request LinuxCNC#10 from mhaberler/prune-messages-for-nanopb
90beece message.proto: do not export mkwrapper messages to nanopb/RT

git-subtree-dir: src/machinetalk/proto
git-subtree-split: 2c88c39
@robEllenberg robEllenberg deleted the hotfix/pause-sync-regression branch June 14, 2019 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants