From a33b12fdce505498fb2e199f850412e7a2167f22 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Fri, 13 May 2011 17:27:47 -0400 Subject: Docs: Fixing power supply marketing mistake. --- docs/source/hardware/maple-ret6.rst | 16 ++++++++++++---- docs/source/hardware/maple.rst | 32 +++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/source/hardware/maple-ret6.rst b/docs/source/hardware/maple-ret6.rst index 5fa43a8..e9eebd0 100644 --- a/docs/source/hardware/maple-ret6.rst +++ b/docs/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 `) - * 16 Analog Input pins, 12 bit **ADC** resolution (:ref:`ADC `) + * 16 Analog Input pins, 12 bit **ADC** resolution (:ref:`ADC + `) * Built-in, 2 channel **DAC** at 12 bit resolution (:ref:`libmaple-dac`). * 19 **PWM** pins at 16-bit resolution (:ref:`PWM `) - * Dedicated **USB** port for programming and communications (:ref:`USB`) + * Dedicated **USB** port for programming and communications + (:ref:`USB`) * External **JTAG** interface (:ref:`JTAG `) * 64 Channel nested vector interrupt handler (including :ref:`external interrupt ` on GPIOs) * Integrated **SPI** (:ref:`SPI `) * Integrated **SDIO** * Integrated **I2C** and **I2S** (:ref:`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 `) * 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/docs/source/hardware/maple.rst b/docs/source/hardware/maple.rst index 4616ac7..b3124e0 100644 --- a/docs/source/hardware/maple.rst +++ b/docs/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 `) - * 16 Analog Input Pins, 12-bit **ADC** resolution (:ref:`ADC `) + * 16 Analog Input Pins, 12-bit **ADC** resolution (:ref:`ADC + `) * 15 **PWM** pins at 16-bit resolution (:ref:`PWM `) - * Dedicated **USB** port for programming and communications (:ref:`USB `) + * Dedicated **USB** port for programming and communications + (:ref:`USB `) * External **JTAG** interface (:ref:`JTAG `) * 64 Channel nested vector interrupt handler (including :ref:`external interrupt ` on GPIOs) * Integrated **SPI** (:ref:`SPI `) * Integrated **I2C** (:ref:`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 `) * Four 4-channel **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 @@ -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 -- cgit v1.2.3