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

Support zAxisAuto settings from GroundControl (B12 Y) #328

Merged
merged 2 commits into from
Nov 20, 2017

Conversation

skiz
Copy link

@skiz skiz commented Nov 18, 2017

Firmware update that allows setting the AUX1 to to be active high for supporting M codes based on B12 Y

@blurfl
Copy link
Collaborator

blurfl commented Nov 18, 2017

How about moving the pin definition up to the top where the AUX pins are defined, so it's clear which pins have been committed? AUX4 is the z-axis depth probe presently. When moving the definition out of the function, maybe name spindleControlPin would be better?

@skiz
Copy link
Author

skiz commented Nov 18, 2017

@blurfl AUX1 has already been committed, and I just made the existing code configurable. AUX1 has 2 different usages depending on the configuration (servo signal vs 5v). I'll clean this up a bit.

clean up Pin defines
@BarbourSmith
Copy link
Member

@blurfl you have the most in depth knowledge of this section of code, thank you for taking a look at it. Does it look ready to merge to you?

@skiz Thank you for all of these improvements! What a cool thing to see first thing on a Monday morning 😀

@blurfl
Copy link
Collaborator

blurfl commented Nov 20, 2017

It looks good. Thanks for cleaning up the AUX4 definition as well. Ship it!

@BarbourSmith BarbourSmith merged commit 0d37c77 into MaslowCNC:master Nov 20, 2017
blurfl added a commit to blurfl/Firmware that referenced this pull request Feb 16, 2018
PR MaslowCNC#328 added a setting to enable/disable spindle control. The setting was named 'zAxisAuto' which seems confusing as it is being used as an on/off control for spindle power. Change the name and accompanying text in Report.cpp to 'spindleAutomation' to better reflect its use. Note that the change in GC that accomanied MaslowCNC#328 was PR MaslowCNC#458.
@blurfl blurfl mentioned this pull request Feb 16, 2018
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.

3 participants