Skip to content

Merge 3.x into master #1061

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 15 commits into from
Jul 26, 2018
Merged

Merge 3.x into master #1061

merged 15 commits into from
Jul 26, 2018

Conversation

tannewt
Copy link
Member

@tannewt tannewt commented Jul 26, 2018

No description provided.

dhalbert and others added 15 commits June 26, 2018 19:49
@dhalbert
Freeze Adafruit_CircuitPython_Crickit into crickit builds
1f3de51
@dhalbert
add Crickit library to docs/drivers.rst
f5df3d3
@dhalbert
updates crickit and motor frozn libs with latest changes, including 5…
d98701c 
…50-2400 default servo range
@tannewt
Merge pull request micropython#965 from dhalbert/3.x-crickit-lib
6908eed 
3.x crickit lib
@dhalbert
fix OneWire timing and DigitalInOut.switch_to_input()
52a1154
@dhalbert
fix nrf and esp8266 builds for OneWire fix
b4fd77b
@dhalbert
implement mp_hal_delay_us() to not need interrupts, and use it
2a0b857
@dhalbert
remove previously added esp8266/mphalport.{c,h}
7028a39
@dhalbert
remove unnecessary extern in nrf/mphalport.c
7c9a0e2
@dhalbert
update crickit-related libs
b68cd14
@tannewt
Merge pull request micropython#973 from dhalbert/3.x_onewire_fix
f1248dc 
fix OneWire timing and DigitalInOut.switch_to_input()
@dhalbert
bring all frozen libraries up to date
bf9981e
@tannewt
Merge pull request micropython#977 from dhalbert/update_crickit_libs-2
074c5ea 
update crickit-related libs
@mrmcwethy @tannewt
include RTC fix for SAMd51 in circuitpython build
d9723bb
@tannewt
Merge branch '3.x' into import_merge
d855f32
@tannewt tannewt added this to the 4.0 Alpha milestone Jul 26, 2018
@tannewt tannewt requested a review from dhalbert July 26, 2018 00:18
dhalbert
dhalbert approved these changes Jul 26, 2018
View reviewed changes
Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

Thanks!

@dhalbert dhalbert merged commit ef46a0a into adafruit:master Jul 26, 2018
@dhalbert
Copy link
Collaborator

Hmm. This merge does not include the long-lived fix.

@dhalbert
Copy link
Collaborator

@tannewt do you want to redo this to include the long-lived fix?

@tannewt tannewt mentioned this pull request Jul 26, 2018
Merged
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 @mrmcwethy