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

Add state machine to handle blocked chute #3

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Conversation

jkbhagatio
Copy link
Member

No description provided.

@jkbhagatio
Copy link
Member Author

@glopesdev @aspaNeuro can we merge into main here?

There are conflicts - not sure if you want to keep anything from main, probably we can just merge with the "keep theirs" strategy to resolve all conflicts by giving preference to the gl-dev branch, but will let you guys decide.

@glopesdev glopesdev changed the title Gl dev Add state machine to handle blocked chute Aug 21, 2024
@glopesdev
Copy link
Collaborator

@jkbhagatio It looks like the current code on main is a significant refactoring of the initial firmware using full micropython classes which seem to implement debouncer logic for pellet delivery. I am not sure yet what the differences might be. Seems like there was a fair amount of work put into it, but I'm not sure it was ever tested in the field.

Might be better to discuss the two implementations and test and pick one, or decide a strategy on how to split the two code bases going forward, so we don't end up accidentally mixing source code.

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