From 179aa7224e72affbf92c2fc4b1f08fee13c92427 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 1 Dec 2018 19:30:36 +0000 Subject: USB tested on L4+. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12447 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/hal/boards/ST_NUCLEO144_L496ZG/board.h | 6 +++--- os/hal/boards/ST_NUCLEO144_L496ZG/cfg/board.chcfg | 4 ++-- os/hal/boards/ST_NUCLEO144_L4R5ZI/board.h | 6 +++--- os/hal/boards/ST_NUCLEO144_L4R5ZI/cfg/board.chcfg | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'os/hal/boards') diff --git a/os/hal/boards/ST_NUCLEO144_L496ZG/board.h b/os/hal/boards/ST_NUCLEO144_L496ZG/board.h index f9a381983..294d81b0a 100644 --- a/os/hal/boards/ST_NUCLEO144_L496ZG/board.h +++ b/os/hal/boards/ST_NUCLEO144_L496ZG/board.h @@ -298,7 +298,7 @@ * PA6 - PIN6 (analog). * PA7 - PIN7 (analog). * PA8 - USB_SOF (alternate 10). - * PA9 - USB_VBUS (input pullup). + * PA9 - USB_VBUS (analog). * PA10 - USB_ID (alternate 10). * PA11 - USB_DM (alternate 10). * PA12 - USB_DP (alternate 10). @@ -315,7 +315,7 @@ PIN_MODE_ANALOG(GPIOA_PIN6) | \ PIN_MODE_ANALOG(GPIOA_PIN7) | \ PIN_MODE_ALTERNATE(GPIOA_USB_SOF) | \ - PIN_MODE_INPUT(GPIOA_USB_VBUS) | \ + PIN_MODE_ANALOG(GPIOA_USB_VBUS) | \ PIN_MODE_ALTERNATE(GPIOA_USB_ID) | \ PIN_MODE_ALTERNATE(GPIOA_USB_DM) | \ PIN_MODE_ALTERNATE(GPIOA_USB_DP) | \ @@ -363,7 +363,7 @@ PIN_PUPDR_FLOATING(GPIOA_PIN6) | \ PIN_PUPDR_FLOATING(GPIOA_PIN7) | \ PIN_PUPDR_FLOATING(GPIOA_USB_SOF) | \ - PIN_PUPDR_PULLUP(GPIOA_USB_VBUS) | \ + PIN_PUPDR_FLOATING(GPIOA_USB_VBUS) | \ PIN_PUPDR_FLOATING(GPIOA_USB_ID) | \ PIN_PUPDR_FLOATING(GPIOA_USB_DM) | \ PIN_PUPDR_FLOATING(GPIOA_USB_DP) | \ diff --git a/os/hal/boards/ST_NUCLEO144_L496ZG/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO144_L496ZG/cfg/board.chcfg index fa064dee7..5eaf00890 100644 --- a/os/hal/boards/ST_NUCLEO144_L496ZG/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO144_L496ZG/cfg/board.chcfg @@ -45,8 +45,8 @@ PinLock="Disabled" Alternate="10" ID="USB_SOF" Resistor="Floating" Mode="Alternate" Level="Low" /> + PinLock="Disabled" Alternate="0" ID="USB_VBUS" Resistor="Floating" + Mode="Analog" Level="Low" /> diff --git a/os/hal/boards/ST_NUCLEO144_L4R5ZI/board.h b/os/hal/boards/ST_NUCLEO144_L4R5ZI/board.h index 464399327..b4cca1eba 100644 --- a/os/hal/boards/ST_NUCLEO144_L4R5ZI/board.h +++ b/os/hal/boards/ST_NUCLEO144_L4R5ZI/board.h @@ -298,7 +298,7 @@ * PA6 - PIN6 (analog). * PA7 - PIN7 (analog). * PA8 - USB_SOF (alternate 10). - * PA9 - USB_VBUS (input pullup). + * PA9 - USB_VBUS (analog). * PA10 - USB_ID (alternate 10). * PA11 - USB_DM (alternate 10). * PA12 - USB_DP (alternate 10). @@ -315,7 +315,7 @@ PIN_MODE_ANALOG(GPIOA_PIN6) | \ PIN_MODE_ANALOG(GPIOA_PIN7) | \ PIN_MODE_ALTERNATE(GPIOA_USB_SOF) | \ - PIN_MODE_INPUT(GPIOA_USB_VBUS) | \ + PIN_MODE_ANALOG(GPIOA_USB_VBUS) | \ PIN_MODE_ALTERNATE(GPIOA_USB_ID) | \ PIN_MODE_ALTERNATE(GPIOA_USB_DM) | \ PIN_MODE_ALTERNATE(GPIOA_USB_DP) | \ @@ -363,7 +363,7 @@ PIN_PUPDR_FLOATING(GPIOA_PIN6) | \ PIN_PUPDR_FLOATING(GPIOA_PIN7) | \ PIN_PUPDR_FLOATING(GPIOA_USB_SOF) | \ - PIN_PUPDR_PULLUP(GPIOA_USB_VBUS) | \ + PIN_PUPDR_FLOATING(GPIOA_USB_VBUS) | \ PIN_PUPDR_FLOATING(GPIOA_USB_ID) | \ PIN_PUPDR_FLOATING(GPIOA_USB_DM) | \ PIN_PUPDR_FLOATING(GPIOA_USB_DP) | \ diff --git a/os/hal/boards/ST_NUCLEO144_L4R5ZI/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO144_L4R5ZI/cfg/board.chcfg index 2c506d1e5..ca5ad6a81 100644 --- a/os/hal/boards/ST_NUCLEO144_L4R5ZI/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO144_L4R5ZI/cfg/board.chcfg @@ -119,8 +119,8 @@ PinLock="Disabled" Alternate="0" ID="USB_VBUS" - Resistor="PullUp" - Mode="Input" + Resistor="Floating" + Mode="Analog" Level="Low" /> + Level="Low" >