Skip to content

Commit 679217d

Browse files
stevstrongstevstrong
committed
F4 development
- added generic F4 variant - removed F1 and F2 files/defines - resolved include headers - now libraries are detected within sketches - reworked + added new GPIO access functions - moved and size-optimized PIN_MAP in flash - SPI improvements: optimized block read + added DMA
1 parent ff0244a commit 679217d

117 files changed

Lines changed: 2546 additions & 4092 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎STM32F4/boards.txt‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#
22

3+
menu.usb_cfg=USB configuration
4+
35
##############################################################
46
discovery_f407.name=STM32 Discovery F407
57

@@ -29,6 +31,43 @@ discovery_f407.build.error_led_port=GPIOD
2931
discovery_f407.build.error_led_pin=14
3032
discovery_f407.build.board=STM32DiscoveryF407
3133

34+
##############################################################
35+
generic_f407v.name=Generic STM32F407V series
36+
37+
generic_f407v.upload.tool=stlink_upload
38+
generic_f407v.upload.protocol=stlink
39+
40+
generic_f407v.upload.file_type=bin
41+
generic_f407v.upload.ram.maximum_size=131072
42+
generic_f407v.upload.flash.maximum_size=514288
43+
generic_f407v.upload.maximum_size=514288
44+
45+
#generic_f407v.upload.usbID=0483:3748
46+
#generic_f407v.upload.altID=1
47+
#generic_f407v.upload.auto_reset=true
48+
49+
generic_f407v.build.mcu=cortex-m4
50+
generic_f407v.build.f_cpu=168000000L
51+
generic_f407v.build.core=maple
52+
generic_f407v.build.extra_flags=-mthumb -DSTM32_HIGH_DENSITY -DSTM32F4 -DBOARD_generic_f407v
53+
generic_f407v.build.ldscript=ld/jtag.ld
54+
generic_f407v.build.variant=generic_f407v
55+
generic_f407v.build.variant_system_lib=lib_f407.a
56+
generic_f407v.build.vect=VECT_TAB_BASE
57+
generic_f407v.build.density=STM32_HIGH_DENSITY
58+
generic_f407v.build.error_led_port=GPIOA
59+
generic_f407v.build.error_led_pin=7
60+
generic_f407v.build.board=STM32GenericF407VET6
61+
62+
generic_f407v.menu.usb_cfg.usb_nc=USB inactive
63+
generic_f407v.menu.usb_cfg.usb_nc.build.cpu_flags=-DUSB_NC
64+
65+
generic_f407v.menu.usb_cfg.usb_serial=USB serial (CDC)
66+
generic_f407v.menu.usb_cfg.usb_serial.build.cpu_flags=-DSERIAL_USB
67+
68+
generic_f407v.menu.usb_cfg.usb_msc=USB Mass Storage (MSC)
69+
generic_f407v.menu.usb_cfg.usb_msc.build.cpu_flags=-DUSB_MSC
70+
3271
##############################################################
3372
stm32f4stamp.name=STM32F4Stamp F405
3473

‎STM32F4/cores/maple/Arduino.h‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎STM32F4/cores/maple/Client.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818
*/
1919

20-
#ifndef client_h
21-
#define client_h
20+
#ifndef _CLIENT_H_
21+
#define _CLIENT_H_
22+
2223
#include "Print.h"
2324
#include "Stream.h"
2425
#include "IPAddress.h"

‎STM32F4/cores/maple/HardwareTimer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
// TODO [0.1.0] Remove deprecated pieces, pick a better API
3535

36-
#include "timer.h"
36+
#include <libmaple/timer.h>
3737

3838
/** Timer mode. */
3939
typedef timer_mode TimerMode;

‎STM32F4/cores/maple/IPAddress.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818
*/
1919

20-
#ifndef IPAddress_h
21-
#define IPAddress_h
20+
#ifndef _IPAddress_h_
21+
#define _IPAddress_h_
2222

2323
#include <stdint.h>
2424
#include <WString.h>

‎STM32F4/cores/maple/Server.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1818
*/
1919

20-
#ifndef server_h
21-
#define server_h
20+
#ifndef _SERVER_H_
21+
#define _SERVER_H_
2222

2323
#include "Print.h"
2424

‎STM32F4/cores/maple/Stream.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
parsing functions based on TextFinder library by Michael Margolis
2020
*/
2121

22-
#ifndef Stream_h
23-
#define Stream_h
22+
#ifndef _STREAM_H_
23+
#define _STREAM_H_
2424

2525
#include <inttypes.h>
2626
#include "Print.h"

‎STM32F4/cores/maple/Udp.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
* bjoern@cs.stanford.edu 12/30/2008
3333
*/
3434

35-
#ifndef udp_h
36-
#define udp_h
35+
#ifndef _UDP_H_
36+
#define _UDP_H_
3737

3838
#include <Stream.h>
3939
#include <IPAddress.h>

‎STM32F4/cores/maple/WProgram.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,12 @@
2424
* SOFTWARE.
2525
*****************************************************************************/
2626

27-
#include "wirish.h"
27+
#ifndef _WPROGRAM_H_
28+
#define _WPROGRAM_H_
29+
30+
#include <wirish.h>
2831

2932
void setup();
3033
void loop();
34+
35+
#endif

‎STM32F4/cores/maple/WString.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2020
*/
2121

22-
#ifndef String_class_h
23-
#define String_class_h
22+
#ifndef _WSTRING_H_
23+
#define _WSTRING_H_
24+
2425
#ifdef __cplusplus
2526

2627
#include <stdlib.h>
@@ -225,4 +226,4 @@ class StringSumHelper : public String
225226
};
226227

227228
#endif // __cplusplus
228-
#endif // String_class_h
229+
#endif // _WSTRING_H_

0 commit comments

Comments
 (0)