Merging updates from gentnerlab into our master branch.#2
Open
Lathomas42 wants to merge 121 commits intotheunissenlab:masterfrom
Open
Merging updates from gentnerlab into our master branch.#2Lathomas42 wants to merge 121 commits intotheunissenlab:masterfrom
Lathomas42 wants to merge 121 commits intotheunissenlab:masterfrom
Conversation
adding support for Arduino
switch to BSD license
Double staircase
derisking the pyaudio callback
added new free food block branch to to merge with newer commits of ma…
replaced class_assoc with a port lookup
* Raspberry pi devices * Hopper/feed * PWM interfaces * PWM houslight * Fixing houselights * minor * audio * sound works * raspi updates * raspi updates * starting development again * updates for raspi behaviors * box rev3 working * Added hostname switch for comedi extension * allsummary * parenthesis * hostname * change readme * add glab_behaviors * houselight update * emails * remove allsummary script from setup.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Going to create this pull request to see the merge conflicts