Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit aabbbf7

Browse files
author
Nick Moore
committed
README.md: update to indicate port merged back
1 parent 84035f0 commit aabbbf7

File tree

1 file changed

+5
-19
lines changed

1 file changed

+5
-19
lines changed

README.md

+5-19
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
[![Build Status](https://travis-ci.org/micropython/micropython.png?branch=master)](https://travis-ci.org/micropython/micropython) [![Coverage Status](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
2-
31
The MicroPython project
42
=======================
53
<p align="center">
@@ -13,24 +11,12 @@ You can find the official website at [micropython.org](http://www.micropython.or
1311
A note about this ESP32 repository
1412
----------------------------------
1513

16-
This repository is a clone of the main, upstream repository found at
17-
https://github.com/micropython/micropython. This repository adds a new
18-
branch called `esp32` which contains a port of MicroPython to the ESP32
19-
microcontroller, under the MIT license. Please see the `README.md` file
20-
in the `ports/esp32/` subdirectory for details of this port.
21-
22-
This `esp32` branch is the default branch and all pull requests should be
23-
made to this branch, and any issues should discuss only the code developed
24-
in the `ports/esp32/` subdirectory.
25-
26-
The `esp32` branch will not be rebased so it is safe to clone/fork it and
27-
base your work on it. New commits from the upstream repository will
28-
occasionally be merged in the `esp32` branch. Any additional branches in
29-
this repository (apart from `master`) may be rebased or deleted at any time.
14+
**The ESP32 port has now been merged back into the
15+
[main MicroPython repository](https://github.com/micropython/micropython/)
16+
and this repository is maintained for historical purposes.**
3017

31-
If there is enough interest in the port to the ESP32 then this code can
32-
eventually be merged into the upstream repository. So please do let your
33-
interest be known!
18+
**This repository is now getting out of date and new pull requests should
19+
be made against the master branch of the main repository!**
3420

3521
About MicroPython
3622
-----------------

0 commit comments

Comments
 (0)