Skip to content

merge 2.x changes into master; touch up Makefile CFLAGS logic#320

Merged
dhalbert merged 9 commits into
adafruit:masterfrom
dhalbert:master
Oct 13, 2017
Merged

merge 2.x changes into master; touch up Makefile CFLAGS logic#320
dhalbert merged 9 commits into
adafruit:masterfrom
dhalbert:master

Conversation

@dhalbert
Copy link
Copy Markdown
Collaborator

@dhalbert dhalbert commented Oct 13, 2017

There are multiple commits here because they reflect all the commits to 2.x that are now being added to master. I'd suggest not squashing these because they reflect the true history of the individual changes to 2.x.

dhalbert and others added 8 commits September 29, 2017 08:54
@dhalbert @tannewt
reset pins on PDMIn deinit(). Fixes adafruit#275.
b2dcc5b
@dhalbert @tannewt
Make touch more sensitive. Add .raw_value and .threshold attributes.
7f74412
@deshipu @tannewt
Add board file for the hacked Trinket M0 Haxpress (adafruit#303)
c2bb9e2 
Add a hacked Tinket M0 Haxpress board definition

Based on https://daveastels.com/2017/09/01/trinket-m0-express-hack/
@dhalbert @tannewt
Do not allow a *io object to be used after deinit().
c478c10 
Fixes adafruit#278, adafruit#277, adafruit#276, adafruit#275.
@deshipu @tannewt
Add a gamepad module for handling buttons in the background. (adafr…
f498167 
…uit#295)

The `GamePad` singleton monitors buttons in the background to make sure a button press is never missed and debouncing happens consistently.
@dhalbert @tannewt
Freeze libraries needed by adafruit_circuitplayground library into fi…
ef65ee7 
…rmware.

This saves a lot of RAM. Fixes adafruit#287.
Also fixed compilation of frozen_mpy.c to use supplied make rule rather than
builtin rule (supplied rule suppresses printing out the gcc command line).
@dhalbert
Don't create a new filesystem if we restart in safe mode. (adafruit#319)
922006d
@dhalbert
merge 2.x changes into master; touch up Makefile CFLAGS logic
fabaa2e
@dhalbert dhalbert requested a review from tannewt October 13, 2017 00:14
@dhalbert
Copy link
Copy Markdown
Collaborator Author

dhalbert commented Oct 13, 2017

rats - travis failure; CPX is overflowing flash with the internal frozen modules

@tannewt
Copy link
Copy Markdown
Member

tannewt commented Oct 13, 2017

Ah, probably because its set up with the internal FS currently.

@dhalbert
Copy link
Copy Markdown
Collaborator Author

dhalbert commented Oct 13, 2017 •
edited
Loading

Gemma and similar do fit, with plenty of space. Also -finline-limit=19 in combination with -flto is causing breakage like I described in chat: some routines seem to have been optimized away. I have turned it off. That's weird, because -finline-limit works fine in 2.x. It may be due to some other CFLAGS changes. (Problem was evident on both SAMD21 and SAMD51 builds during debugging.)

I'll adjust things to disable the CPX frozen modules for now, except for neopixel.

tannewt
tannewt approved these changes Oct 13, 2017
View reviewed changes
Copy link
Copy Markdown
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this merge Dan!

@tannewt
Copy link
Copy Markdown
Member

tannewt commented Oct 13, 2017

Looks like it needs a rebase. (Probably after your asf4 PR)

@dhalbert
Copy link
Copy Markdown
Collaborator Author

dhalbert commented Oct 13, 2017

I'm seeing "This branch has no conflicts with the base branch" in github, so what makes it look like rebase is needed?

@dhalbert dhalbert merged commit 6e8fa8b into adafruit:master Oct 13, 2017
@dhalbert
Copy link
Copy Markdown
Collaborator Author

dhalbert commented Oct 13, 2017 •
edited
Loading

I did a regular merge instead of trying to rebase locally. I won't do that very often but I wanted to preserve the 2.x commits and I had applied all those after the asf4 pr. So not sure why it wasn't rebase-able but not worth spending too much time on.

@tannewt
Copy link
Copy Markdown
Member

tannewt commented Oct 13, 2017

Ok, no worries! Thanks for doing that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tannewt tannewt tannewt approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dhalbert @tannewt @deshipu