diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-04-17 10:48:11 -0700 |
|---|---|---|
| committer | Scott Shawcroft <scott@tannewt.org> | 2019-04-17 10:48:11 -0700 |
| commit | c415d114e190e51347c78fea559ba48a167f8de2 (patch) | |
| tree | 87bb909c3c90a23fdf234e5b6b2f6aa3f5213758 | |
| parent | 8b60b20f885a4f76109e25d01d6d178a99a3d850 (diff) | |
Feedback from Dan and hopefully fix build.
| -rwxr-xr-x | .travis.yml | 2 | ||||
| -rw-r--r-- | README.rst | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 48c86a9f9..402cfb2cb 100755 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,7 @@ before_script: - sudo apt-get install -y python3-pip - pip3 install --user sh click - ([[ -z "$TRAVIS_TESTS" ]] || sudo pip install --upgrade cpp-coveralls) - - (! var_search "${TRAVIS_TESTS-}" docs || pip install --user Sphinx sphinx-rtd-theme recommonmark) + - (! var_search "${TRAVIS_TESTS-}" docs || pip install --user Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter) - (! var_search "${TRAVIS_TESTS-}" translations || pip3 install --user polib) # report some good version numbers to the build diff --git a/README.rst b/README.rst index 2b475923b..45e978082 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ CircuitPython `Branding <#branding>`__ \| `Differences from Micropython <#differences-from-micropython>`__ \| `Project Structure <#project-structure>`__ -**CircuitPython** is an *beginner friendly*, open source version of Python for tiny, inexpensive +**CircuitPython** is a *beginner friendly*, open source version of Python for tiny, inexpensive computers called microcontrollers. Microcontrollers are the brains of many electronics including a wide variety of development boards used to build hobby projects and prototypes. CircuitPython in electronics is one of the best ways to learn to code because it connects code to reality. Simply @@ -22,9 +22,10 @@ CircuitPython features unified Python core APIs and a growing list of 150+ devic drivers that work with it. These libraries also work on single board computers with regular Python via the `Adafruit Blinka Library <https://github.com/adafruit/Adafruit_Blinka>`_. -CircuitPython is a beginner focused derivative of `MicroPython <https://micropython.org>`_. -CircuitPython development is sponsored by `Adafruit <https://adafruit.com>`_ and is available on -their educational development boards. Please support both MicroPython and Adafruit. +CircuitPython is based on `MicroPython <https://micropython.org>`_. See +`below <#differences-from-micropython>`_ for differences. CircuitPython development is sponsored by +`Adafruit <https://adafruit.com>`_ and is available on their educational development boards. Please +support both MicroPython and Adafruit. Get CircuitPython ------------------ @@ -126,7 +127,7 @@ Behavior after the crash. A reset (the button) is needed after its fixed to get back into normal mode. - RGB status LED indicating CircuitPython state, and errors through a sequence of colored flashes. -- Re-runs ``code.y`` or other main file after file system writes over USB mass storage. (Disable with +- Re-runs ``code.py`` or other main file after file system writes over USB mass storage. (Disable with ``samd.disable_autoreload()``) - Entering the REPL after the main code is finished requires a key press which enters the REPL and disables autoreload. |