Skip to content

Conversation

@APDevice
Copy link
Contributor

I have added support for the Adafruit PyGamer. The board is nearly identical to the PyBadge, just with a few changes and additions. Chiefly the directional buttons have been replaced with an analog stick and there is an microSD card slot for additional storage.

This is my first attempt to add a device, though I did test it on the hardware to make sure that I had assigned the analog stick correctly

Schematic: https://learn.adafruit.com/assets/76005

APDevice added 5 commits June 16, 2020 03:38
Added support for the Adafruit Pygamer, a varient of the PyBadge.
Revised the name of variable to be in line with others of the same type.
@APDevice APDevice marked this pull request as draft June 16, 2020 20:53
@APDevice APDevice marked this pull request as ready for review June 16, 2020 21:07
@deadprogram deadprogram changed the base branch from master to dev June 17, 2020 06:39
@deadprogram
Copy link
Member

Hi @APDevice first of all, thanks for the contribution.

I have changed the branch to be against the dev branch as mentioned here: https://github.com/tinygo-org/tinygo/blob/master/CONTRIBUTING.md#how-to-use-our-github-repository

I do not think you meant to delete the .gitignore file, did you? We need that file, you probably want to remove that commit and then force push back to your feature branch.

Thank you!

@APDevice
Copy link
Contributor Author

APDevice commented Jun 17, 2020

Hi @APDevice first of all, thanks for the contribution.

I have changed the branch to be against the dev branch as mentioned here: https://github.com/tinygo-org/tinygo/blob/master/CONTRIBUTING.md#how-to-use-our-github-repository

I do not think you meant to delete the .gitignore file, did you? We need that file, you probably want to remove that commit and then force push back to your feature branch.

Thank you!

AH yes, sorry. I got a little confused with that. I believe I have fixed it now!

@deadprogram
Copy link
Member

Please also add a "smoke test" to the Makefile like this: https://github.com/tinygo-org/tinygo/blob/dev/Makefile#L296-L297

Thank you!

@APDevice
Copy link
Contributor Author

APDevice commented Jun 18, 2020

So I added the smoke test, but now it's saying it's conflicted with the dev makefile, and the error just suggests that the conflict is with a blank line. I’m not sure how to resolve the issue.

@deadprogram
Copy link
Member

If you had originally created your feature branch against the dev branch instead of the master branch, you probably would not have this problem.

You can resolve by changing all of this:

<<<<<<< master
	$(TINYGO) build -size short -o test.hex -target=pygamer             examples/blinky1
	@$(MD5SUM) test.hex
=======
>>>>>>> dev

to this:

	$(TINYGO) build -size short -o test.hex -target=pygamer             examples/blinky1
	@$(MD5SUM) test.hex

You could use the web editor or however you normally edit code.

Hope that helps!

@APDevice
Copy link
Contributor Author

APDevice commented Jun 18, 2020

Well the confusing thing is that that’s not in the file. I even double checked.

Ok, so I merged my dev with my master. It’s sloppy I realize, but it seems to resolve the issue.

@deadprogram
Copy link
Member

Thank you very much for working on this @APDevice I will now squash/merge into dev. Thanks again!

@deadprogram deadprogram merged commit 4e8e3f3 into tinygo-org:dev Jun 19, 2020
@niaow niaow added this to the v0.14 milestone Jun 27, 2020
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