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

Merge branch 'master' of https://github.com/rogerclarkmelbourne/Arduino_STM32

This commit is contained in:
Roger Clark 2015-05-07 12:56:22 +10:00
parent 1df09212c0 a0ca5b6938
commit 8d63e96246
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
STM32F4/boards.txt
View File

@ -16,7 +16,7 @@ discovery_f407.upload.maximum_size=108000
#discovery_f407.upload.altID=1 #discovery_f407.upload.altID=1
#discovery_f407.upload.auto_reset=true #discovery_f407.upload.auto_reset=true
discovery_f407.build.mcu=cortex-m3 discovery_f407.build.mcu=cortex-m4
discovery_f407.build.f_cpu=168000000L discovery_f407.build.f_cpu=168000000L
discovery_f407.build.core=maple discovery_f407.build.core=maple
discovery_f407.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -march=armv7-m -DSTM32F2 -DBOARD_discovery_f4 discovery_f407.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -march=armv7-m -DSTM32F2 -DBOARD_discovery_f4

10
STM32F4/cores/maple/libmaple/HardwareSerial.cpp
View File

@ -56,19 +56,19 @@
#define RX5 BOARD_UART5_RX_PIN #define RX5 BOARD_UART5_RX_PIN
#endif #endif
HardwareSerial Serial1(USART1, TX1, RX1); HardwareSerial Serial(USART1, TX1, RX1);
#ifdef TX2 #ifdef TX2
HardwareSerial Serial2(USART2, TX2, RX2); HardwareSerial Serial1(USART2, TX2, RX2);
#endif #endif
#ifdef TX3 #ifdef TX3
HardwareSerial Serial3(USART3, TX3, RX3); HardwareSerial Serial2(USART3, TX3, RX3);
#endif #endif
#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6) #if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
HardwareSerial Serial4(UART4, TX4, RX4); HardwareSerial Serial3(UART4, TX4, RX4);
HardwareSerial Serial5(UART5, TX5, RX5); HardwareSerial Serial4(UART5, TX5, RX5);
#endif #endif
HardwareSerial::HardwareSerial(usart_dev *usart_device, HardwareSerial::HardwareSerial(usart_dev *usart_device,

4
STM32F4/cores/maple/libmaple/HardwareSerial.h
View File

@ -74,12 +74,12 @@ private:
uint8 rx_pin; uint8 rx_pin;
}; };
extern HardwareSerial Serial;
extern HardwareSerial Serial1; extern HardwareSerial Serial1;
extern HardwareSerial Serial2; extern HardwareSerial Serial2;
extern HardwareSerial Serial3;
#if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6) #if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
extern HardwareSerial Serial3;
extern HardwareSerial Serial4; extern HardwareSerial Serial4;
extern HardwareSerial Serial5;
#endif #endif
extern HardwareSerial &SerialDebug; extern HardwareSerial &SerialDebug;
#endif #endif

10
STM32F4/platform.txt
View File

@ -122,16 +122,6 @@ tools.serial_upload.upload.params.verbose=-d
tools.serial_upload.upload.params.quiet= tools.serial_upload.upload.params.quiet=
tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin" tools.serial_upload.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}.bin"
#
tools.upload_router.cmd=upload_router
tools.upload_router.cmd.windows=upload_router.bat
#tools.upload_router.cmd.linux=
tools.upload_router.path={runtime.hardware.path}/tools/win
tools.upload_router.upload.params.verbose=-d
tools.upload_router.upload.params.quiet=
tools.upload_router.upload.pattern="{path}/{cmd}" {serial.port.file} {upload.altID} {upload.usbID} "{build.path}/{build.project_name}" {upload.protocol} {build.debuggingMode} "{runtime.ide.path}/hardware/tools/{build.gcc_ver}/bin/"
# STLINK/V2 # STLINK/V2
tools.stlink.cmd=stlink tools.stlink.cmd=stlink

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

@ -91,4 +91,15 @@
#define BOARD_JTDO_PIN Port2Pin('B', 3) #define BOARD_JTDO_PIN Port2Pin('B', 3)
#define BOARD_NJTRST_PIN Port2Pin('B', 4) #define BOARD_NJTRST_PIN Port2Pin('B', 4)
enum {
PA0,PA1,PA2,PA3,PA4,PA5,PA6,PA7,PA8,PA9,PA10,PA11,PA12,PA13,PA14,PA15,
PB0,PB1,PB2,PB3,PB4,PB5,PB6,PB7,PB8,PB9,PB10,PB11,PB12,PB13,PB14,PB15,
PC0,PC1,PC2,PC3,PC4,PC5,PC6,PC7,PC8,PC9,PC10,PC11,PC12,PC13,PC14,PC15,
PD0,PD1,PD2,PD3,PD4,PD5,PD6,PD7,PD8,PD9,PD10,PD11,PD12,PD13,PD14,PD15,
PE0,PE1,PE2,PE3,PE4,PE5,PE6,PE7,PE8,PE9,PE10,PE11,PE12,PE13,PE14,PE15,
PF0,PF1,PF2,PF3,PF4,PF5,PF6,PF7,PF8,PF9,PF10,PF11,PF12,PF13,PF14,PF15,
PG0,PG1,PG2,PG3,PG4,PG5,PG6,PG7,PG8,PG9,PG10,PG11,PG12,PG13,PG14,PG15
};
#endif #endif