Commit Graph

5 Commits

Author SHA1 Message Date
Dan Halbert
2c0fa0f7dc initial merge from v1.20.0; just satisifying conflicts 2023-09-19 11:10:12 -04:00
Dan Halbert
0d4bc8c163 initial v1.19.1 merge; not compiled yet 2023-08-01 13:50:05 -04:00
Jeff Epler
ddfcfca65d Don't remove all micropython examples, we want natmod and usercmodule 2022-02-15 10:14:47 -06:00
Scott Shawcroft
973a90f2aa
Rename esp32s2 port to espressif
This is in preparation for ESP32-S3 support and potentially others.

Related to #4363
2021-09-13 16:44:55 -07:00
Scott Shawcroft
20c4a325a4
Add Python helper tool for MicroPython merges.
It automates ignoring parts of MP we don't use.

Related to #2999
2021-05-07 10:21:35 -07:00