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

Merge development branch into master #170

Merged
merged 2 commits into from
May 20, 2017
Merged

Merge development branch into master #170

merged 2 commits into from
May 20, 2017

Conversation

Gadgetoid
Copy link
Collaborator

At the risk of being controversial, I suggest the current development branch is merged wholly into master since it's never going to get any amount of interest or testing when it's relegated to a development branch.

I'm preparing to update Unicorn HAT's back-end with a renewed, Python-wrapped fork of this repository (since I can't depend on upstream to keep updates rolling in a timely fashion and my previous hard fork solution was heinously ugly). This will be based upon the development branch, and thus it should be battle-tested adequately very soon.

I would also encourage the use of tagging and subsequently releases to milestone the current state of the codebase before committing this merge, so that anyone with a mission critical dependency upon this codebase can still easily access a known good state. (granted if they haven't forked it, they're crazy, but it couldn't hurt to be nice ;)

tvoverbeek and others added 2 commits December 10, 2016 17:04
select either PWM, PCM or SPI.
PCM and SPI only support 1 channel.
Increased version to 1.1.0.
Updated README.md
@penfold42
Copy link
Contributor

+1 to everything you said.

Hyperion uses this as a sub module so tags would help there too

@jgarff jgarff merged commit 00c8ee7 into master May 20, 2017
@jgarff
Copy link
Owner

jgarff commented May 20, 2017

I agree, and just merged it. I was hoping that we'd get more testing on the dev branch, but since that didn't happen, we'll address new issues after they arise on the mainline.

jgarff pushed a commit that referenced this pull request Jul 6, 2017
* Pi Zero W v1.1 support added to rpihw.c

* Update rpihw.c (#164)

added raspi Zero W

* Device-tree auto-detect

* Channel gamma support

* Reverted to old detection, added 0x9200c1

* Changed gamma correction to match leds

* Removed dead dt detect code

* Re added "Pi Zero W v1.1", .hwver = 0x9000c1, (#181)

* Added PCM and SPI support. Specifying the corresponding GPIO pin will (#170)

select either PWM, PCM or SPI.
PCM and SPI only support 1 channel.
Increased version to 1.1.0.
Updated README.md

* Fix setting of brightness in go bindings (#174)

Fixes #151

* Added delay to ensure reset time being met with low led counts (#157)

* Fix includes as per #178 (#189)

* clean up doco and strandtest (#187)

* updated documentation on GPIO usage
strandtest now defaults to GRB colour order
added version.h to gitignore

* updated python readme

* more README cleanup

* added notes on spi max transfer size
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.

4 participants