From 4651227fa9f7dece1dd24d2170db16c2e35dc04e Mon Sep 17 00:00:00 2001
From: Perry Hung <iperry@gmail.com>
Date: Wed, 9 Mar 2011 23:25:03 -0500
Subject: Merge refactor into i2c-wip:

Squashed commit of the following:

commit 4d6662dadfda7f2fd55107535165dc98a0638a3c
Merge: 174d9ab 7ddc844
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 23:18:29 2011 -0500

    Merge remote branch 'origin/refactor' into refactor

commit 174d9ab73cc3387a3812e6f3d3e97519bf5b2150
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 23:16:53 2011 -0500

    USBSerial docs fix.

commit f217acb73d94f0a88bf33a42684e6e988dcb3685
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 20:25:26 2011 -0500

    Brought examples/ up to date; PIN_MAP bugfix for D24.

commit c4ba3ba05fc39ef260cd80d91759966952df74ae
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 19:16:42 2011 -0500

    Cosmetic/documentation changes to adc.c

commit e7747b4eb831621951deef6d31629f55cb5c3500
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 19:16:07 2011 -0500

    Cosmetic changes to wirish/main.cxx

commit e2f9d4116e59d8487c936989384228ea084a3501
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Fri Mar 4 19:15:24 2011 -0500

    Untabifying docs/source/conf.py

commit 7ddc84481b4eebe337065a0219e3d8dc000791e5
Author: Perry Hung <iperry@gmail.com>
Date:   Wed Mar 2 00:30:19 2011 -0500

    cscope: Find .S instead of .s files

commit 62cb09ed6357eae58b0234fbc074c44e9c0aa5e5
Author: Marti Bolivar <mbolivar@leaflabs.com>
Date:   Wed Mar 2 00:07:10 2011 -0500

    Fixing typo in main.cpp.example.
---
 libmaple/adc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libmaple')

diff --git a/libmaple/adc.c b/libmaple/adc.c
index cd71118..a464746 100644
--- a/libmaple/adc.c
+++ b/libmaple/adc.c
@@ -23,6 +23,8 @@
  *****************************************************************************/
 
 /**
+ * @file adc.c
+ *
  * @brief Analog to digital converter routines
  *
  * IMPORTANT: maximum external impedance must be below 0.4kOhms for 1.5
@@ -30,7 +32,7 @@
  *
  * At 55.5 cycles/sample, the external input impedance < 50kOhms.
  *
- * See stm32 manual RM008 for how to calculate this.
+ * See STM32 manual RM0008 for how to calculate this.
  */
 
 #include "libmaple.h"
-- 
cgit v1.2.3