diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-04-27 15:32:31 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-04-27 15:33:06 -0400 |
| commit | 033bf3f26290c41074cf487549233ea2c25120f0 (patch) | |
| tree | 101ee7265732b76073168a15ddb6fd8f02d0bbae | |
| parent | 90c649c4b36dfc0c80d41878721c06187ada6b90 (diff) | |
| download | librambutan-033bf3f26290c41074cf487549233ea2c25120f0.tar.gz librambutan-033bf3f26290c41074cf487549233ea2c25120f0.zip | |
RET6 fixes
| -rw-r--r-- | examples/test-session.cpp | 4 | ||||
| -rw-r--r-- | wirish/boards/maple_RET6.cpp | 13 | ||||
| -rw-r--r-- | wirish/boards/maple_RET6.h | 10 |
3 files changed, 21 insertions, 6 deletions
diff --git a/examples/test-session.cpp b/examples/test-session.cpp index 1d9daf0..ad3cacb 100644 --- a/examples/test-session.cpp +++ b/examples/test-session.cpp @@ -855,7 +855,7 @@ void enable_usarts(void) { Serial1.begin(BAUD); Serial2.begin(BAUD); Serial3.begin(BAUD); -#ifdef STM32_HIGH_DENSITY +#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6) Serial4.begin(BAUD); Serial5.begin(BAUD); #endif @@ -865,7 +865,7 @@ void disable_usarts(void) { Serial1.end(); Serial2.end(); Serial3.end(); -#ifdef STM32_HIGH_DENSITY +#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6) Serial4.end(); Serial5.end(); #endif diff --git a/wirish/boards/maple_RET6.cpp b/wirish/boards/maple_RET6.cpp index fd67459..d5d3d32 100644 --- a/wirish/boards/maple_RET6.cpp +++ b/wirish/boards/maple_RET6.cpp @@ -85,7 +85,15 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = { {GPIOC, TIMER8, NULL, 6, 1, ADCx}, /* D35/PC6 */ {GPIOC, TIMER8, NULL, 7, 2, ADCx}, /* D36/PC7 */ {GPIOC, TIMER8, NULL, 8, 3, ADCx}, /* D37/PC8 */ - {GPIOC, TIMER8, NULL, 9, 4, ADCx} /* D38/PC9 (BUT) */ + {GPIOC, TIMER8, NULL, 9, 4, ADCx}, /* D38/PC9 (BUT) */ + + /* JTAG header */ + + {GPIOA, NULL, NULL, 13, 0, ADCx}, /* D39/PA13 */ + {GPIOA, NULL, NULL, 14, 0, ADCx}, /* D40/PA14 */ + {GPIOA, NULL, NULL, 15, 0, ADCx}, /* D41/PA15 */ + {GPIOB, NULL, NULL, 3, 0, ADCx}, /* D42/PB3 */ + {GPIOB, NULL, NULL, 4, 0, ADCx}, /* D43/PB4 */ }; extern const uint8 boardPWMPins[BOARD_NR_PWM_PINS] __FLASH__ = { @@ -97,7 +105,8 @@ extern const uint8 boardADCPins[BOARD_NR_ADC_PINS] __FLASH__ = { }; extern const uint8 boardUsedPins[BOARD_NR_USED_PINS] __FLASH__ = { - BOARD_LED_PIN, BOARD_BUTTON_PIN + BOARD_LED_PIN, BOARD_BUTTON_PIN, BOARD_JTMS_SWDIO_PIN, + BOARD_JTCK_SWCLK_PIN, BOARD_JTDI_PIN, BOARD_JTDO_PIN, BOARD_NJTRST_PIN }; #endif diff --git a/wirish/boards/maple_RET6.h b/wirish/boards/maple_RET6.h index d91a4de..97e609d 100644 --- a/wirish/boards/maple_RET6.h +++ b/wirish/boards/maple_RET6.h @@ -55,9 +55,15 @@ #define BOARD_USART3_TX_PIN 29 #define BOARD_USART3_RX_PIN 30 -#define BOARD_NR_GPIO_PINS 39 +#define BOARD_NR_GPIO_PINS 44 #define BOARD_NR_PWM_PINS 16 #define BOARD_NR_ADC_PINS 15 -#define BOARD_NR_USED_PINS 2 +#define BOARD_NR_USED_PINS 7 + +#define BOARD_JTMS_SWDIO_PIN 39 +#define BOARD_JTCK_SWCLK_PIN 40 +#define BOARD_JTDI_PIN 41 +#define BOARD_JTDO_PIN 42 +#define BOARD_NJTRST_PIN 43 #endif |