diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-02-03 18:10:51 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-02-03 18:10:51 +0000 |
| commit | 2290c04561a10aed621a449ebe1bc52ebc140d23 (patch) | |
| tree | 6a4a54d7a9330d7fc1d07a1648378703d70e6ebb | |
| parent | 92bf9bdac3071fc6586f3bb2f2445e3e7c5cefd0 (diff) | |
| download | ChibiOS-2290c04561a10aed621a449ebe1bc52ebc140d23.tar.gz ChibiOS-2290c04561a10aed621a449ebe1bc52ebc140d23.tar.bz2 ChibiOS-2290c04561a10aed621a449ebe1bc52ebc140d23.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5106 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | boards/ST_STM32F4_DISCOVERY/board.h | 6 | ||||
| -rw-r--r-- | boards/ST_STM32F4_DISCOVERY/cfg/board.chcfg | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/boards/ST_STM32F4_DISCOVERY/board.h b/boards/ST_STM32F4_DISCOVERY/board.h index e387375fb..081b584d4 100644 --- a/boards/ST_STM32F4_DISCOVERY/board.h +++ b/boards/ST_STM32F4_DISCOVERY/board.h @@ -1,6 +1,6 @@ /*
ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
- 2011,2012,2013 Giovanni Di Sirio.
+ 2011,2012 Giovanni Di Sirio.
This file is part of ChibiOS/RT.
@@ -599,7 +599,7 @@ * PD8 - PIN8 (input pullup).
* PD9 - PIN9 (input pullup).
* PD10 - PIN10 (input pullup).
- * PD11 - PIN11 (input floating).
+ * PD11 - PIN11 (input pullup).
* PD12 - LED4 (output pushpull maximum).
* PD13 - LED3 (output pushpull maximum).
* PD14 - LED5 (output pushpull maximum).
@@ -664,7 +664,7 @@ PIN_PUPDR_PULLUP(GPIOD_PIN8) | \
PIN_PUPDR_PULLUP(GPIOD_PIN9) | \
PIN_PUPDR_PULLUP(GPIOD_PIN10) | \
- PIN_PUPDR_FLOATING(GPIOD_PIN11) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN11) | \
PIN_PUPDR_FLOATING(GPIOD_LED4) | \
PIN_PUPDR_FLOATING(GPIOD_LED3) | \
PIN_PUPDR_FLOATING(GPIOD_LED5) | \
diff --git a/boards/ST_STM32F4_DISCOVERY/cfg/board.chcfg b/boards/ST_STM32F4_DISCOVERY/cfg/board.chcfg index 68d30e27d..e30de70e6 100644 --- a/boards/ST_STM32F4_DISCOVERY/cfg/board.chcfg +++ b/boards/ST_STM32F4_DISCOVERY/cfg/board.chcfg @@ -496,7 +496,7 @@ Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin12
|