t
Fork of mbed-dev by
Diff: targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/PinNames.h
- Revision:
- 148:21d94c44109e
- Parent:
- 147:30b64687e01f
diff -r 30b64687e01f -r 21d94c44109e targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/PinNames.h --- a/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/PinNames.h Fri Sep 16 16:24:25 2016 +0100 +++ b/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/PinNames.h Fri Sep 30 18:07:01 2016 +0100 @@ -37,13 +37,13 @@ #endif // See stm32f4xx_hal_gpio.h and stm32f4xx_hal_gpio_ex.h for values of MODE, PUPD and AFNUM -#define STM_PIN_DATA(MODE, PUPD, AFNUM) ((int)(((AFNUM & 0x0F) << 7) | ((PUPD & 0x07) << 4) | ((MODE & 0x0F) << 0))) -#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((INVERTED & 0x01) << 16) | ((CHANNEL & 0x1F) << 11) | ((AFNUM & 0x0F) << 7) | ((PUPD & 0x07) << 4) | ((MODE & 0x0F) << 0))) +#define STM_PIN_DATA(MODE, PUPD, AFNUM) ((int)(((AFNUM) << 7) | ((PUPD) << 4) | ((MODE) << 0))) +#define STM_PIN_DATA_EXT(MODE, PUPD, AFNUM, CHANNEL, INVERTED) ((int)(((INVERTED & 0x01) << 15) | ((CHANNEL & 0x0F) << 11) | ((AFNUM & 0x0F) << 7) | ((PUPD & 0x07) << 4) | ((MODE & 0x0F) << 0))) #define STM_PIN_MODE(X) (((X) >> 0) & 0x0F) #define STM_PIN_PUPD(X) (((X) >> 4) & 0x07) #define STM_PIN_AFNUM(X) (((X) >> 7) & 0x0F) -#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x1F) -#define STM_PIN_INVERTED(X) (((X) >> 16) & 0x01) +#define STM_PIN_CHANNEL(X) (((X) >> 11) & 0x0F) +#define STM_PIN_INVERTED(X) (((X) >> 15) & 0x01) #define STM_MODE_INPUT (0) #define STM_MODE_OUTPUT_PP (1) #define STM_MODE_OUTPUT_OD (2) @@ -109,11 +109,6 @@ PH_8 = 0x78, PH_9 = 0x79, PH_10 = 0x7A, PH_11 = 0x7B, PH_12 = 0x7C, PH_13 = 0x7D, PH_14 = 0x7E, PH_15 = 0x7F, - // ADC internal channels - ADC_TEMP = 0xF0, - ADC_VREF = 0xF1, - ADC_VBAT = 0xF2, - // Module Pins // A P_A5 = PC_2, // UART-DTR @@ -167,14 +162,14 @@ A2 = PC_2, // AI12 A3 = PF_7, // LPOCLK, not AI A4 = PG_4, // not AI - A5 = PB_3, // not AI + A5 = PE_0, // not AI // D0-D15 D0 = PD_9, // UART3-RX D1 = PD_8, // UART3-TX D2 = PA_10, // UART1-RX D3 = PA_11, // CAN1-RX D4 = PA_12, // CAN1-TX - D5 = PA_15, + D5 = PB_8, D6 = PD_11, // UART3-CTS D7 = PD_12, // UART3-RTS D8 = PA_9, // UART1-TX @@ -186,14 +181,15 @@ D14 = PF_0, // SDA D15 = PF_1, // SCL // Internal - LED_RED = PE_0, // Red / Mode - LED_GRE = PB_6, // Green / Switch-1 - LED_BLU = PB_8, // Blue + LED1 = PE_0, // Red / Mode + LED2 = PB_6, // Green / Switch-1 + LED3 = PB_8, // Blue + LED4 = D10, SW0 = PF_2, // Switch-0 SW1 = PB_6, // Green / Switch-1 // ST-Link - USBRXD = PD_9, - USBTXD = PD_8, + USBRX = PA_10, + USBTX = PA_9, SWDIO = PA_15, SWCLK = PA_14, NTRST = PB_4,