From 1d76faa7cba467f1f147f9e0dba2915c73427612 Mon Sep 17 00:00:00 2001 From: Rocco Marco Guglielmi Date: Wed, 4 May 2016 14:22:41 +0000 Subject: Revert part of last changes git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9411 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/boards/ST_NUCLEO64_F302R8/board.h | 56 +++++++++++------------- os/hal/boards/ST_NUCLEO64_F302R8/cfg/board.chcfg | 40 ++++++++--------- 2 files changed, 46 insertions(+), 50 deletions(-) (limited to 'os/hal/boards/ST_NUCLEO64_F302R8') diff --git a/os/hal/boards/ST_NUCLEO64_F302R8/board.h b/os/hal/boards/ST_NUCLEO64_F302R8/board.h index f3dbbc8f9..951ff005a 100644 --- a/os/hal/boards/ST_NUCLEO64_F302R8/board.h +++ b/os/hal/boards/ST_NUCLEO64_F302R8/board.h @@ -84,9 +84,7 @@ #define GPIOB_ARD_D10 6U #define GPIOB_PIN7 7U #define GPIOB_ARD_D15 8U -#define GPIOB_I2C1_SCL 8U #define GPIOB_ARD_D14 9U -#define GPIOB_I2C1_SDA 9U #define GPIOB_ARD_D6 10U #define GPIOB_PIN11 11U #define GPIOB_PIN12 12U @@ -228,9 +226,7 @@ #define LINE_ARD_D4 PAL_LINE(GPIOB, 5U) #define LINE_ARD_D10 PAL_LINE(GPIOB, 6U) #define LINE_ARD_D15 PAL_LINE(GPIOB, 8U) -#define LINE_I2C1_SCL PAL_LINE(GPIOB, 8U) #define LINE_ARD_D14 PAL_LINE(GPIOB, 9U) -#define LINE_I2C1_SDA PAL_LINE(GPIOB, 9U) #define LINE_ARD_D6 PAL_LINE(GPIOB, 10U) #define LINE_LED_GREEN PAL_LINE(GPIOB, 13U) @@ -275,11 +271,11 @@ /* * GPIOA setup: * - * PA0 - ARD_A0 ADC1_IN1 (analog). - * PA1 - ARD_A1 ADC1_IN2 (analog). + * PA0 - ARD_A0 ADC1_IN1 (input pullup). + * PA1 - ARD_A1 ADC1_IN2 (input pullup). * PA2 - ARD_D1 USART2_TX (alternate 7). * PA3 - ARD_D0 USART2_RX (alternate 7). - * PA4 - ARD_A2 ADC1_IN5 (analog). + * PA4 - ARD_A2 ADC1_IN5 (input pullup). * PA5 - ARD_D13 (input pullup). * PA6 - ARD_D12 (input pullup). * PA7 - ARD_D11 (input pullup). @@ -292,11 +288,11 @@ * PA14 - SWCLK (alternate 0). * PA15 - PIN15 (input pullup). */ -#define VAL_GPIOA_MODER (PIN_MODE_ANALOG(GPIOA_ARD_A0) | \ - PIN_MODE_ANALOG(GPIOA_ARD_A1) | \ +#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_ARD_A0) | \ + PIN_MODE_INPUT(GPIOA_ARD_A1) | \ PIN_MODE_ALTERNATE(GPIOA_ARD_D1) | \ PIN_MODE_ALTERNATE(GPIOA_ARD_D0) | \ - PIN_MODE_ANALOG(GPIOA_ARD_A2) | \ + PIN_MODE_INPUT(GPIOA_ARD_A2) | \ PIN_MODE_INPUT(GPIOA_ARD_D13) | \ PIN_MODE_INPUT(GPIOA_ARD_D12) | \ PIN_MODE_INPUT(GPIOA_ARD_D11) | \ @@ -340,11 +336,11 @@ PIN_OSPEED_HIGH(GPIOA_SWDIO) | \ PIN_OSPEED_HIGH(GPIOA_SWCLK) | \ PIN_OSPEED_HIGH(GPIOA_PIN15)) -#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_ARD_A0) | \ - PIN_PUPDR_FLOATING(GPIOA_ARD_A1) | \ +#define VAL_GPIOA_PUPDR (PIN_PUPDR_PULLUP(GPIOA_ARD_A0) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_A1) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D1) | \ PIN_PUPDR_FLOATING(GPIOA_ARD_D0) | \ - PIN_PUPDR_FLOATING(GPIOA_ARD_A2) | \ + PIN_PUPDR_PULLUP(GPIOA_ARD_A2) | \ PIN_PUPDR_PULLUP(GPIOA_ARD_D13) | \ PIN_PUPDR_PULLUP(GPIOA_ARD_D12) | \ PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \ @@ -392,7 +388,7 @@ /* * GPIOB setup: * - * PB0 - ARD_A3 ADC1_IN11 (analog). + * PB0 - ARD_A3 ADC1_IN11 (input pullup). * PB1 - PIN1 (input pullup). * PB2 - PIN2 (input pullup). * PB3 - SWO ARD_D3 (alternate 0). @@ -400,8 +396,8 @@ * PB5 - ARD_D4 (input pullup). * PB6 - ARD_D10 (input pullup). * PB7 - PIN7 (input pullup). - * PB8 - ARD_D15 I2C1_SCL (alternate 4). - * PB9 - ARD_D14 I2C1_SDA (alternate 4). + * PB8 - ARD_D15 (input pullup). + * PB9 - ARD_D14 (input pullup). * PB10 - ARD_D6 (input pullup). * PB11 - PIN11 (input pullup). * PB12 - PIN12 (input pullup). @@ -409,7 +405,7 @@ * PB14 - PIN14 (input pullup). * PB15 - PIN15 (input pullup). */ -#define VAL_GPIOB_MODER (PIN_MODE_ANALOG(GPIOB_ARD_A3) | \ +#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_ARD_A3) | \ PIN_MODE_INPUT(GPIOB_PIN1) | \ PIN_MODE_INPUT(GPIOB_PIN2) | \ PIN_MODE_ALTERNATE(GPIOB_SWO) | \ @@ -417,8 +413,8 @@ PIN_MODE_INPUT(GPIOB_ARD_D4) | \ PIN_MODE_INPUT(GPIOB_ARD_D10) | \ PIN_MODE_INPUT(GPIOB_PIN7) | \ - PIN_MODE_ALTERNATE(GPIOB_ARD_D15) | \ - PIN_MODE_ALTERNATE(GPIOB_ARD_D14) | \ + PIN_MODE_INPUT(GPIOB_ARD_D15) | \ + PIN_MODE_INPUT(GPIOB_ARD_D14) | \ PIN_MODE_INPUT(GPIOB_ARD_D6) | \ PIN_MODE_INPUT(GPIOB_PIN11) | \ PIN_MODE_INPUT(GPIOB_PIN12) | \ @@ -457,7 +453,7 @@ PIN_OSPEED_HIGH(GPIOB_LED_GREEN) | \ PIN_OSPEED_HIGH(GPIOB_PIN14) | \ PIN_OSPEED_HIGH(GPIOB_PIN15)) -#define VAL_GPIOB_PUPDR (PIN_PUPDR_FLOATING(GPIOB_ARD_A3) | \ +#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLUP(GPIOB_ARD_A3) | \ PIN_PUPDR_PULLUP(GPIOB_PIN1) | \ PIN_PUPDR_PULLUP(GPIOB_PIN2) | \ PIN_PUPDR_PULLUP(GPIOB_SWO) | \ @@ -465,8 +461,8 @@ PIN_PUPDR_PULLUP(GPIOB_ARD_D4) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D10) | \ PIN_PUPDR_PULLUP(GPIOB_PIN7) | \ - PIN_PUPDR_FLOATING(GPIOB_ARD_D15) | \ - PIN_PUPDR_FLOATING(GPIOB_ARD_D14) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D15) | \ + PIN_PUPDR_PULLUP(GPIOB_ARD_D14) | \ PIN_PUPDR_PULLUP(GPIOB_ARD_D6) | \ PIN_PUPDR_PULLUP(GPIOB_PIN11) | \ PIN_PUPDR_PULLUP(GPIOB_PIN12) | \ @@ -497,8 +493,8 @@ PIN_AFIO_AF(GPIOB_ARD_D4, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D10, 0) | \ PIN_AFIO_AF(GPIOB_PIN7, 0)) -#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 4) | \ - PIN_AFIO_AF(GPIOB_ARD_D14, 4) | \ +#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_ARD_D15, 0) | \ + PIN_AFIO_AF(GPIOB_ARD_D14, 0) | \ PIN_AFIO_AF(GPIOB_ARD_D6, 0) | \ PIN_AFIO_AF(GPIOB_PIN11, 0) | \ PIN_AFIO_AF(GPIOB_PIN12, 0) | \ @@ -509,8 +505,8 @@ /* * GPIOC setup: * - * PC0 - ARD_A5 ADC1_IN6 (analog). - * PC1 - ARD_A4 ADC1_IN7 (analog). + * PC0 - ARD_A5 ADC1_IN6 (input pullup). + * PC1 - ARD_A4 ADC1_IN7 (input pullup). * PC2 - PIN2 (input pullup). * PC3 - PIN3 (input pullup). * PC4 - PIN4 (input pullup). @@ -526,8 +522,8 @@ * PC14 - OSC32_IN (input floating). * PC15 - OSC32_OUT (input floating). */ -#define VAL_GPIOC_MODER (PIN_MODE_ANALOG(GPIOC_ARD_A5) | \ - PIN_MODE_ANALOG(GPIOC_ARD_A4) | \ +#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_ARD_A5) | \ + PIN_MODE_INPUT(GPIOC_ARD_A4) | \ PIN_MODE_INPUT(GPIOC_PIN2) | \ PIN_MODE_INPUT(GPIOC_PIN3) | \ PIN_MODE_INPUT(GPIOC_PIN4) | \ @@ -574,8 +570,8 @@ PIN_OSPEED_HIGH(GPIOC_BUTTON) | \ PIN_OSPEED_HIGH(GPIOC_OSC32_IN) | \ PIN_OSPEED_HIGH(GPIOC_OSC32_OUT)) -#define VAL_GPIOC_PUPDR (PIN_PUPDR_FLOATING(GPIOC_ARD_A5) | \ - PIN_PUPDR_FLOATING(GPIOC_ARD_A4) | \ +#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_ARD_A5) | \ + PIN_PUPDR_PULLUP(GPIOC_ARD_A4) | \ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \ PIN_PUPDR_PULLUP(GPIOC_PIN3) | \ PIN_PUPDR_PULLUP(GPIOC_PIN4) | \ diff --git a/os/hal/boards/ST_NUCLEO64_F302R8/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO64_F302R8/cfg/board.chcfg index 59b7cc61b..17f7b10fb 100644 --- a/os/hal/boards/ST_NUCLEO64_F302R8/cfg/board.chcfg +++ b/os/hal/boards/ST_NUCLEO64_F302R8/cfg/board.chcfg @@ -21,16 +21,16 @@ Type="PushPull" Level="High" Speed="Maximum" - Resistor="Floating" - Mode="Analog" + Resistor="PullUp" + Mode="Input" Alternate="0" /> + Resistor="PullUp" + Mode="Input" + Alternate="0" /> + Resistor="PullUp" + Mode="Input" + Alternate="0" />