From 031d3262c3078bf3ba7397997486a5a6c1f37fdc Mon Sep 17 00:00:00 2001
From: Rocco Marco Guglielmi <roccomarco.guglielmi@gmail.com>
Date: Fri, 15 Mar 2019 09:13:51 +0000
Subject: Fixed Bug #1018

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_19.1.x@12692 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
---
 os/hal/boards/ST_STM32L4R9I_DISCOVERY/board.h         | 4 ++--
 os/hal/boards/ST_STM32L4R9I_DISCOVERY/cfg/board.chcfg | 2 +-
 readme.txt                                            | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/os/hal/boards/ST_STM32L4R9I_DISCOVERY/board.h b/os/hal/boards/ST_STM32L4R9I_DISCOVERY/board.h
index 07a5d09bd..15f5c0430 100644
--- a/os/hal/boards/ST_STM32L4R9I_DISCOVERY/board.h
+++ b/os/hal/boards/ST_STM32L4R9I_DISCOVERY/board.h
@@ -611,7 +611,7 @@
  * PC10 - SDMMC_1_D2                (alternate 12).
  * PC11 - SDMMC_1_D3                (alternate 12).
  * PC12 - SDMMC_1_CK                (alternate 12).
- * PC13 - JOY_SEL BUTTON            (input floating).
+ * PC13 - JOY_SEL BUTTON            (input pulldown).
  * PC14 - PIN14                     (analog).
  * PC15 - PIN15                     (analog).
  */
@@ -676,7 +676,7 @@
                                      PIN_PUPDR_FLOATING(GPIOC_SDMMC_1_D2) | \
                                      PIN_PUPDR_FLOATING(GPIOC_SDMMC_1_D3) | \
                                      PIN_PUPDR_FLOATING(GPIOC_SDMMC_1_CK) | \
-                                     PIN_PUPDR_FLOATING(GPIOC_JOY_SEL) |    \
+                                     PIN_PUPDR_PULLDOWN(GPIOC_JOY_SEL) |    \
                                      PIN_PUPDR_FLOATING(GPIOC_PIN14) |      \
                                      PIN_PUPDR_FLOATING(GPIOC_PIN15))
 #define VAL_GPIOC_ODR               (PIN_ODR_LOW(GPIOC_PIN0) |              \
diff --git a/os/hal/boards/ST_STM32L4R9I_DISCOVERY/cfg/board.chcfg b/os/hal/boards/ST_STM32L4R9I_DISCOVERY/cfg/board.chcfg
index 716a19662..08e16415a 100644
--- a/os/hal/boards/ST_STM32L4R9I_DISCOVERY/cfg/board.chcfg
+++ b/os/hal/boards/ST_STM32L4R9I_DISCOVERY/cfg/board.chcfg
@@ -483,7 +483,7 @@
 				PinLock="Disabled"
 				Alternate="0"
 				ID="JOY_SEL BUTTON"
-				Resistor="Floating"
+				Resistor="PullDown"
 				Mode="Input"
 				Level="Low" />
 			<pin14
diff --git a/readme.txt b/readme.txt
index ec43f6818..e8f9cc6f4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -77,6 +77,7 @@
 - LIB: Re-introduced missing chGuardedPoolGetCounterI() function to guarded
        pools allocator.
 - NEW: Extra timer checks in STM32 ST driver.
+- FIX: Fixed misconfiguration in STM32L4R9I DIscovery board files (bug #1018).
 - FIX: Fixed wrong Debug launch configuration in STM32L4Rx demos (bug #1017).
 - FIX: Fixed wrong ADCSEL definitions in STM32H7 HAL (bug #1016).
 - FIX: Fixed chTimeIsInRangeX() failing under some configurations (bug #1015).
-- 
cgit v1.2.3