noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bugfix: other variants than generic did not work

This commit is contained in:
stevstrong 2017-05-12 20:51:12 +02:00
parent 679217dfaf
commit 220247c115
6 changed files with 171 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
STM32F4/boards.txt
View File

@ -31,6 +31,12 @@ discovery_f407.build.error_led_port=GPIOD
discovery_f407.build.error_led_pin=14
discovery_f407.build.board=STM32DiscoveryF407
discovery_f407.menu.usb_cfg.usb_nc=USB inactive
discovery_f407.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
discovery_f407.menu.usb_cfg.usb_serial=USB serial (CDC)
discovery_f407.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
discovery_f407.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
discovery_f407.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
##############################################################
generic_f407v.name=Generic STM32F407V series
@ -88,7 +94,7 @@ stm32f4stamp.upload.dfuse_addr=0x8000000
stm32f4stamp.build.mcu=cortex-m4
stm32f4stamp.build.f_cpu=168000000L
stm32f4stamp.build.core=maple
stm32f4stamp.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4
stm32f4stamp.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F4 -DBOARD_discovery_f4
stm32f4stamp.build.ldscript=ld/jtag.ld
stm32f4stamp.build.variant=discovery_f407
stm32f4stamp.build.variant_system_lib=lib_f407.a
@ -98,6 +104,12 @@ stm32f4stamp.build.error_led_port=GPIOD
stm32f4stamp.build.error_led_pin=14
stm32f4stamp.build.board=STM32F4StampF405
stm32f4stamp.menu.usb_cfg.usb_nc=USB inactive
stm32f4stamp.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
stm32f4stamp.menu.usb_cfg.usb_serial=USB serial (CDC)
stm32f4stamp.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
stm32f4stamp.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
stm32f4stamp.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
##############################################################
netduino2plus.name=Netduino2 F405
@ -118,7 +130,7 @@ netduino2plus.upload.dfuse_addr=0x8000000
netduino2plus.build.mcu=cortex-m4
netduino2plus.build.f_cpu=168000000L
netduino2plus.build.core=maple
netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F2 -DSTM32F4 -DBOARD_discovery_f4 -DARDUINO_STM32F4_NETDUINO2PLUS
netduino2plus.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -DSTM32F4 -DBOARD_discovery_f4 -DARDUINO_STM32F4_NETDUINO2PLUS
netduino2plus.build.ldscript=ld/jtag.ld
netduino2plus.build.variant=discovery_f407
netduino2plus.build.variant_system_lib=lib_f407.a
@ -128,5 +140,11 @@ netduino2plus.build.error_led_port=GPIOD
netduino2plus.build.error_led_pin=14
netduino2plus.build.board=Netduino2F405
netduino2plus.menu.usb_cfg.usb_nc=USB inactive
netduino2plus.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
netduino2plus.menu.usb_cfg.usb_serial=USB serial (CDC)
netduino2plus.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
netduino2plus.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
netduino2plus.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
##############################################################

10
STM32F4/cores/maple/libmaple/gpioF4.c
View File

@ -124,14 +124,14 @@ void gpio_init_all(void) {
#ifdef ARDUINO_STM32F4_NETDUINO2PLUS
// PA8 Output the Master Clock MCO1
gpio_set_af_mode(GPIOA, 8, 0);
gpio_set_mode(GPIOA, 8, GPIO_MODE_AF | GPIO_OTYPE_PP | GPIO_OSPEED_100MHZ);
gpio_set_af_mode(PA8, 0);
gpio_set_mode(PA8, GPIO_MODE_AF | GPIO_OTYPE_PP | GPIO_OSPEED_100MHZ);
// PB4 as alternate MISO Input
gpio_set_af_mode(GPIOB, 4, 5);
gpio_set_af_mode(PB4, 5);
// PA5 as alternate SCK Output
gpio_set_af_mode(GPIOA, 5, 5);
gpio_set_af_mode(PA5, 5);
// PA7 as alternate MOSI Output
gpio_set_af_mode(GPIOA, 7, 5);
gpio_set_af_mode(PA7, 5);
#endif
}

4
STM32F4/cores/maple/wirish_types.h
View File

@ -60,13 +60,11 @@ typedef struct stm32_pin_info {
#else
typedef struct stm32_pin_info {
gpio_dev *gpio_device; /**< Maple pin's GPIO device */
const gpio_dev *gpio_device; /**< Maple pin's GPIO device */
timer_dev *timer_device; /**< Pin's timer device, if any. */
const adc_dev *adc_device; /**< ADC device, if any. */
uint8 gpio_bit; /**< Pin's GPIO port bit. */
uint8 timer_channel; /**< Timer channel, or 0 if none. */
uint8 adc_channel; /**< Pin ADC channel, or ADCx if none. */
uint8 filler;
} stm32_pin_info;
#endif

1
STM32F4/libraries/SPI/src/SPI.h
View File

@ -42,6 +42,7 @@
#include <libmaple/dma.h>
#include <wirish.h>
#define SPI_DMA
// SPI_HAS_TRANSACTION means SPI has
// - beginTransaction()

277
STM32F4/variants/discovery_f407/discovery_f4.cpp
View File

@ -34,182 +34,187 @@
#include "discovery_f4.h"
//#include "fsmc.h"
#include "gpio.h"
#include "rcc.h"
#include "timer.h"
#include <libmaple\gpio.h>
#include <libmaple\rcc.h>
#include "wirish_types.h"
//static void initSRAMChip(void);
void boardInit(void) {
// remap TIMER8 to PC6-9
gpio_set_af_mode(GPIOC, 6, 3);
gpio_set_af_mode(GPIOC, 7, 3);
gpio_set_af_mode(GPIOC, 8, 3);
gpio_set_af_mode(GPIOC, 9, 3);
gpio_set_af_mode(PC6, 3);
gpio_set_af_mode(PC7, 3);
gpio_set_af_mode(PC8, 3);
gpio_set_af_mode(PC9, 3);
// remap TIMER1 to PE9,11,13,14
gpio_set_af_mode(GPIOE, 9, 1);
gpio_set_af_mode(GPIOE, 11, 1);
gpio_set_af_mode(GPIOE, 13, 1);
gpio_set_af_mode(GPIOE, 14, 1);
gpio_set_af_mode(PE9, 1);
gpio_set_af_mode(PE11, 1);
gpio_set_af_mode(PE13, 1);
gpio_set_af_mode(PE14, 1);
// remap TIMER3 to PB4,5,0,1
gpio_set_af_mode(GPIOB, 4, 2);
gpio_set_af_mode(GPIOB, 5, 2);
gpio_set_af_mode(GPIOB, 0, 2);
gpio_set_af_mode(GPIOB, 1, 2);
gpio_set_af_mode(PB4, 2);
gpio_set_af_mode(PB5, 2);
gpio_set_af_mode(PB0, 2);
gpio_set_af_mode(PB1, 2);
//gpio_set_af_mode(GPIOA, 2, 7);
//gpio_set_af_mode(GPIOA, 3, 7);
#ifdef ARDUINO_STM32F4_NETDUINO2PLUS
// PA8 Output the Master Clock MCO1
gpio_set_af_mode(GPIOA, 8, 0);
gpio_set_af_mode(PA8, 0);
// PB4 as alternate MISO Input
gpio_set_af_mode(GPIOB, 4, 5);
gpio_set_af_mode(PB4, 5);
// PA5 as alternate SCK Output
gpio_set_af_mode(GPIOA, 5, 5);
gpio_set_af_mode(PA5, 5);
// PA7 as alternate MOSI Output
gpio_set_af_mode(GPIOA, 7, 5);
gpio_set_af_mode(PA7, 5);
#endif
return;
}
extern timer_dev timer1;
extern timer_dev timer2;
extern timer_dev timer3;
extern timer_dev timer4;
extern timer_dev timer5;
extern timer_dev timer6;
extern timer_dev timer7;
extern timer_dev timer8;
#if 0
typedef struct stm32_pin_info {
gpio_dev *gpio_device; /**< Maple pin's GPIO device */
timer_dev *timer_device; /**< Pin's timer device, if any. */
const adc_dev *adc_device; /**< ADC device, if any. */
uint8 gpio_bit; /**< Pin's GPIO port bit. */
uint8 timer_channel; /**< Timer channel, or 0 if none. */
uint8 adc_channel; /**< Pin ADC channel, or ADCx if none. */
} stm32_pin_info;
#endif
extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
{GPIOA, TIMER5, ADC1, 0, 1, 0}, /* D00/PA0 */
{GPIOA, TIMER5, ADC1, 1, 2, 1}, /* D01/PA1 */
{GPIOA, TIMER5, ADC1, 2, 3, 2}, /* D02/PA2 */
{GPIOA, TIMER5, ADC1, 3, 4, 3}, /* D03/PA3 */
{GPIOA, NULL, ADC1, 4, 0, 4}, /* D04/PA4 */
{GPIOA, NULL, ADC1, 5, 0, 5}, /* D05/PA5 */
{GPIOA, NULL, ADC1, 6, 1, 6}, /* D06/PA6 */ // ala check TIMER3
{GPIOA, NULL, ADC1, 7, 0, 7}, /* D07/PA7 */
{GPIOA, NULL, NULL, 8, 0, ADCx}, /* D08/PA8 */ // remap out
{GPIOA, NULL, NULL, 9, 0, ADCx}, /* D09/PA9 */ // remap out
{GPIOA, NULL, NULL, 10, 0, ADCx}, /* D10/PA10 */ // remap out
{GPIOA, NULL, NULL, 11, 0, ADCx}, /* D11/PA11 */ // remap out
{GPIOA, NULL, NULL, 12, 0, ADCx}, /* D12/PA12 */
{GPIOA, NULL, NULL, 13, 0, ADCx}, /* D13/PA13 */
{GPIOA, NULL, NULL, 14, 0, ADCx}, /* D14/PA14 */
{GPIOA, TIMER2, NULL, 15, 1, ADCx}, /* D15/PA15 */ // remap in
{&GPIOA, &timer5, &ADC1, 1, 0}, /* D00/PA0 */
{&GPIOA, &timer5, &ADC1, 2, 1}, /* D01/PA1 */
{&GPIOA, &timer5, &ADC1, 3, 2}, /* D02/PA2 */
{&GPIOA, &timer5, &ADC1, 4, 3}, /* D03/PA3 */
{&GPIOA, NULL, &ADC1, 0, 4}, /* D04/PA4 */
{&GPIOA, NULL, &ADC1, 0, 5}, /* D05/PA5 */
{&GPIOA, NULL, &ADC1, 1, 6}, /* D06/PA6 */ // ala check TIMER3
{&GPIOA, NULL, &ADC1, 0, 7}, /* D07/PA7 */
{&GPIOA, NULL, NULL, 0, ADCx}, /* D08/PA8 */ // remap out
{&GPIOA, NULL, NULL, 0, ADCx}, /* D09/PA9 */ // remap out
{&GPIOA, NULL, NULL, 0, ADCx}, /* D10/PA10 */ // remap out
{&GPIOA, NULL, NULL, 0, ADCx}, /* D11/PA11 */ // remap out
{&GPIOA, NULL, NULL, 0, ADCx}, /* D12/PA12 */
{&GPIOA, NULL, NULL, 0, ADCx}, /* D13/PA13 */
{&GPIOA, NULL, NULL, 0, ADCx}, /* D14/PA14 */
{&GPIOA, &timer2, NULL, 1, ADCx}, /* D15/PA15 */ // remap in
{GPIOB, TIMER3, ADC1, 0, 3, 8}, /* D16/PB0 */
{GPIOB, TIMER3, ADC1, 1, 4, 9}, /* D17/PB1 */
{GPIOB, NULL, NULL, 2, 0, ADCx}, /* D18/PB2 */
{GPIOB, TIMER2, NULL, 3, 2, ADCx}, /* D19/PB3 */ // remap in
{GPIOB, TIMER3, NULL, 4, 1, ADCx}, /* D20/PB4 */ // remap in
{GPIOB, TIMER3, NULL, 5, 2, ADCx}, /* D21/PB5 */ // remap in
{GPIOB, NULL, NULL, 6, 0, ADCx}, /* D22/PB6 */ // remap out
{GPIOB, NULL, NULL, 7, 0, ADCx}, /* D23/PB7 */ // remap out
{GPIOB, NULL, NULL, 8, 0, ADCx}, /* D24/PB8 */ // remap out
{GPIOB, NULL, NULL, 9, 0, ADCx}, /* D25/PB9 */ // remap out
{GPIOB, NULL, NULL, 10, 0, ADCx}, /* D26/PB10 */
{GPIOB, NULL, NULL, 11, 0, ADCx}, /* D27/PB11 */
{GPIOB, NULL, NULL, 12, 0, ADCx}, /* D28/PB12 */
{GPIOB, NULL, NULL, 13, 0, ADCx}, /* D29/PB13 */
{GPIOB, NULL, NULL, 14, 0, ADCx}, /* D30/PB14 */
{GPIOB, NULL, NULL, 15, 0, ADCx}, /* D31/PB15 */
{&GPIOB, &timer3, &ADC1, 3, 8}, /* D16/PB0 */
{&GPIOB, &timer3, &ADC1, 4, 9}, /* D17/PB1 */
{&GPIOB, NULL, NULL, 0, ADCx}, /* D18/PB2 */
{&GPIOB, &timer2, NULL, 2, ADCx}, /* D19/PB3 */ // remap in
{&GPIOB, &timer3, NULL, 1, ADCx}, /* D20/PB4 */ // remap in
{&GPIOB, &timer3, NULL, 2, ADCx}, /* D21/PB5 */ // remap in
{&GPIOB, NULL, NULL, 0, ADCx}, /* D22/PB6 */ // remap out
{&GPIOB, NULL, NULL, 0, ADCx}, /* D23/PB7 */ // remap out
{&GPIOB, NULL, NULL, 0, ADCx}, /* D24/PB8 */ // remap out
{&GPIOB, NULL, NULL, 0, ADCx}, /* D25/PB9 */ // remap out
{&GPIOB, NULL, NULL, 0, ADCx}, /* D26/PB10 */
{&GPIOB, NULL, NULL, 0, ADCx}, /* D27/PB11 */
{&GPIOB, NULL, NULL, 0, ADCx}, /* D28/PB12 */
{&GPIOB, NULL, NULL, 0, ADCx}, /* D29/PB13 */
{&GPIOB, NULL, NULL, 0, ADCx}, /* D30/PB14 */
{&GPIOB, NULL, NULL, 0, ADCx}, /* D31/PB15 */
{GPIOC, NULL, ADC1, 0, 0, 10}, /* D32/PC0 */
{GPIOC, NULL, ADC1, 1, 0, 11}, /* D33/PC1 */
{GPIOC, NULL, ADC1, 2, 0, 12}, /* D34/PC2 */
{GPIOC, NULL, ADC1, 3, 0, 13}, /* D35/PC3 */
{GPIOC, NULL, ADC1, 4, 0, 14}, /* D36/PC4 */
{GPIOC, NULL, ADC1, 5, 0, 15}, /* D37/PC5 */
{GPIOC, TIMER8, NULL, 6, 1, ADCx}, /* D38/PC6 */
{GPIOC, TIMER8, NULL, 7, 2, ADCx}, /* D39/PC7 */
{GPIOC, TIMER8, NULL, 8, 3, ADCx}, /* D40/PC8 */
{GPIOC, TIMER8, NULL, 9, 4, ADCx}, /* D41/PC9 */
{GPIOC, NULL, NULL, 10, 0, ADCx}, /* D42/PC10 */
{GPIOC, NULL, NULL, 11, 0, ADCx}, /* D43/PC11 */
{GPIOC, NULL, NULL, 12, 0, ADCx}, /* D44/PC12 */
{GPIOC, NULL, NULL, 13, 0, ADCx}, /* D45/PC13 */
{GPIOC, NULL, NULL, 14, 0, ADCx}, /* D46/PC14 */
{GPIOC, NULL, NULL, 15, 0, ADCx}, /* D47/PC15 */
{&GPIOC, NULL, &ADC1, 0, 10}, /* D32/PC0 */
{&GPIOC, NULL, &ADC1, 0, 11}, /* D33/PC1 */
{&GPIOC, NULL, &ADC1, 0, 12}, /* D34/PC2 */
{&GPIOC, NULL, &ADC1, 0, 13}, /* D35/PC3 */
{&GPIOC, NULL, &ADC1, 0, 14}, /* D36/PC4 */
{&GPIOC, NULL, &ADC1, 0, 15}, /* D37/PC5 */
{&GPIOC, &timer8, NULL, 1, ADCx}, /* D38/PC6 */
{&GPIOC, &timer8, NULL, 2, ADCx}, /* D39/PC7 */
{&GPIOC, &timer8, NULL, 3, ADCx}, /* D40/PC8 */
{&GPIOC, &timer8, NULL, 4, ADCx}, /* D41/PC9 */
{&GPIOC, NULL, NULL, 0, ADCx}, /* D42/PC10 */
{&GPIOC, NULL, NULL, 0, ADCx}, /* D43/PC11 */
{&GPIOC, NULL, NULL, 0, ADCx}, /* D44/PC12 */
{&GPIOC, NULL, NULL, 0, ADCx}, /* D45/PC13 */
{&GPIOC, NULL, NULL, 0, ADCx}, /* D46/PC14 */
{&GPIOC, NULL, NULL, 0, ADCx}, /* D47/PC15 */
{GPIOD, NULL, NULL, 0, 0, ADCx}, /* D48/PD0 */
{GPIOD, NULL, NULL, 1, 0, ADCx}, /* D49/PD1 */
{GPIOD, NULL, NULL, 2, 0, ADCx}, /* D50/PD2 */
{GPIOD, NULL, NULL, 3, 0, ADCx}, /* D51/PD3 */
{GPIOD, NULL, NULL, 4, 0, ADCx}, /* D52/PD4 */
{GPIOD, NULL, NULL, 5, 0, ADCx}, /* D53/PD5 */
{GPIOD, NULL, NULL, 6, 0, ADCx}, /* D54/PD6 */
{GPIOD, NULL, NULL, 7, 0, ADCx}, /* D55/PD7 */
{GPIOD, NULL, NULL, 8, 0, ADCx}, /* D56/PD8 */
{GPIOD, NULL, NULL, 9, 0, ADCx}, /* D57/PD9 */
{GPIOD, NULL, NULL, 10, 0, ADCx}, /* D58/PD10 */
{GPIOD, NULL, NULL, 11, 0, ADCx}, /* D59/PD11 */
{GPIOD, TIMER4, NULL, 12, 1, ADCx}, /* D60/PD12 */ // remap in
{GPIOD, TIMER4, NULL, 13, 2, ADCx}, /* D61/PD13 */ // remap in
{GPIOD, TIMER4, NULL, 14, 3, ADCx}, /* D62/PD14 */ // remap in
{GPIOD, TIMER4, NULL, 15, 4, ADCx}, /* D63/PD15 */ // remap in
{&GPIOD, NULL, NULL, 0, ADCx}, /* D48/PD0 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D49/PD1 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D50/PD2 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D51/PD3 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D52/PD4 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D53/PD5 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D54/PD6 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D55/PD7 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D56/PD8 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D57/PD9 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D58/PD10 */
{&GPIOD, NULL, NULL, 0, ADCx}, /* D59/PD11 */
{&GPIOD, &timer4, NULL, 1, ADCx}, /* D60/PD12 */ // remap in
{&GPIOD, &timer4, NULL, 2, ADCx}, /* D61/PD13 */ // remap in
{&GPIOD, &timer4, NULL, 3, ADCx}, /* D62/PD14 */ // remap in
{&GPIOD, &timer4, NULL, 4, ADCx}, /* D63/PD15 */ // remap in
{GPIOE, NULL, NULL, 0, 0, ADCx}, /* D64/PE0 */
{GPIOE, NULL, NULL, 1, 0, ADCx}, /* D65/PE1 */
{GPIOE, NULL, NULL, 2, 0, ADCx}, /* D66/PE2 */
{GPIOE, NULL, NULL, 3, 0, ADCx}, /* D67/PE3 */
{GPIOE, NULL, NULL, 4, 0, ADCx}, /* D68/PE4 */
{GPIOE, NULL, NULL, 5, 0, ADCx}, /* D69/PE5 */
{GPIOE, NULL, NULL, 6, 0, ADCx}, /* D70/PE6 */
{GPIOE, NULL, NULL, 7, 0, ADCx}, /* D71/PE7 */
{GPIOE, NULL, NULL, 8, 0, ADCx}, /* D72/PE8 */
{GPIOE, TIMER1, NULL, 9, 1, ADCx}, /* D73/PE9 */ // remap in
{GPIOE, NULL, NULL, 10, 0, ADCx}, /* D74/PE10 */
{GPIOE, TIMER1, NULL, 11, 2, ADCx}, /* D75/PE11 */ // remap in
{GPIOE, NULL, NULL, 12, 0, ADCx}, /* D76/PE12 */
{GPIOE, TIMER1, NULL, 13, 3, ADCx}, /* D77/PE13 */ // remap in
{GPIOE, TIMER1, NULL, 14, 4, ADCx}, /* D78/PE14 */ // remap in
{GPIOE, NULL, NULL, 15, 0, ADCx}, /* D79/PE15 */
{GPIOF, NULL, NULL, 0, 0, ADCx}, /* D80/PF0 */
{GPIOF, NULL, NULL, 1, 0, ADCx}, /* D81/PF1 */
{GPIOF, NULL, NULL, 2, 0, ADCx}, /* D82/PF2 */
{GPIOF, NULL, NULL, 3, 0, ADCx}, /* D83/PF3 */
{GPIOF, NULL, NULL, 4, 0, ADCx}, /* D84/PF4 */
{GPIOF, NULL, NULL, 5, 0, ADCx}, /* D85/PF5 */
{GPIOF, NULL, NULL, 6, 0, ADCx}, /* D86/PF6 */
{GPIOF, NULL, NULL, 7, 0, ADCx}, /* D87/PF7 */
{GPIOF, NULL, NULL, 8, 0, ADCx}, /* D88/PF8 */
{GPIOF, NULL, NULL, 9, 0, ADCx}, /* D89/PF9 */
{GPIOF, NULL, NULL, 10, 0, ADCx}, /* D90/PF10 */
{GPIOF, NULL, NULL, 11, 0, ADCx}, /* D91/PF11 */
{GPIOF, NULL, NULL, 12, 0, ADCx}, /* D92/PF12 */
{GPIOF, NULL, NULL, 13, 0, ADCx}, /* D93/PF13 */
{GPIOF, NULL, NULL, 14, 0, ADCx}, /* D94/PF14 */
{GPIOF, NULL, NULL, 15, 0, ADCx}, /* D95/PF15 */
{GPIOG, NULL, NULL, 0, 0, ADCx}, /* D96/PG0 */
{GPIOG, NULL, NULL, 1, 0, ADCx}, /* D97/PG1 */
{GPIOG, NULL, NULL, 2, 0, ADCx}, /* D98/PG2 */
{GPIOG, NULL, NULL, 3, 0, ADCx}, /* D99/PG3 */
{GPIOG, NULL, NULL, 4, 0, ADCx}, /* D100/PG4 */
{GPIOG, NULL, NULL, 5, 0, ADCx}, /* D101/PG5 */
{GPIOG, NULL, NULL, 6, 0, ADCx}, /* D102/PG6 */
{GPIOG, NULL, NULL, 7, 0, ADCx}, /* D103/PG7 */
{GPIOG, NULL, NULL, 8, 0, ADCx}, /* D104/PG8 */
{GPIOG, NULL, NULL, 9, 0, ADCx}, /* D105/PG9 */
{GPIOG, NULL, NULL, 10, 0, ADCx}, /* D106/PG10 */
{GPIOG, NULL, NULL, 11, 0, ADCx}, /* D107/PG11 */
{GPIOG, NULL, NULL, 12, 0, ADCx}, /* D108/PG12 */
{GPIOG, NULL, NULL, 13, 0, ADCx}, /* D109/PG13 */
{GPIOG, NULL, NULL, 14, 0, ADCx}, /* D110/PG14 */
{GPIOG, NULL, NULL, 15, 0, ADCx} /* D111/PG15 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D64/PE0 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D65/PE1 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D66/PE2 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D67/PE3 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D68/PE4 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D69/PE5 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D70/PE6 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D71/PE7 */
{&GPIOE, NULL, NULL, 0, ADCx}, /* D72/PE8 */
{&GPIOE, &timer1, NULL, 1, ADCx}, /* D73/PE9 */ // remap in
{&GPIOE, NULL, NULL, 0, ADCx}, /* D74/PE10 */
{&GPIOE, &timer1, NULL, 2, ADCx}, /* D75/PE11 */ // remap in
{&GPIOE, NULL, NULL, 0, ADCx}, /* D76/PE12 */
{&GPIOE, &timer1, NULL, 3, ADCx}, /* D77/PE13 */ // remap in
{&GPIOE, &timer1, NULL, 4, ADCx}, /* D78/PE14 */ // remap in
{&GPIOE, NULL, NULL, 0, ADCx}, /* D79/PE15 */
#if 0 // not available on LQFP100 package
{&GPIOF, NULL, NULL, 0, ADCx}, /* D80/PF0 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D81/PF1 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D82/PF2 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D83/PF3 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D84/PF4 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D85/PF5 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D86/PF6 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D87/PF7 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D88/PF8 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D89/PF9 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D90/PF10 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D91/PF11 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D92/PF12 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D93/PF13 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D94/PF14 */
{&GPIOF, NULL, NULL, 0, ADCx}, /* D95/PF15 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D96/PG0 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D97/PG1 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D98/PG2 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D99/PG3 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D100/PG4 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D101/PG5 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D102/PG6 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D103/PG7 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D104/PG8 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D105/PG9 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D106/PG10 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D107/PG11 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D108/PG12 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D109/PG13 */
{&GPIOG, NULL, NULL, 0, ADCx}, /* D110/PG14 */
{&GPIOG, NULL, NULL, 0, ADCx} /* D111/PG15 */
#endif // not available on LQFP100 package
};
extern const uint8 boardPWMPins[BOARD_NR_PWM_PINS] __FLASH__ = {

3
STM32F4/variants/discovery_f407/discovery_f4.h
View File

@ -50,6 +50,9 @@
#define BOARD_LED_PIN Port2Pin('D', 12)
#define BOARD_BUTTON_PIN Port2Pin('A', 0)
#define BOARD_USB_DM_PIN PA11
#define BOARD_USB_DP_PIN PA12
#define BOARD_NR_USARTS 5
#define BOARD_USART1_TX_PIN Port2Pin('A', 9)
#define BOARD_USART1_RX_PIN Port2Pin('A',10)