Skip to content

Additional S2 support + new S2 boards #7163

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

Closed
wants to merge 4 commits into from
Closed

Additional S2 support + new S2 boards #7163

wants to merge 4 commits into from

Conversation

UnexpectedMaker
Copy link
Contributor

Extra S2 support (And S3 where applicable):

  • PSRAM
  • 16MB flash partition
  • Added correct ADC and DAC pins
  • Added correct GPIO and IRQ pins
  • Added S3 area in CMakeLists

Added UM_TinyS2 and UM_FeatherS2 boards and renamed TinyPICO to UM_TinyPICO

…ming)

Added default hardware SPI 0 pins in mpconfigboard.h
Added CONFIG_LWIP_LOCAL_HOSTNAME in sdkconfig.board
- PSRAM
- 16MB flash partition
- Added correct ADC and DAC pins
- Added correct GPIO and IRQ pins
- Added S3 area in CMakeLists

Added UM_TinyS2 and UM_FeatherS2 boards
@mcauser
Copy link
Contributor

mcauser commented Apr 26, 2021

Is it worth moving dotstar.py to /drivers or /extmod so other boards can share it (and include via manifest.py)?

@UnexpectedMaker
Copy link
Contributor Author

Is it worth moving dotstar.py to /drivers or /extmod so other boards can share it (and include via manifest.py)?

The last discussion I had with @dpgeorge about this (a loooooong time ago just as TinyPICO was launching) was that it should probably be move to wherever the other modules live, but that it needed to be made to look more "micropython like" - and I never really got there.

@kevinkk525
Copy link
Contributor

kevinkk525 commented Apr 26, 2021

What would be required to make dotstar more micropython like? Removing the setters and properties?

@UnexpectedMaker
Copy link
Contributor Author

What would be required to make dotstar more micropython like? Removing the setters and properties?

I honestly cant remember what the conversation entailed, but yeah, I think the properties were some of it. It was a long time ago. It's a small script, so I am sure it will take @dpgeorge < 2min to make it how he wants it to be.

@dpgeorge
Copy link
Member

What would be required to make dotstar more micropython like? Removing the setters and properties?

I honestly cant remember what the conversation entailed, but yeah, I think the properties were some of it. It was a long time ago. It's a small script, so I am sure it will take @dpgeorge < 2min to make it how he wants it to be.

I guess you don't want to break backwards compatibility anymore, so that makes it harder to change...

Anyway, since this dotstar.py file is moving/renaming I suggest it get moved to drivers/led/dotstar.py as-is. And then in the future someone can make it more portable/generic so it runs on other boards.

@robert-hh robert-hh mentioned this pull request Apr 27, 2021
@UnexpectedMaker
Copy link
Contributor Author

@dpgeorge I fixed all of those things... some of them (like the machine_pins.c was because I had some C3 stuff in there than I removed, but not cleanly, sorry.
Cheers :)

@dpgeorge
Copy link
Member

It would be good to have the additions of UM_TINYS2 and UM_FEATHERS2 as separate commits. I can do this during merge, but it would be easier if you could do it @UnexpectedMaker :)

@UnexpectedMaker
Copy link
Contributor Author

It would be good to have the additions of UM_TINYS2 and UM_FEATHERS2 as separate commits. I can do this during merge, but it would be easier if you could do it @UnexpectedMaker :)

I have no idea how Id do that. Remove the folders from my local repo, re-commit? Then re-add them after the PR is merged?

@dpgeorge
Copy link
Member

I have no idea how Id do that.

Something like this (in ports/esp32/ dir):

git reset HEAD^^^
git add boards/sdkconfig.spiram_sx partitions-16MiB.csv
git commit -a
(make commit for s2/s3 support)
git add boards/UM_TINYS2/
git commit
(make commit for um-tinys2)
git add boards/UM_FEATHERS2/
git commit
(make commit for um-feathers2)
git push --force

@UnexpectedMaker
Copy link
Contributor Author

I have no idea how Id do that.

Something like this (in ports/esp32/ dir):

git reset HEAD^^^
git add boards/sdkconfig.spiram_sx partitions-16MiB.csv
git commit -a
(make commit for s2/s3 support)
git add boards/UM_TINYS2/
git commit
(make commit for um-tinys2)
git add boards/UM_FEATHERS2/
git commit
(make commit for um-feathers2)
git push --force

Won't that reset ALL of my changes in the PR if I reset to HEAD? My git fu is not strong.

@dpgeorge
Copy link
Member

Won't that reset ALL of my changes in the PR if I reset to HEAD? My git fu is not strong.

Yes it'll reset the 3 most recent commits.

You can do it on a new branch:

git checkout -b "s2s3-support"

then run the commands above

@dpgeorge
Copy link
Member

dpgeorge commented May 6, 2021

See #7222 for a version of this with reworked commits.

@dpgeorge dpgeorge closed this May 6, 2021
tannewt pushed a commit to tannewt/circuitpython that referenced this pull request Nov 16, 2022
This compatibility name has been removed in 8.x
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants