Skip to content

Merge in the rest of 3.x#1062

Merged
dhalbert merged 8 commits into
adafruit:masterfrom
tannewt:import_merge
Jul 26, 2018
Merged

Merge in the rest of 3.x#1062
dhalbert merged 8 commits into
adafruit:masterfrom
tannewt:import_merge

Conversation

@tannewt
Copy link
Copy Markdown
Member

@tannewt tannewt commented Jul 26, 2018

I did #1061 from my 3.x branch, not adafruit/3.x

tannewt and others added 8 commits July 3, 2018 14:16
@tannewt
Merge pull request micropython#986 from tannewt/include_rtc_fix
ff0a6f4 
include RTC fix for SAMd51 in circuitpython build
@dhalbert
update Crickit library to fix stepper Drive issues
53d8213
@tannewt
Merge pull request micropython#993 from dhalbert/update_crickit_libs-3
fba2d9f 
update Crickit library to fix stepper Drive issues
@dhalbert
must set pull after setting direction with gpio_set_pin routines
8bb363f
@kattni
Merge pull request micropython#1006 from dhalbert/3.x-fix-pull
85a5276 
must set pull after setting direction with gpio_set_pin routines
@dhalbert
Prevent repetitive recursive scanning of dicts when making them long-…
be1d882 
…lived
@tannewt
Merge pull request micropython#1052 from dhalbert/speed-up-dict-long-…
08def6b 
…lived

Prevent repetitive recursive scanning of dicts when making them long-…
@tannewt
Merge remote-tracking branch 'adafruit/3.x' into import_merge
1ffb0a7
@tannewt tannewt added this to the 4.0 Alpha milestone Jul 26, 2018
@tannewt tannewt requested a review from dhalbert July 26, 2018 01:53
@dhalbert
Copy link
Copy Markdown
Collaborator

dhalbert commented Jul 26, 2018

There's something weird here, because most of these commits are already merged in, like 8bb363f, the gpio pull fix, which I merged in as part of #1031. And that commit is already in the commits in master. It won't hurt, but I would expect it to notice these are done already.

@dhalbert dhalbert merged commit fbfc9c3 into adafruit:master Jul 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dhalbert dhalbert dhalbert approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.0 Alpha

Development

Successfully merging this pull request may close these issues.

3 participants

@tannewt @dhalbert @kattni