Skip to content

Merge Hw 2p4 to develop#109

Merged
akuker merged 27 commits intodevelopfrom
hw_2p4
Jun 9, 2021
Merged

Merge Hw 2p4 to develop#109
akuker merged 27 commits intodevelopfrom
hw_2p4

Conversation

@akuker
Copy link
Copy Markdown
Member

@akuker akuker commented Jun 8, 2021

Should have merged hardware updates to develop before master....

Tony and others added 27 commits December 28, 2020 12:00
…ce the correct gender of parts. Should be no functional change
…ce the correct gender of parts. Should be no functional change
* Update README.md

Added reference to gitflow

* Updated to match new versioning structure (#73)

* Updated to match new versioning structure

* fix version number

Co-authored-by: Tony Kuker <akuker@gmail.com>

* Scsimon improvements (#74)

* Updated scsimon to save data on a nano-second time scale, instead of micro-second

* Cleanup error messages and data types

Co-authored-by: Tony Kuker <akuker@gmail.com>

* Updated for new version number

* Change reported version back to development build

Co-authored-by: Tony Kuker <akuker@gmail.com>
Revert extraneous whitepace
Revert unneeded change.
@akuker akuker merged commit a41855c into develop Jun 9, 2021
@akuker akuker deleted the hw_2p4 branch June 9, 2021 00:06
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.

1 participant