From a0ca5b6938f83e94dd4c13540cd0c707b3a8cec5 Mon Sep 17 00:00:00 2001
From: rogerclarkmelbourne <roger@ecbtechnology.com>
Date: Wed, 6 May 2015 15:08:34 +1000
Subject: [PATCH] Updated F4 to add STM pin numbers and change processor to
 cortex-m4 instead of cortex-m3

---
 STM32F4/boards.txt                              |  2 +-
 STM32F4/cores/maple/libmaple/HardwareSerial.cpp | 10 +++++-----
 STM32F4/cores/maple/libmaple/HardwareSerial.h   |  4 ++--
 STM32F4/platform.txt                            | 10 ----------
 STM32F4/variants/discovery_f407/discovery_f4.h  | 11 +++++++++++
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/STM32F4/boards.txt b/STM32F4/boards.txt
index 5744a4d..689aff7 100644
--- a/STM32F4/boards.txt
+++ b/STM32F4/boards.txt
@@ -16,7 +16,7 @@ discovery_f407.upload.maximum_size=108000
 #discovery_f407.upload.altID=1
 #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.core=maple
 discovery_f407.build.extra_flags=-DMCU_STM32F406VG -mthumb -DSTM32_HIGH_DENSITY -march=armv7-m  -DSTM32F2 -DBOARD_discovery_f4
diff --git a/STM32F4/cores/maple/libmaple/HardwareSerial.cpp b/STM32F4/cores/maple/libmaple/HardwareSerial.cpp
index 516fa1b..a5669c0 100644
--- a/STM32F4/cores/maple/libmaple/HardwareSerial.cpp
+++ b/STM32F4/cores/maple/libmaple/HardwareSerial.cpp
@@ -56,19 +56,19 @@
 #define RX5 BOARD_UART5_RX_PIN
 #endif
 
-HardwareSerial Serial1(USART1, TX1, RX1);
+HardwareSerial Serial(USART1, TX1, RX1);
 
 #ifdef TX2
-HardwareSerial Serial2(USART2, TX2, RX2);
+HardwareSerial Serial1(USART2, TX2, RX2);
 #endif
 
 #ifdef TX3
-HardwareSerial Serial3(USART3, TX3, RX3);
+HardwareSerial Serial2(USART3, TX3, RX3);
 #endif
 
 #if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
-HardwareSerial Serial4(UART4,  TX4, RX4);
-HardwareSerial Serial5(UART5,  TX5, RX5);
+HardwareSerial Serial3(UART4,  TX4, RX4);
+HardwareSerial Serial4(UART5,  TX5, RX5);
 #endif
 
 HardwareSerial::HardwareSerial(usart_dev *usart_device,
diff --git a/STM32F4/cores/maple/libmaple/HardwareSerial.h b/STM32F4/cores/maple/libmaple/HardwareSerial.h
index 6441560..baf4a7c 100644
--- a/STM32F4/cores/maple/libmaple/HardwareSerial.h
+++ b/STM32F4/cores/maple/libmaple/HardwareSerial.h
@@ -74,12 +74,12 @@ private:
     uint8 rx_pin;
 };
 
+extern HardwareSerial Serial;
 extern HardwareSerial Serial1;
 extern HardwareSerial Serial2;
-extern HardwareSerial Serial3;
 #if defined(STM32_HIGH_DENSITY) && !defined(BOARD_maple_RET6)
+extern HardwareSerial Serial3;
 extern HardwareSerial Serial4;
-extern HardwareSerial Serial5;
 #endif
 extern HardwareSerial &SerialDebug;
 #endif
diff --git a/STM32F4/platform.txt b/STM32F4/platform.txt
index b7db645..6b264a0 100644
--- a/STM32F4/platform.txt
+++ b/STM32F4/platform.txt
@@ -122,16 +122,6 @@ tools.serial_upload.upload.params.verbose=-d
 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.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
 
 tools.stlink.cmd=stlink
diff --git a/STM32F4/variants/discovery_f407/discovery_f4.h b/STM32F4/variants/discovery_f407/discovery_f4.h
index 7c37e56..c1f2384 100644
--- a/STM32F4/variants/discovery_f407/discovery_f4.h
+++ b/STM32F4/variants/discovery_f407/discovery_f4.h
@@ -91,4 +91,15 @@
 #define BOARD_JTDO_PIN          Port2Pin('B', 3)
 #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