zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3323 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
gdisirio 2011-09-17 08:45:43 +00:00
parent eea844796a
commit 4ff96215ed
3 changed files with 93 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
boards/ST_STM32L_DISCOVERY/board.h
View File

@ -95,15 +95,39 @@
* PA15 - JTDI (alternate 0). * PA15 - JTDI (alternate 0).
*/ */
#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_BUTTON) | \ #define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_BUTTON) | \
PIN_MODE_INPUT(1) | \
PIN_MODE_INPUT(2) | \
PIN_MODE_INPUT(3) | \
PIN_MODE_INPUT(4) | \
PIN_MODE_INPUT(5) | \
PIN_MODE_INPUT(6) | \
PIN_MODE_INPUT(7) | \
PIN_MODE_INPUT(8) | \
PIN_MODE_INPUT(9) | \
PIN_MODE_INPUT(10) | \
PIN_MODE_INPUT(11) | \
PIN_MODE_INPUT(12) | \
PIN_MODE_ALTERNATE(13) | \ PIN_MODE_ALTERNATE(13) | \
PIN_MODE_ALTERNATE(14) | \ PIN_MODE_ALTERNATE(14) | \
PIN_MODE_ALTERNATE(15)) PIN_MODE_ALTERNATE(15))
#define VAL_GPIOA_OTYPER 0x00000000 #define VAL_GPIOA_OTYPER 0x00000000
#define VAL_GPIOA_OSPEEDR 0xFFFFFFFF #define VAL_GPIOA_OSPEEDR 0xFFFFFFFF
#define VAL_GPIOA_PUPDR (~(PIN_PUDR_FLOATING(GPIOA_BUTTON) | \ #define VAL_GPIOA_PUPDR (PIN_PUDR_PULLUP(GPIOA_BUTTON) | \
PIN_PUDR_PULLUP(1) | \
PIN_PUDR_PULLUP(2) | \
PIN_PUDR_PULLUP(3) | \
PIN_PUDR_PULLUP(4) | \
PIN_PUDR_PULLUP(5) | \
PIN_PUDR_PULLUP(6) | \
PIN_PUDR_PULLUP(7) | \
PIN_PUDR_PULLUP(8) | \
PIN_PUDR_PULLUP(9) | \
PIN_PUDR_PULLUP(10) | \
PIN_PUDR_PULLUP(11) | \
PIN_PUDR_PULLUP(12) | \
PIN_PUDR_FLOATING(13) | \ PIN_PUDR_FLOATING(13) | \
PIN_PUDR_FLOATING(14) | \ PIN_PUDR_FLOATING(14) | \
PIN_PUDR_FLOATING(15))) PIN_PUDR_FLOATING(15))
#define VAL_GPIOA_ODR 0xFFFFFFFF #define VAL_GPIOA_ODR 0xFFFFFFFF
#define VAL_GPIOA_AFRL 0x00000000 #define VAL_GPIOA_AFRL 0x00000000
#define VAL_GPIOA_AFRH 0x00000000 #define VAL_GPIOA_AFRH 0x00000000
@ -116,16 +140,40 @@
* PB6 - GPIOB_LED4 (output push-pull). * PB6 - GPIOB_LED4 (output push-pull).
* PB7 - GPIOB_LED3 (output push-pull). * PB7 - GPIOB_LED3 (output push-pull).
*/ */
#define VAL_GPIOB_MODER (PIN_MODE_ALTERNATE(3) | \ #define VAL_GPIOB_MODER (PIN_MODE_INPUT(0) | \
PIN_MODE_INPUT(1) | \
PIN_MODE_INPUT(2) | \
PIN_MODE_ALTERNATE(3) | \
PIN_MODE_ALTERNATE(4) | \ PIN_MODE_ALTERNATE(4) | \
PIN_MODE_INPUT(5) | \
PIN_MODE_OUTPUT(GPIOB_LED4) | \ PIN_MODE_OUTPUT(GPIOB_LED4) | \
PIN_MODE_OUTPUT(GPIOB_LED3)) PIN_MODE_OUTPUT(GPIOB_LED3) | \
PIN_MODE_INPUT(8) | \
PIN_MODE_INPUT(9) | \
PIN_MODE_INPUT(10) | \
PIN_MODE_INPUT(11) | \
PIN_MODE_INPUT(12) | \
PIN_MODE_INPUT(13) | \
PIN_MODE_INPUT(14) | \
PIN_MODE_INPUT(15))
#define VAL_GPIOB_OTYPER 0x00000000 #define VAL_GPIOB_OTYPER 0x00000000
#define VAL_GPIOB_OSPEEDR 0xFFFFFFFF #define VAL_GPIOB_OSPEEDR 0xFFFFFFFF
#define VAL_GPIOB_PUPDR (~(PIN_PUDR_FLOATING(3) | \ #define VAL_GPIOB_PUPDR (PIN_PUDR_PULLUP(0) | \
PIN_PUDR_PULLUP(1) | \
PIN_PUDR_PULLUP(2) | \
PIN_PUDR_FLOATING(3) | \
PIN_PUDR_FLOATING(4) | \ PIN_PUDR_FLOATING(4) | \
PIN_PUDR_PULLUP(5) | \
PIN_PUDR_FLOATING(GPIOB_LED4) | \ PIN_PUDR_FLOATING(GPIOB_LED4) | \
PIN_PUDR_FLOATING(GPIOB_LED3))) PIN_PUDR_FLOATING(GPIOB_LED3) | \
PIN_PUDR_PULLUP(8) | \
PIN_PUDR_PULLUP(9) | \
PIN_PUDR_PULLUP(10) | \
PIN_PUDR_PULLUP(11) | \
PIN_PUDR_PULLUP(12) | \
PIN_PUDR_PULLUP(13) | \
PIN_PUDR_PULLUP(14) | \
PIN_PUDR_PULLUP(15))
#define VAL_GPIOB_ODR 0xFFFFFF3F #define VAL_GPIOB_ODR 0xFFFFFF3F
#define VAL_GPIOB_AFRL 0x00000000 #define VAL_GPIOB_AFRL 0x00000000
#define VAL_GPIOB_AFRH 0x00000000 #define VAL_GPIOB_AFRH 0x00000000

11
demos/ARMCM3-STM32L152-DISCOVERY/main.c
View File

@ -60,16 +60,19 @@ int main(void) {
/* /*
* Activates the serial driver 1 using the driver default configuration. * Activates the serial driver 1 using the driver default configuration.
* PA9 and PA10 are routed to USART1.
*/ */
sdStart(&SD1, NULL); sdStart(&SD1, NULL);
palSetPadMode(GPIOA, 9, PAL_MODE_ALT_OUTPUT_PUSHPULL(7));
palSetPadMode(GPIOA, 10, PAL_MODE_ALT_INPUT(7));
/* /*
* If the user button is pressed after the reset then the test suite is * If the user button is pressed after the reset then the test suite is
* executed immediately before activating the various device drivers in * executed immediately before activating the various device drivers in
* order to not alter the benchmark scores. * order to not alter the benchmark scores.
*/ */
// if (palReadPad(GPIOA, GPIOA_BUTTON)) if (palReadPad(GPIOA, GPIOA_BUTTON))
// TestThread(&SD1); TestThread(&SD1);
/* /*
* Initializes the SPI driver 1. * Initializes the SPI driver 1.
@ -106,8 +109,8 @@ int main(void) {
* driver 1. * driver 1.
*/ */
while (TRUE) { while (TRUE) {
// if (palReadPad(GPIOA, GPIOA_BUTTON)) if (palReadPad(GPIOA, GPIOA_BUTTON))
// TestThread(&SD1); TestThread(&SD1);
chThdSleepMilliseconds(500); chThdSleepMilliseconds(500);
} }
} }

30
os/hal/platforms/STM32/GPIOv2/pal_lld.h
View File

@ -95,6 +95,32 @@
#define PAL_MODE_INPUT_PULLDOWN (PAL_STM32_MODE_INPUT | \ #define PAL_MODE_INPUT_PULLDOWN (PAL_STM32_MODE_INPUT | \
PAL_STM32_PUDR_PULLDOWN) PAL_STM32_PUDR_PULLDOWN)
/**
* @brief Alternate input high-Z pad.
*
* @param[in] n alternate function selector
*/
#define PAL_MODE_ALT_INPUT(n) (PAL_STM32_MODE_INPUT | \
PAL_STM32_ALTERNATE(n))
/**
* @brief Alternate input pad with weak pull up resistor.
*
* @param[in] n alternate function selector
*/
#define PAL_MODE_ALT_INPUT_PULLUP(n) (PAL_STM32_MODE_INPUT | \
PAL_STM32_PUDR_PULLUP | \
PAL_STM32_ALTERNATE(n))
/**
* @brief Alternate input pad with weak pull down resistor.
*
* @param[in] n alternate function selector
*/
#define PAL_MODE_ALT_INPUT_PULLDOWN(n) (PAL_STM32_MODE_INPUT | \
PAL_STM32_PUDR_PULLDOWN | \
PAL_STM32_ALTERNATE(n))
/** /**
* @brief Analog input mode. * @brief Analog input mode.
*/ */
@ -117,7 +143,7 @@
* *
* @param[in] n alternate function selector * @param[in] n alternate function selector
*/ */
#define PAL_MODE_ALTERNATE_PUSHPULL(n) (PAL_STM32_MODE_ALTERNATE | \ #define PAL_MODE_ALT_OUTPUT_PUSHPULL(n) (PAL_STM32_MODE_ALTERNATE | \
PAL_STM32_OTYPE_PUSHPULL | \ PAL_STM32_OTYPE_PUSHPULL | \
PAL_STM32_ALTERNATE(n)) PAL_STM32_ALTERNATE(n))
@ -126,7 +152,7 @@
* *
* @param[in] n alternate function selector * @param[in] n alternate function selector
*/ */
#define PAL_MODE_ALTERNATE_OPENDRAIN(n) (PAL_STM32_MODE_ALTERNATE | \ #define PAL_MODE_ALT_OUTPUT_OPENDRAIN(n) (PAL_STM32_MODE_ALTERNATE | \
PAL_STM32_OTYPE_OPENDRAIN | \ PAL_STM32_OTYPE_OPENDRAIN | \
PAL_STM32_ALTERNATE(n)) PAL_STM32_ALTERNATE(n))