aboutsummaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-05-13 17:27:47 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-05-13 20:10:37 -0400
commit42bbfd34070557848410bf2289a01f0d06e4f19f (patch)
tree344c72470bc84b5859a1e64fb9574f812347cc55 /source
parentb4de7c0594f7d1ea0dcfe816e7e458bbfdc5f879 (diff)
downloadlibrambutan-42bbfd34070557848410bf2289a01f0d06e4f19f.tar.gz
librambutan-42bbfd34070557848410bf2289a01f0d06e4f19f.zip
Docs: Fixing power supply marketing mistake.
Diffstat (limited to 'source')
-rw-r--r--source/hardware/maple-ret6.rst16
-rw-r--r--source/hardware/maple.rst32
2 files changed, 35 insertions, 13 deletions
diff --git a/source/hardware/maple-ret6.rst b/source/hardware/maple-ret6.rst
index 5fa43a8..e9eebd0 100644
--- a/source/hardware/maple-ret6.rst
+++ b/source/hardware/maple-ret6.rst
@@ -15,22 +15,26 @@ Technical Specifications
* Clock Speed: **72 MHz**
* **512KB Flash** and **64KB SRAM**
* 44 Digital I/O Pins (:ref:`GPIO <gpio>`)
- * 16 Analog Input pins, 12 bit **ADC** resolution (:ref:`ADC <adc>`)
+ * 16 Analog Input pins, 12 bit **ADC** resolution (:ref:`ADC
+ <adc>`)
* Built-in, 2 channel **DAC** at 12 bit resolution
(:ref:`libmaple-dac`).
* 19 **PWM** pins at 16-bit resolution (:ref:`PWM <pwm>`)
- * Dedicated **USB** port for programming and communications (:ref:`USB<usb>`)
+ * Dedicated **USB** port for programming and communications
+ (:ref:`USB<usb>`)
* External **JTAG** interface (:ref:`JTAG <jtag>`)
* 64 Channel nested vector interrupt handler (including
:ref:`external interrupt <lang-attachinterrupt>` on GPIOs)
* Integrated **SPI** (:ref:`SPI <spi>`)
* Integrated **SDIO**
* Integrated **I2C** and **I2S** (:ref:`I2C <i2c>`)
- * 12 Channels of Direct Memory Access (**DMA**) (:ref:`libmaple-dma`)
+ * 12 Channels of Direct Memory Access (**DMA**)
+ (:ref:`libmaple-dma`)
* 3 **USART** and 2 **UART** devices (:ref:`USART <usart>`)
* Two advanced control, four general purpose, two basic **timers**
(:ref:`timers`)
- * Supplies up to 800mA @ 3.3v
+ * Supplies up to 500mA @ 3.3v (with separate 250 mA digital and
+ analog regulators)
* Support for low power and sleep modes (<500uA)
* Operating Voltage: 3.3V
* Input Voltage (recommended): 3V-12V
@@ -261,6 +265,10 @@ Errata
This section lists known issues and warnings for the Maple RET6 Edition.
+* **Power Supply Marketing Mistake**: We originally sold the Maple
+ advertising that it was capable of supplying up to 800 mA; the
+ correct value is 500 mA.
+
* **UART4, UART5 GPIOs unavailable**: Pins related to the digital
to analog converter (DAC) and UARTs 4 and 5 are not broken out to
headers. The RET6 Edition's hardware layout is identical to that of
diff --git a/source/hardware/maple.rst b/source/hardware/maple.rst
index 4616ac7..b3124e0 100644
--- a/source/hardware/maple.rst
+++ b/source/hardware/maple.rst
@@ -15,18 +15,22 @@ Technical Specifications
* Clock Speed: **72 MHz**
* **128KB Flash** and **20KB SRAM**
* 44 Digital I/O Pins (:ref:`GPIO <gpio>`)
- * 16 Analog Input Pins, 12-bit **ADC** resolution (:ref:`ADC <adc>`)
+ * 16 Analog Input Pins, 12-bit **ADC** resolution (:ref:`ADC
+ <adc>`)
* 15 **PWM** pins at 16-bit resolution (:ref:`PWM <pwm>`)
- * Dedicated **USB** port for programming and communications (:ref:`USB <usb>`)
+ * Dedicated **USB** port for programming and communications
+ (:ref:`USB <usb>`)
* External **JTAG** interface (:ref:`JTAG <jtag>`)
* 64 Channel nested vector interrupt handler (including
:ref:`external interrupt <lang-attachinterrupt>` on GPIOs)
* Integrated **SPI** (:ref:`SPI <spi>`)
* Integrated **I2C** (:ref:`I2C <i2c>`)
- * 7 Channels of Direct Memory Access (**DMA**) (:ref:`libmaple.dma`)
+ * 7 Channels of Direct Memory Access (**DMA**)
+ (:ref:`libmaple.dma`)
* 3 **USART** divices (:ref:`USART <usart>`)
* Four 4-channel **timers** (:ref:`Timers <timers>`)
- * Supplies up to 800mA @ 3.3v
+ * Supplies up to 500mA @ 3.3v (with separate 250 mA digital and
+ analog regulators)
* Support for low power and sleep modes (<500uA)
* Operating Voltage: 3.3V
* Input Voltage (recommended): 3V-12V
@@ -297,11 +301,21 @@ permanently.
Errata
------
-This section lists known issues and warnings for each revision of the
-Maple board.
+General
+^^^^^^^
+
+* **Power Supply Marketing Mistake**: We originally sold the Maple
+ advertising that it was capable of supplying up to 800 mA; the
+ correct value is 500 mA.
+
+By Rev
+^^^^^^
+
+The following subsections lists known issues and warnings for each
+revision of the Maple board.
Rev 5
-^^^^^
+~~~~~
* **Pin 3 AIN missing**: Pin 3 is capable of analog input, but on Rev
5s manufactured during Fall 2010, the corresponding "AIN" is missing
@@ -316,7 +330,7 @@ Rev 5
recommend it* unless you're very sure about what you're doing.
Rev 3
-^^^^^
+~~~~~
* **Pin 3 AIN missing**: Pin 3 is capable of analog input, but the
corresponding "AIN" is missing from the Rev 3 silkscreen.
@@ -368,7 +382,7 @@ Rev 3
recommend it* unless you're very sure about what you're doing.
Rev 1
-^^^^^
+~~~~~
* **ADC noise**: generally very high, in particular when the USB port
is being used for communications (including keep-alive pings when