diff options
| author | Christian Pointner <equinox@mur.at> | 2013-08-22 01:11:54 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@mur.at> | 2013-08-22 01:11:54 +0000 |
| commit | fe124328828f8aef23861db889c144736b782475 (patch) | |
| tree | c234a21cabffe26cb5c76afe5561b572f9cc5728 /software/mpu/board | |
| parent | moved heartbeat thread to seperate file (diff) | |
added USB CDC based shell
git-svn-id: https://svn.spreadspace.org/mur.sat@835 7de4ea59-55d0-425e-a1af-a3118ea81d4c
Diffstat (limited to 'software/mpu/board')
| -rw-r--r-- | software/mpu/board/board.c | 4 | ||||
| -rw-r--r-- | software/mpu/board/board.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/software/mpu/board/board.c b/software/mpu/board/board.c index c1a077e..2560a73 100644 --- a/software/mpu/board/board.c +++ b/software/mpu/board/board.c @@ -49,4 +49,8 @@ void __early_init(void) { * Board-specific initialization code. */ void boardInit(void) { + /* + * Disable JTAG-DP and SW-DP. + */ + AFIO->MAPR = AFIO_MAPR_SWJ_CFG_DISABLE; } diff --git a/software/mpu/board/board.h b/software/mpu/board/board.h index 018a45e..3004909 100644 --- a/software/mpu/board/board.h +++ b/software/mpu/board/board.h @@ -73,14 +73,12 @@ /* * Port A setup. * Everything input with pull-up except: - * PA2 - Alternate output (USART2 TX). - * PA3 - Normal input (USART2 RX). * PA8 - Push Pull output (LED). * PA11 - Normal input (USB DM). * PA12 - Normal input (USB DP). * PA13 - Push Pull output (USB DISC). */ -#define VAL_GPIOACRL 0x88884B88 /* PA7...PA0 */ +#define VAL_GPIOACRL 0x88888888 /* PA7...PA0 */ #define VAL_GPIOACRH 0x88344883 /* PA15...PA8 */ #define VAL_GPIOAODR 0xFFFFFFFF |