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

6.3.x cherry pick from main #4757

Merged
merged 60 commits into from
May 25, 2021

Conversation

dhalbert
Copy link
Collaborator

@dhalbert dhalbert commented May 13, 2021

Many cherry picks from main to add new boards, correct pin errors, and fix a few useful significant bugs.

Artisense RD00 board #4512. Thanks @m-byte.
Correct pins for UM TinyS2. #4534. Thanks @UnexpectedMaker.
HunterCat NFC board. #4545. Thanks @sabas1080
BDMicro VINA-D51 updates. #4561. Thanks @bd34n.
QT Py RP2040 D3 pin correction. #4581. Thanks @dhalbert.
STM32F4 Black Pill add flash chip. #4582. Thanks @kevinlutzer.
Remove robots.txt from ReadTheDocs. #4584. Thanks @dhalbert.
Adafruit NeoKey Trinkey. #4595. Thanks @ladyada.
Adafruit ProxLight Trinkey. #4594. Thanks @ladyada.
Adafruit Rotary Trinkey. #4594. Thanks @ladyada.
Adafruit Slide Trinkey. #4595. Thanks @ladyada.
Turn storage back on for NeoPixel Trinkey. #4599. Thanks @dhalbert.
Pimoroni Pico LiPo 4MB. #4612, #4633. Thanks @ZodiusInfuser.
Pimoroni Pico LiPo 16MB. #4612, #4633. Thanks @ZodiusInfuser.
Add VBUS_SENSE pin to Pi Pico. #4624. Thanks @dhalbert.
SparkFun MicroMod RP2040. #4625. Thanks @stonehippo.
ARAMCON2 Badge. #4627. Thanks @bmeisels.
Fix board.I2C() pins for Feather M0 Adalogger. #4631. Thanks @anecdata.
Adafruit ItsyBitsy RP2040 corrections. #4687. Thanks @kattni.
Fix crystal settings for Espruino Pico. #4719. Thanks @hierophect.
Fix pins on SparkFun Pro Micro RP2040. #4733. Thanks @nm3210.
Free up PA00 and PA01 on Big Honking Button. #4735. Thanks @bleything.
Fix FunHouse name. #4736. Thanks @Neradoc.
Add LED pin to many Adafruit boards. #4742. Thanks @kattni.
Adafruit QT 2040 Trinkey. #4750. Thanks @ladyada.
Fix overwrite of run_reason. #4708. Thanks @hierophect.
Update SparkFun ThingPlus RP2040 pins. #4691. Thanks @nm3210.
Fix GC problem in ulab. Fixes #4753. v923z/micropython-ulab#387. Thanks @v923z.
Fix SparkFun MicroMod RP2040 pins. #4663. Thanks @zapwizard.
Update frozen libraries. adafruit_hid is deliberately held at 4.3.0, instead of 5.0.0. Thanks @dhalbert.
Add Arduino Nano RP2040. #4802 (done manually). Thanks @BlitzCityDIY.
Do not leave board.I2C() locked on soft reload. #4801. Thanks @dhalbert.
Lengthen crystal oscillator startup time on RP2040. adafruit/pico-sdk#4. Thanks @dhalbert.

m-byte and others added 30 commits May 13, 2021 14:48
ESP-01 header renamed to AUX, and expanded to 12 pins from 8
pins. Pins 1-8 still accommodate the ESP-01, with expansion to full
SERCOM 4-pad support to allow for SPI and I2C on that expansion port
with additional GPIO control.

Update pins.c with additional signals provided AUX_1-8, along with
UART, SPI, I2C name usage as aliases to appropriate AUX_1-8
signals. Additionally, add several alternate names specific to several
expansion modules - the ESP-01, and the ATW-01 using the WINC_1500
(SPI) w/interrupt and control needed for the WINC - with assignments
to module pin positions.

Re-work SERCOM assignments to accommodate the above from other parts
of the board, which required moving a SERCOM or two around in order to
accommodate the 4-pad sercom pin mapping on the AUX port.

Built and tested using latest from 'main':

Adafruit CircuitPython 6.2.0-rc.0-70-ga1562430f-dirty on 2021-04-05;
BDMICRO VINA-D51 with samd51n20
This update to the PR retains the earlier board rev (with a rename) so
that backward binary compatibility is not lost for the earlier board
revision. The primary name 'vina-d51' is retained for the latest
revision to make it easy for customers to select the proper UF2
download - because the name matches the commercial name.

Details:

Replace bdmicro_vina_d51 with bdmicro_vina_d51_pcb7 (revision 7 of
PCB) with boardfiles unmodified. Add _pcb7 to the workflow build.

Replace bdmicro_vina_d51 boardfile content with latest PCB updates
(revision 10 ov PCB). Add minimal comments in the board files to make
it clear which PCB revision is implemented. Update the USB PID to
reflect an updated board revision.
Prompted by https://forums.adafruit.com/viewtopic.php?f=60&t=178237.
Also add some whitespace to make pin aliases stand out, and add GP23 as an alias for `SMPS_MODE`.
Added board definition for the Sparkfun MicroMod RP2040.

Mostly followed the format for pins from the MicroMod nRF52840 board
definition, as MicroMod tries to standardize pins across
microcontrollers.
I missed a few pin definitions. Fixed those.
@tannewt
Copy link
Member

tannewt commented May 14, 2021

@tannewt anything you want to add to this?

Not that I can think of. I don't really remember anything prior to the merge. :-)

tannewt
tannewt previously approved these changes May 14, 2021
Copy link
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.

Thank you!

@v923z
Copy link

v923z commented May 14, 2021

@dhalbert

Many cherry picks from main to add new boards, correct pin errors, and fix a few useful bugs.

Out of curiosity, what is a useful bug?

@dhalbert
Copy link
Collaborator Author

Needs cherry-pick from #4765.

@stonehippo
Copy link

I think it needs #4663, too

Both D0 and D1 were assigned to pin_GPIO7, fixed D0 to pin_GPIO6, which also matches the comment.
@dhalbert dhalbert dismissed stale reviews from tannewt and hierophect via 8b97d8f May 14, 2021 19:46
@anecdata
Copy link
Member

Adafruit Rotary Trinkey. #4594. Thanks @ladyada. from above... Rotary Trinkey is #4449, but it looks like that should be in 6.2.0 except that downloading it from circuitpython.org gets a NoSuchKey XML error.

@dhalbert
Copy link
Collaborator Author

@anecdata This will add the missing boards to 6.3.0. I'm not sure why they are listed in the boards file for 6.2.0; that is an error, obviously.

@dhalbert dhalbert requested a review from tannewt May 15, 2021 01:59
@dhalbert
Copy link
Collaborator Author

The last thing I plan to add to this before rc.0 will be a fix for RP2040 slow crystal oscillator startup, which is dependent on adafruit/pico-sdk#4

@dhalbert dhalbert requested review from ladyada and kattni May 25, 2021 19:56
@dhalbert
Copy link
Collaborator Author

dhalbert commented May 25, 2021

This is ready to try as a release candidate. I just need a review and then I will make a release.

Tested on a Slide Trinkey and also the clock fix tested on a known problematic QT Py RP2040.

Copy link

@kattni kattni left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@dhalbert dhalbert merged commit e494ca4 into adafruit:6.3.x May 25, 2021
@dhalbert dhalbert deleted the 6.3.x-cherry-pick-from-main branch May 25, 2021 20:00
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.