Skip to content

Issue 78#79

Merged
mustangzr1 merged 5 commits intodevfrom
issue-78
Mar 3, 2019
Merged

Issue 78#79
mustangzr1 merged 5 commits intodevfrom
issue-78

Conversation

@SaltyJoke
Copy link
Contributor

Resolves #78
Do we want to synchronize all the mechanism branches with dev at some point?

Copy link
Contributor

@dfang314 dfang314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought that we decided on using distance/encoders to measure whether or not we are off the ground (instead of time in this pr). Additionally, I think that it's better to have the override work no matter what.

@SaltyJoke SaltyJoke closed this Mar 2, 2019
@SaltyJoke SaltyJoke reopened this Mar 2, 2019
@SaltyJoke
Copy link
Contributor Author

(Sorry, pressed wrong button.)
I thought we wanted to use both drivetrain stall and encoders to check if done climbing. The stalled condition needs a timer if we use an 'or' instead of 'and'. I am fine with only using encoders.

@dfang314
Copy link
Contributor

dfang314 commented Mar 3, 2019

We're using encoders to check whether we're off the ground (it doesn't make sense to use it to check whether we have reached the top since we are doing the up-down thing). In other words, I was thinking of using the encoder in place of the timer.

@SaltyJoke
Copy link
Contributor Author

Understood. Made changes ^
Anything else?

@SaltyJoke
Copy link
Contributor Author

Thanks. My JDK and/or JAVA_HOME seems to be broken now so I don't have a compiler.

@mustangzr1 mustangzr1 merged commit 8281a91 into dev Mar 3, 2019
@dfang314 dfang314 deleted the issue-78 branch March 3, 2019 23:43
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