Merge branch 'master' of https://github.com/bbcmicrobit/micropython

MinoruInachi · May 1, 2019 · 6707f5b · 6707f5b
2 parents 457e09f + a92ca9b
commit 6707f5b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/docs/audio.rst b/docs/audio.rst
@@ -42,7 +42,7 @@ Using audio
 ===========
 
 You will need a sound source, as input to the ``play`` function. You can generate your own, like in
-``examples/waveforms.py`` or you can use the sound sources provided by modules like ``synth``.
+``examples/waveforms.py``.
 
 
 Technical Details
@@ -52,7 +52,7 @@ Technical Details
     You don't need to understand this section to use the ``audio`` module.
     It is just here in case you wanted to know how it works.
 
-The ``audio`` module consumes samples at 7812.5 kHz, and uses linear interpolation to
+The ``audio`` module consumes samples at 7812.5 Hz, and uses linear interpolation to
 output a PWM signal at 32.5 kHz, which gives tolerable sound quality.
 
 The function ``play`` fully copies all data from each ``AudioFrame`` before it

diff --git a/docs/index.rst b/docs/index.rst
@@ -20,9 +20,6 @@ If you're a new programmer, teacher or unsure where to start, begin with the tut
 
 .. image:: comic.png
 
-To get involved with the community subscribe to the microbit@python.org
-mailing list (https://mail.python.org/mailman/listinfo/microbit).
-
 .. note::
 
     This project is under active development. Please help other

diff --git a/docs/pin.rst b/docs/pin.rst
@@ -43,25 +43,25 @@ module:``microbit.pin0`` - ``microbit.pin20``.
 +-----+---------+----------+
 |  5  | Digital | Button A |
 +-----+---------+----------+
-|  6  | Digital | Row 2    |
+|  6  | Digital | Column 9 |
 +-----+---------+----------+
-|  7  | Digital | Row 1    |
+|  7  | Digital | Column 8 |
 +-----+---------+----------+
 |  8  | Digital |          |
 +-----+---------+----------+
-|  9  | Digital | Row 3    |
+|  9  | Digital | Column 7 |
 +-----+---------+----------+
 |  10 | Analog  | Column 3 |
 +-----+---------+----------+
 |  11 | Digital | Button B |
 +-----+---------+----------+
 |  12 | Digital |          |
 +-----+---------+----------+
-|  13 | Digital | SPI MOSI |
+|  13 | Digital | SPI SCK  |
 +-----+---------+----------+
 |  14 | Digital | SPI MISO |
 +-----+---------+----------+
-|  15 | Digital | SPI SCK  |
+|  15 | Digital | SPI MOSI |
 +-----+---------+----------+
 |  16 | Digital |          |
 +-----+---------+----------+

diff --git a/source/microbit/main.cpp b/source/microbit/main.cpp
@@ -3,7 +3,6 @@
 #include "microbit/memory.h"
 #include "microbit/filesystem.h"
 #include "microbit/microbitdal.h"
-#include "_newlib_version.h"
 #include "MicroBitButton.h"
 
 // Global instances of the mbed/DAL components that we use

diff --git a/source/microbit/microbitdisplay.cpp b/source/microbit/microbitdisplay.cpp
@@ -668,7 +668,7 @@ microbit_display_obj_t microbit_display_obj = {
 
 void microbit_display_init(void) {
     //  Set pins as output.
-    nrf_gpio_range_cfg_output(MIN_COLUMN_PIN, MIN_COLUMN_PIN + COLUMN_COUNT + ROW_COUNT);
+    nrf_gpio_range_cfg_output(MIN_COLUMN_PIN, MIN_COLUMN_PIN + COLUMN_COUNT + ROW_COUNT - 1);
 }
 
 }